am 20b7ca91: Fix bug with snapping during scrolling

* commit '20b7ca91b277e9668b6d4b4b3c9116b6778d22a5':
  Fix bug with snapping during scrolling