Merge "Start fingerprint after face fails quickly" into main