Allow configuring toolbar separate from navBar
Merge pull request #4628 from vishalduggal/toolbar_ui_update-31X

(3_1_X) Allow configuring toolbar separate from navBar