Manual merge of src/components/layout/toolbar.js from build merge