Merge \"Seascape Navigation Bar View\" into nyc-mr1-dev
am: 7d76682bb3

Change-Id: Ifc18745df593f07e6b3f04a296d8bd3003a5cb88