Transition: Calculate "none" after establishing this.toScroll

Closes gh-7143
Fixes gh-7140