Merge "Change nav bar style. Bug: 27226956" into nyc-dev