Merge changes I21e9629e,I535ed3ba

* changes:
  Create an XML config flag to turn the navbar off.
  It's lights out for you, navigation bar!