Merge remote-tracking branch 'trigger/MC-1420' into MC-1420

Author: irenelagno

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest.xml

@@ -495,6 +495,7 @@
         <actionGroup ref="searchBlockInGrid" stepKey="searchBlockInGrid">
             <argument name="block" value="$$createPreReqBlock$$"/>
         </actionGroup>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
         <actionGroup ref="expandConfigurationSection" stepKey="expandConfigurationSection"/>
         <!-- Update Values -->
         <comment userInput="Update Values" stepKey="commentUpdateValues"/>

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/block/preview.js

@@ -70,7 +70,7 @@ export default class Preview extends BasePreview {
             if (this.lastRenderedHtml) {
                 this.data.main.html(this.lastRenderedHtml);
                 this.displayPreview(true);
-            }app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest.xml
+            }
         } else {
             this.displayPreview(false);
             this.placeholderText("");