Revert "Fix a programmatic smooth scroll bug"

This reverts commit 463996c42e4a388561efe9ccf86ec61aa201d828.

Change-Id: I0406e72f1872b1d51876bd1702b9131a90174823
Merge "Revert "Fix a programmatic smooth scroll bug"" into jb42