Bug 911666 - [bb][refactor] Scrolling