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