Merge "Revert "Fix navigation bar order in seascape"" into nyc-mr1-dev