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