am c0f21e1d: Merge "Fix occasional odd scrolling behavior"

* commit 'c0f21e1d3c348c6ab83c1d223e7c1c2d683412fb':
  Fix occasional odd scrolling behavior