Merge "Update fingerprint enrolling flow"