Merge "Add skip button to fingerprint settings" into nyc-mr1-dev