Merge "Revert "Customize Fingerprint enroll activities"" into main