am cbe397f2: Merge "b/3348192 re-enable snap scrolling mode." into honeycomb

* commit 'cbe397f243c4f1706cf7bbd9fcd07c1c13ccb097':
  b/3348192 re-enable snap scrolling mode.