Merge "Don't snap to center if the scroll position doesn't change." into nyc-mr1-dev