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

Change-Id: I7d84ce77d7e5f3626904b0b665fab1001b4b5d62