Fixes #17416 Fix regression introduced by the initial patch - SwapView now uses the renamed variable from scrollable.js.
(cherry picked from commit 9b0d511e8bf48a0c0037776ab1b0a9aa0ca07fd8)