Merge "Fix buttons and icons for fingerprint enroll intro" into sc-dev