Merge "Fixed a bug where the scrollrange was calculated wrong" into nyc-dev