Fixes #17454 - scrolling performance/usability problems on Android and BB
(cherry picked from commit c43b260af527b055a5876e47f61d4e04c2aaa4b4)