Merge "QQS visual fixes." into pi-dev
am: 032ab15256

Change-Id: I01e06e8895c969b3f62601a7ee8ac0dc95ee1e3d