Merge remote-tracking branch 'trigger/develop' into AC-1194

Author: kieuphan2406

app/code/Magento/PageBuilder/view/adminhtml/web/js/modal/template-manager-save.js

@@ -110,7 +110,7 @@ define([
             ).show();
 
             // Enable the button so the user can save
-            this.modal.find(this.options.saveButton).removeProp('disabled');
+            this.modal.find(this.options.saveButton).prop('disabled', false);
         },
 
         /**