Merge "Fingerprint allowed state should update based on face lockout" into main