Merge "Use screen height to determine # of QS rows." into pi-dev