Don't add scrollWrap if there is one already. Fixes #211.
Add test.
(cherry picked from commit 7c11ec5)