Merge "Color picker reset button: refresh color preview on click" into p9.0