Merge "Cache display height in QSContainerImpl." into pi-dev
am: 26f00b9d87

Change-Id: Ic48b82aca4c26d8471a80c9e495b4e404b8dba15