Merge "Bring up the QS state colors to increase contrast" into oc-dev