rebase after pushes

comm-central/patches/TOP-1611647-1-rename-xul-suite.patch

@@ -1,9 +1,9 @@
 # HG changeset patch
 # User Bill Gianopoulos <wgianopoulos@gmail.com>
-# Date 1614281936 18000
-#      Thu Feb 25 14:38:56 2021 -0500
-# Node ID af2dc4ed9812a239020a7fabd489b065f975552b
-# Parent  8b12ef79d7ad9d7c4677c2b8c456f2969ffeb966
+# Date 1658141568 14400
+#      Mon Jul 18 06:52:48 2022 -0400
+# Node ID e352984c73426802110888060346b9643b9ee735
+# Parent  e85c7bb024d076199e6dc3a04023bc86e9b3f2d9
 Bug 1611647 - Port bug 1579952 - Mass rename .xul files to .xhtml in suite.
 
 diff --git a/suite/base/content/aboutPrivateBrowsing.xul b/suite/base/content/aboutPrivateBrowsing.xhtml

comm-central/patches/TOP-1611647-2-fix-xul-references-suite.patch

@@ -1,9 +1,9 @@
 # HG changeset patch
 # User Bill Gianopoulos <wgianopoulos@gmail.com>
-# Date 1651829930 14400
-#      Fri May 06 05:38:50 2022 -0400
-# Node ID 65e263b0f8b91044233605e50c403f1aafca155d
-# Parent  4f94a537c426a6265b822ac5c130158bfda7a55c
+# Date 1658141579 14400
+#      Mon Jul 18 06:52:59 2022 -0400
+# Node ID 6ef171b486c309dd36f059d4e3cdc575978d195f
+# Parent  e352984c73426802110888060346b9643b9ee735
 Bug 1611647 - Port bug 1579952 - Fix references to xul files in suite.
 
 diff --git a/suite/app/profile/suite-prefs.js b/suite/app/profile/suite-prefs.js
@@ -3703,7 +3703,7 @@ diff --git a/suite/extensions/debugQA/jar.mn b/suite/extensions/debugQA/jar.mn
 diff --git a/suite/installer/allowed-dupes.mn b/suite/installer/allowed-dupes.mn
 --- a/suite/installer/allowed-dupes.mn
 +++ b/suite/installer/allowed-dupes.mn
-@@ -222,18 +222,18 @@ extensions/modern@themes.mozilla.org/chr
+@@ -220,18 +220,18 @@ extensions/modern@themes.mozilla.org/chr
  chrome/toolkit/skin/classic/mozapps/plugins/contentPluginCrashed.png
  extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/mozapps/extensions/category-dictionaries.png
  extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/mozapps/extensions/dictionaryGeneric.png
@@ -5839,7 +5839,7 @@ diff --git a/suite/mailnews/content/messenger.xhtml b/suite/mailnews/content/mes
 diff --git a/suite/mailnews/content/msgHdrViewOverlay.js b/suite/mailnews/content/msgHdrViewOverlay.js
 --- a/suite/mailnews/content/msgHdrViewOverlay.js
 +++ b/suite/mailnews/content/msgHdrViewOverlay.js
-@@ -1414,30 +1414,30 @@ createNewAttachmentInfo.prototype.saveAt
+@@ -1358,30 +1358,30 @@ createNewAttachmentInfo.prototype.saveAt
                               false);
  }
  

comm-central/patches/TOP-1614671-port1456035-4-and-5-61a1-cc.patch

@@ -1914,7 +1914,7 @@ diff --git a/suite/mailnews/content/messageWindow.js b/suite/mailnews/content/me
 diff --git a/suite/mailnews/content/msgHdrViewOverlay.js b/suite/mailnews/content/msgHdrViewOverlay.js
 --- a/suite/mailnews/content/msgHdrViewOverlay.js
 +++ b/suite/mailnews/content/msgHdrViewOverlay.js
-@@ -321,17 +321,17 @@ function OnAddressBookDataChanged(aActio
+@@ -317,17 +317,17 @@ function OnAddressBookDataChanged(aActio
      }
    });
  }
@@ -1933,7 +1933,7 @@ diff --git a/suite/mailnews/content/msgHdrViewOverlay.js b/suite/mailnews/conten
        if (gCollectAddressTimer)
        {
          clearTimeout(gCollectAddressTimer);
-@@ -1940,17 +1940,17 @@ var attachmentAreaDNDObserver = {
+@@ -1884,17 +1884,17 @@ var attachmentAreaDNDObserver = {
  };
  
  function nsFlavorDataProvider()