Merge "[QS] Change spacing for QQS in landscape" into pi-dev