Merge "Tiny visual tweaks to QS" into oc-dr1-dev