Fix scroller enable/disable issue
Merging origin/john/master-pending-scroller-fix into master