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