Merge "Color picker pref: allow tap also on the text to show the picker" into p9.0