Merge "Fix KeyguardStatusBarViewModel to only use the new flow that tells us we are showing heads up status bar when the flag for that refactor is enabled." into main