Merge "Fix incorrect colors for CustomTile in QS" into oc-mr1-dev