Merge "Allows user to skip fingerprint during setup"