make sure scroller is alive when it is reawakened
Merge branch 'v2' into draghandle