Merge "Minor face/fingerprint mismatch fixes"