Merge changes I92ef4715,Iebf64931 into rvc-dev

* changes:
  Fixed the calculation of how many views to show on the lockscreen
  Fixed an issue where the contentHeight was calculated wrongly