Merge "Color Picker reset support (1/3)" into tm-qpr-dev