Merge "Add BiometricActionDisabledByAdminController" into sc-dev