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

Change-Id: Ia2d8ab61124b8096d05f68c23ac389c97615249c