Move the scroll preventing overrides to after the transision finish

Fixes issues where firefox skips the collapse transition
Merge branch 'develop' of github.com:unl/wdntemplates into swipe-nav