Merge changes I938c93bd,Ia3640874 into main

* changes:
  [flexiglass] Only show full notifications on lockscreen
  [flexiglass] StatusBarState is KEYGUARD on Scenes.Lockscreen