Merge "Refactor FingerprintEnrollFinish to fragment"