Allow configuring toolbar separate from navBar
Merge pull request #4627 from vishalduggal/toolbar_ui_update

Allow configuring toolbar separate from navBar