MC-16318: Flaky MFTF Test: MAGETWO-93965: creating scheduled update for staging dashboard with max year value

- unrelated test cleanup due to test order

Author: anthoula

app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml

@@ -400,5 +400,6 @@
         <click selector="{{AdminProductGridSection.bulkActionOption('Delete')}}" stepKey="clickDeleteAction"/>
         <waitForElementVisible selector="{{AdminProductGridConfirmActionSection.ok}}" stepKey="waitForModalPopUp"/>
         <click selector="{{AdminProductGridConfirmActionSection.ok}}" stepKey="confirmProductDelete"/>
+        <waitForPageLoad stepKey="waitForGridLoad"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminDataGridPaginationActionGroup.xml

@@ -18,7 +18,7 @@
 
         <click selector="{{AdminDataGridPaginationSection.perPageDropdown}}" stepKey="clickPerPageDropdown"/>
         <click selector="{{AdminDataGridPaginationSection.perPageOption(perPage)}}" stepKey="selectCustomPerPage"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForGridLoad"/>
+        <waitForPageLoad stepKey="waitForGridLoad"/>
     </actionGroup>
 
     <actionGroup name="adminDataGridSelectCustomPerPage">