Merge "Color Picker: don't show picker on click if preference is disabled" into p9.0