Merge "Fix the status icon colors in QS" into oc-dev am: d472349229
am: e093068eb1

Change-Id: I2bbe4b8dc4f0e9173d00129e8b25a4ccb3977188