remove references to defunct layout_manager in ToolBar
Merge pull request #7160 from minrk/toolbar-layout

remove references to defunct layout_manager in ToolBar