Merge "Set LeaveOpenOnKeyguardHide to false when bouncer is canceled" into 24D1-dev