Fixes issue with removing and re-adding a toolbar which is connected to the same TabBarController (#9015)
