Navigation vertical scroll fix.
Merge branch 'master' into navigation-fix
Merge pull request #6808 from guardian/navigation-fix

Navigation vertical scroll fix
Revert "Revert "More JSCS fixes""
with fix