ENGCOM-3448: bug-fix #16074 - Fix theme change in middle of product page. #19124

Author: sidolov

app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/Image.php

@@ -14,6 +14,7 @@
 use Magento\Catalog\Model\Product\Image\NotLoadInfoImageException;
 use Magento\Catalog\Ui\DataProvider\Product\ProductRenderCollectorInterface;
 use Magento\Framework\App\State;
+use Magento\Framework\View\Design\ThemeInterface;
 use Magento\Framework\View\DesignInterface;
 use Magento\Store\Model\StoreManager;
 use Magento\Store\Model\StoreManagerInterface;
@@ -104,6 +105,8 @@ public function __construct(
     public function collect(ProductInterface $product, ProductRenderInterface $productRender)
     {
         $images = [];
+        /** @var ThemeInterface $currentTheme */
+        $currentTheme = $this->design->getDesignTheme();
 
         foreach ($this->imageCodes as $imageCode) {
             /** @var ImageInterface $image */
@@ -132,6 +135,7 @@ public function collect(ProductInterface $product, ProductRenderInterface $produ
             $images[] = $image;
         }
 
+        $this->design->setDesignTheme($currentTheme);
         $productRender->setImages($images);
     }