Merge remote-tracking branch 'origin/1.2.0-release' into PB-261-120

Author: cspruiell

app/code/Magento/PageBuilder/Model/Stage/HtmlFilter.php

@@ -40,11 +40,12 @@ public function __construct(
      */
     public function filterHtml(string $content): string
     {
-        $dom = new \DOMDocument();
+        $dom = new \DOMDocument('1.0', 'UTF-8');
         try {
             //this code is required because of https://bugs.php.net/bug.php?id=60021
             $previous = libxml_use_internal_errors(true);
-            $dom->loadHTML($content, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD);
+            $string = mb_convert_encoding($content, 'HTML-ENTITIES', 'UTF-8');
+            $dom->loadHTML($string, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD);
         } catch (\Exception $e) {
             $this->loggerInterface->critical($e->getMessage());
         }