Merge "Change QQS to use tiles with side labels" into sc-dev