Merge "Color Picker: use oval preview" into p9.0