Merge "Revert "Launch multiple biometric enrollment when no biometric is enrolled"" into main