scroller changes
Merging origin/dval/master-pending-scroller-plugin-refactor into master