Revert ACP2E-295 changes

Author: nishant04412

app/code/Magento/Swatches/Test/Mftf/Data/SwatchProductAttributeFrontendLabelData.xml

@@ -12,8 +12,4 @@
         <data key="store_id">0</data>
         <data key="label" unique="suffix">Swatch-Attribute-</data>
     </entity>
-    <entity name="SwatchProductSizeAttribute" type="FrontendLabel">
-        <data key="frontend_label">Set Size</data>
-        <data key="attribute_code">set_size</data>
-    </entity>
 </entities>

app/code/Magento/Swatches/Test/Mftf/Test/StorefrontConfigurableOptionsImportSameBaseImageTest.xml

@@ -1247,12 +1247,17 @@ define([
          * @param {Array} images
          */
         _setImageType: function (images) {
+            var initial = this.options.mediaGalleryInitial[0].img;
 
-            images.map(function (img) {
-                if (!img.type) {
-                    img.type = 'image';
-                }
-            });
+            if (images[0].img === initial) {
+                images = $.extend(true, [], this.options.mediaGalleryInitial);
+            } else {
+                images.map(function (img) {
+                    if (!img.type) {
+                        img.type = 'image';
+                    }
+                });
+            }
 
             return images;
         },