upstream updated toolbarwrapper