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

Change-Id: Iabdc18a01a88c14b664459fc2afbf5d68e9068a9