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

Change-Id: I6ab488a5da585d68663e06b0d08c8f981246a72d