Merge remote-tracking branch 'trigger/AC-375' into AC-246

Author: kieuphan2406

dev/tests/static/testsuite/Magento/Test/Js/_files/eslint/.eslintrc-tinymce

@@ -2,10 +2,6 @@
     "rules": {
         'no-restricted-syntax': [
             'error',
-            {
-                message: "addCommand is removed. Update code to be compatible with tinymce5",
-                selector: "CallExpression[callee.object.name='editor'][callee.property.name='addCommand']"
-            },
             {
                 message: "addButton is removed. Update code to be compatible with tinymce5",
                 selector: "CallExpression[callee.object.name='editor'][callee.property.name='addButton']"

lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce5Adapter.js

@@ -269,6 +269,9 @@ define([
                 }
             };
 
+            // Set default initial height
+            settings['min_height'] = this.config.tinymce['min_height'] ? this.config.tinymce['min_height'] : 250;
+
             if (this.config.skin) {
                 settings.skin = this.config.skin;
             }