scroller fixes @bug W-2188701@
scroller fixes for native scroller phase2
Merging origin/dval/master-pending-scrollernative-fix-4 into master