Merge "Preventing users from over scrolling too far." into nyc-dev