Merge "Fix the behavior of keyguard bouncer in a corner case"