Set early return in activate toolbar if the toolbar isn't still available
Merge branch 'bug/toolbar-late-activate'
rebuild