Merge "Refine fingerprint enrollment experience" into mnc-dev