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

Change-Id: Id96f0a18c77628d63069ed434f5904936cb41359