Merge "Color Picker Fragment UX Polish" into tm-qpr-dev