Merge "[flexiglass] Fixes status bar padding on lockscreen scene" into main