Merge "Fixed an issue where the contentHeight was wrong" into pi-dev
am: ed9df0d176

Change-Id: I7f9778580993a4762895839136209d307fdc765a