Merge "Fix UDFPS enroll to use correct fingerprint icon" into sc-v2-dev