Bug 909366 - add re-entrancy check to registerToolbar, r=jaws