Merge "Keyguard FP UX update"