Merge "More QS theme fixes for contrast" into oc-dev