Merge "Customize Fingerprint enroll activities" into main