Merge \"Revert \"Fix navigation bar order in seascape\"\" into nyc-mr1-dev
am: ce715e4922

Change-Id: I02b59a2f7ed17f9f5fd209cc090da62e37fa63ba