Merge "Add config value to force nav bar to be opaque" into nyc-dev am: acc86abf82
am: db0a3dcb6a

* commit 'db0a3dcb6ae65ea5bcfdeec8d2a74b4fba51479c':
  Add config value to force nav bar to be opaque