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

Change-Id: Ib607094d49ba35e14dd33d6993e343cda7594b5f