Merge "Use screen height to determine # of QS rows." into pi-dev am: 9376380a27
am: 71422f3c9b

Change-Id: Ib4e38dff09204a4e01fd859c6c93d332c8d7c736