Merge "Ensure fingerprint setup is shown once after face" into sc-dev