Merge "Add config value to force nav bar to be opaque" into nyc-dev