Merge "QQS visual fixes." into pi-dev