Merge "Keyguard shouldn't listen to FP if bouncer showing and keyguard dismissing"