Merge "Color Picker Optimistic Update" into tm-qpr-dev