Merge "Add configurable nav bar opacity rules" into nyc-dev