Merge "Seascape Navigation Bar View" into nyc-mr1-dev