Merge changes Ie2fbc4a9,Id5918813,Ie61d5da3,I26a12ff6 into qt-r1-dev

* changes:
  Made sure huns received while dozing time out
  Adjusting the notification header appearance on the lock screen
  Made heads up persist through unlocks
  Fixed the appearance of the heads up statusbar view on the lockscreen