Merge "Migrating all BiometricPrompt iconController logic" into main