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

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