Merge "Use keyguard transitions to ensure correct scrim" into main