Merge "Prevents retrying fingerprint after lockout reset if user exits FingerprintSettings" into tm-qpr-dev