Merge "Fix fingerprint navigation after entering lockout."