Merge "Change fingerprint behavior in keyguard to dismiss on notification"