Merge "Show confirmation dialog when user tries to skip fingerprint" into oc-mr1-dev