Merge branch 'AC-7600_2.4-develop' into Arrows_regression_issues_2_4_develop_13jan22

Author: abhattGlo

app/code/Magento/MediaGalleryUi/Test/Mftf/Test/UserDeletesFolderFromMediaGalleryNewTest.xml

@@ -16,22 +16,19 @@
             <description value="User deletes folder from Media Gallery"/>
             <severity value="CRITICAL"/>
             <group value="media_gallery_ui"/>
-            <skip>
-                <issueId value="DEPRECATED">Use UserDeletesFolderFromMediaGalleryNewTest instead.</issueId>
-            </skip>
         </annotations>
         <before>
             <!-- Step1 Login as Admin -->
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
 
             <!-- Step2 Disabled Old Media Gallery and Page Builder -->
             <magentoCLI command="config:set {{MediaGalleryConfigDataEnabled.path}} {{MediaGalleryConfigDataEnabled.value}}" stepKey="disabledOldMediaGallery"/>
-            <magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder"/>
+            <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="disablePageBuilder"/>
             <magentoCLI command="cache:clean config" stepKey="flushCache"/>
         </before>
         <after>
             <magentoCLI command="config:set {{MediaGalleryConfigDataDisabled.path}} {{MediaGalleryConfigDataDisabled.value}}" stepKey="enableOldMediaGallery"/>
-            <magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
+            <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="enablePageBuilder"/>
             <magentoCLI command="cache:clean config" stepKey="flushCache"/>
         </after>