Merge "Merge "Fix incorrect colors for CustomTile in QS" into oc-mr1-dev am: 859f8c4a21 am: e5d55d52b6"