Merge "Don't use mLockscreenShowing with Flexi off" into main