Fixes #17416 Fix regression introduced by the initial patch - SwapView now uses the renamed variable from scrollable.js.