MAGETWO-89238: [Sales email] Disabled invoice emails produce performance issue

Author: RuslanKostiv1

app/code/Magento/Store/Model/Store.php

@@ -1056,14 +1056,14 @@ public function getWebsiteId()
      */
     public function afterSave()
     {
+        $this->_storeManager->reinitStores();
         if ($this->isObjectNew()) {
             $event = $this->_eventPrefix . '_add';
         } else {
             $event = $this->_eventPrefix . '_edit';
         }
         $store  = $this;
         $this->getResource()->addCommitCallback(function () use ($event, $store) {
-            $this->_storeManager->reinitStores();
             $this->eventManager->dispatch($event, ['store' => $store]);
         });
         return parent::afterSave();