fix scrolling without anchorScroll
Merge branch 'staging'