Merge "Add skip button to fingerprint enrolling screen" into oc-dr1-dev