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

Change-Id: Ieb7a009989c3f505c1f799e7eabc243929957a8b