Merge "Prevent keyguard from flashing after dismissing" into main