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

Change-Id: Ic00b8027974173128061d2e4875970ae8c31de5c