Merge "Merge "QS vis tweaks" into oc-dev am: 2b2221e94b am: abd4f9844f"