Merge "Cache display height in QSContainerImpl." into pi-dev