Merge "[flexiglass] Fixes bug where the swipe lockscreen would get skipped" into main