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

Change-Id: I064bbbb8c0058adb03f74acf2331342b3d6f97c7