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