unwanted waits removed and stepkeys renamed back as per advise from David

Author: Manoranjan.Prakash

app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml

@@ -44,6 +44,7 @@
         <element name="allowGiftsWrapCheckbox" type="checkbox" selector="//input[@type='checkbox' and @name='product[use_config_gift_wrapping_available]']" />
         <element name="allowGiftsWrapToggle" type="button" selector="//input[@type='checkbox' and @name='product[use_config_gift_wrapping_available]' and @value='{{var1}}']/../../../..//label[@class='admin__actions-switch-label']" parameterized="true"/>
         <element name="priceForGiftsWrapping" type="input" selector="//input[@name='product[gift_wrapping_price]']"/>
+        <element name="productImgInGrid" type="block" selector="img.admin__control-thumbnail[src*='/large']" />
     </section>
 </sections>
 

app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest/AdminSimpleProductImagesTest.xml

@@ -151,17 +151,15 @@
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterProductGridBySku3">
             <argument name="product" value="$$secondProduct$$"/>
         </actionGroup>
-        <seeElement selector="img.admin__control-thumbnail[src*='/large']" stepKey="seeImgInGrid"/>
+        <seeElement selector="{{AdminProductGridSection.productImgInGrid}}" stepKey="seeImgInGrid"/>
 
         <!-- Go to the category page and see the uploaded image -->
         <amOnPage url="$$category.custom_attributes[url_key]$$.html" stepKey="goToStorefrontCategoryPage"/>
-        <waitForElementVisible selector="{{StorefrontCategoryMainSection.uploadedImageLarge}}" stepKey="waitForUploadedImgOnStorefrontCategoryPage"/>
-        <seeElement selector="{{StorefrontCategoryMainSection.uploadedImageLarge}}" stepKey="seeUploadedImgOnStorefrontCategoryPage"/>
+        <waitForElementVisible selector="{{StorefrontCategoryMainSection.uploadedImageLarge}}" stepKey="seeUploadedImg"/>
 
         <!-- Go to the product page and see the uploaded image -->
         <amOnPage url="$$secondProduct.custom_attributes[url_key]$$.html" stepKey="goToStorefrontProductPage"/>
         <waitForPageLoad stepKey="waitForStorefrontProductPageToLoad"/>
-        <waitForElementVisible selector="{{StorefrontProductMediaSection.imageFile('large')}}" stepKey="waitForLarge2ImageOnStorefrontProductPage"/>
-        <seeElementInDOM selector="{{StorefrontProductMediaSection.imageFile('large')}}" stepKey="seeLarge2ImageOnStorefrontProductPage"/>
+        <seeElementInDOM selector="{{StorefrontProductMediaSection.imageFile('large')}}" stepKey="seeLarge2"/>
     </test>
 </tests>