Merge "BiometricEnrollIntroduction button update" into sc-dev