am 83c70cf8: am d9455775: am 20b7ca91: Fix bug with snapping during scrolling

* commit '83c70cf8ee6ff5912394ce9b3efc0bdea9401ae2':
  Fix bug with snapping during scrolling