Merge "Refactor FingerprintEnrollEnrolling to fragment" into udc-dev