Merge \"Merge \\"Fix navigation bar order in seascape\\" into nyc-mr1-dev am:...
Merge \"Merge \\"Fix navigation bar order in seascape\\" into nyc-mr1-dev am: 5a078db9\" into nyc-mr1-dev-plus-aosp
am: c4cc83a4
Change-Id: I96cb61df06f88ea3f17dcd0910cc2498b16ef21a