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

Change-Id: Idd9dea5365fc9ed50912b93916aed2a56ffb68c6