Merge "Remove custom_biometric_prompt flag" into main