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

Change-Id: I19d9f1b1a3f82343be3747c623f05a5e67faec1d