adding refresh toggling
Merging origin/master-pending-scroller-leak-ptr into master