Merge changes I14b38827,I709b0e1f into main

* changes:
  [flexiglass] Fix bouncer to lockscreen transition
  [flexiglass] Implement Shade -> Lockscreen scene transition