Merge "Fixed a bug with overscrolling on the bottom."