always show the other toolbar
Merge branch 'github-refactor-oerpub-only-edit-toolbar' into github-refactor-oerpub