LPS-36620

In order to test in 6.2.x, you'll need to enable staging and site pages variations in two separate steps.  Not sure what's causing that particular problem since it doesn't exist in 6.1.x.  The commit in this pull request fixes the vanishing navigation in both 6.2.x and 6.1.x though.