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

Change-Id: I8962708b492513e1392515580b2936191d97e9e9