Make auto-scroll behavior optional
Merge branch 'optional-auto-scroll'