Fix glitch in scrolling_window (backport from trunk).