Merge "Set LeaveOpenOnKeyguardHide to false when bouncer is canceled" into main