Merge "Prevent UnlockAnimationController from dismissing keyguard..." into main