Merge "Reset face locked out state whenever fingerprint lockout state gets reset" into main