Merge "Update biometrics metrics enums" into main