Merge remote-tracking branch '39681/fix-for-issue-39111' into comprv1

Author: engcom-Charlie

app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php

@@ -2362,7 +2362,9 @@ public function addMediaGalleryData()
             return $this;
         }
 
-        if (!$this->getSize()) {
+        $size = $this->isLoaded() ? $this->count() : $this->getSize();
+
+        if (!$size) {
             return $this;
         }
 

app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/CollectionTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -311,7 +311,6 @@ public function testAddMediaGalleryData()
         $this->metadataPoolMock->expects($this->once())->method('getMetadata')->willReturn($metadataMock);
         $metadataMock->expects($this->once())->method('getLinkField')->willReturn($linkField);
 
-        $this->connectionMock->expects($this->once())->method('fetchOne')->with($selectMock)->willReturn(42);
         $this->connectionMock->expects($this->once())->method('fetchAll')->with($selectMock)->willReturn(
             [['row_id' => $rowId]]
         );