Merge "Set enum defaults for biometrics" into sc-dev