[automerger] Merge "Fixed an issue where the contentHeight was wrong" into pi-dev am: ed9df0d176 am: 5c2a056a83

Change-Id: I501b10108f3f075b171ed0d97bc0ae1385e49a55