Fix smooth scrolling, all cases.
Merge pull request #1331 from smblott-github/fix-smooth-scrolling-properly

Fix scrolling in 1.47, all cases.