Merge "Integrating ColorContrast in Picker" into main