Merge "Fix the status icon colors in QS" into oc-dev