Merge branch 'prod' into meganav-v2
Back to height animation on nav-main

Now uses max-height, which can be transitioned.
Merge branch 'meganav-v2' into prod