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

Change-Id: If3b1ba9b80f19ace63db170f9c36fcbed3a2e52e