Merge "Add support for unprovisioned top nav bar"