test fix for scroller
Merging origin/nihar/master-pending-scrollerTestFix into master