Merge "Flip flag check in KeyguardStatusBarController" into main