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

Change-Id: I7ab8bd9a58a7582286e73f1888b81d4a745eac24