Merge changes I60669089,Iba4fbaaa into qt-r1-dev

* changes:
  Fixed the maxPanelheight on the lockscreen
  Extended the bypass experience