no-bug: Update to Firefox 150.0 (gh-13281)

2026-05-28 15:55:10 +00:00 · 2026-04-17 00:59:38 +02:00
parent 8249814f68
commit 1964922df7
137 changed files with 4040 additions and 3385 deletions
--- a/src/browser/base/content/browser-addons-js.patch
+++ b/src/browser/base/content/browser-addons-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser-addons.js b/browser/base/content/browser-addons.js
-index 737ccf0feff4910426f7f75a20ac20ec480461dc..177ab12f9478e1ce664b7b2c66b0e2c8bca63573 100644
+index 098cf2408bc462f61fb547716754a3af832ffa1e..d062d03f7d258b66740d785cc30abe7932eaea41 100644
 --- a/browser/base/content/browser-addons.js
 +++ b/browser/base/content/browser-addons.js
@@ -1061,7 +1061,7 @@ var gXPInstallObserver = {
--- a/src/browser/base/content/browser-box-inc-xhtml.patch
+++ b/src/browser/base/content/browser-box-inc-xhtml.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser-box.inc.xhtml b/browser/base/content/browser-box.inc.xhtml
-index 2faed30e09511c381051bc40910a883d1d7bc10d..959fa83f647a8919641c5b852a4cb8814fca9ab5 100644
+index d58fcdf99843d110b708f3fbf9fb317787fadfcf..ba37068c52b24c6ebcb835c59b43ca2f1621a001 100644
 --- a/browser/base/content/browser-box.inc.xhtml
 +++ b/browser/base/content/browser-box.inc.xhtml
@@ -3,6 +3,9 @@
@@ -25,7 +25,7 @@ index 2faed30e09511c381051bc40910a883d1d7bc10d..959fa83f647a8919641c5b852a4cb881
 +#include zen-tabbrowser-elements.inc.xhtml
     <tabpanels id="tabbrowser-tabpanels" flex="1" selectedIndex="0"/>
   </tabbox>
-   <splitter id="ai-window-splitter" class="chromeclass-extrachrome sidebar-splitter" resizebefore="none" resizeafter="sibling" hidden="true"/>
+   <splitter id="ai-window-splitter" class="chromeclass-extrachrome sidebar-splitter" resizebefore="none" resizeafter="sibling" collapsed="true"/>
@@ -34,3 +43,5 @@
     </stack>
   </vbox>
--- a/src/browser/base/content/browser-commands-js.patch
+++ b/src/browser/base/content/browser-commands-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser-commands.js b/browser/base/content/browser-commands.js
-index 75ddd82c18979571f377dec94fe1883f1349cc16..129d78214db53fc8dbd17d23b4a5a042ec297a41 100644
+index e7f88f69fcc22efca4c7fc0363b9fe2729e1be6f..d7c4063d38576a34545b9af06c37937dc9090628 100644
 --- a/browser/base/content/browser-commands.js
 +++ b/browser/base/content/browser-commands.js
@@ -14,6 +14,10 @@ var BrowserCommands = {
@@ -13,7 +13,7 @@ index 75ddd82c18979571f377dec94fe1883f1349cc16..129d78214db53fc8dbd17d23b4a5a042
       try {
         gBrowser.goBack();
       } catch (ex) {}
-@@ -315,6 +319,10 @@ var BrowserCommands = {
+@@ -229,6 +233,10 @@ var BrowserCommands = {
       }
     }
 
@@ -24,7 +24,7 @@ index 75ddd82c18979571f377dec94fe1883f1349cc16..129d78214db53fc8dbd17d23b4a5a042
     // A notification intended to be useful for modular peformance tracking
     // starting as close as is reasonably possible to the time when the user
     // expressed the intent to open a new tab.  Since there are a lot of
-@@ -399,6 +407,14 @@ var BrowserCommands = {
+@@ -313,6 +321,14 @@ var BrowserCommands = {
       return;
     }
 
@@ -39,7 +39,7 @@ index 75ddd82c18979571f377dec94fe1883f1349cc16..129d78214db53fc8dbd17d23b4a5a042
     // Keyboard shortcuts that would close a tab that is pinned select the first
     // unpinned tab instead.
     if (
-@@ -406,8 +422,8 @@ var BrowserCommands = {
+@@ -320,8 +336,8 @@ var BrowserCommands = {
       (event.ctrlKey || event.metaKey || event.altKey) &&
       gBrowser.selectedTab.pinned
     ) {
--- a/src/browser/base/content/browser-fullScreenAndPointerLock-js.patch
+++ b/src/browser/base/content/browser-fullScreenAndPointerLock-js.patch
@@ -1,13 +1,13 @@
 diff --git a/browser/base/content/browser-fullScreenAndPointerLock.js b/browser/base/content/browser-fullScreenAndPointerLock.js
-index 38b4267c737ba247068e1001c12f1cb93cd248f7..f0d7002246645de48dd3ed24a84122d0bcc95b5a 100644
+index cd46701e9f4b672f392533c9ecc1c8570c3b2c5a..beb992702ea90e0b81f7bda4a6c0522932e84dfe 100644
 --- a/browser/base/content/browser-fullScreenAndPointerLock.js
 +++ b/browser/base/content/browser-fullScreenAndPointerLock.js
-@@ -461,8 +461,6 @@ var FullScreen = {
-     gNavToolbox.classList.toggle("fullscreen-with-menubar", shiftSize > 0);
- 
-     let transform = shiftSize > 0 ? `translateY(${shiftSize}px)` : "";
-    gNavToolbox.style.transform = transform;
-    gURLBar.style.transform = gURLBar.hasAttribute("breakout") ? transform : "";
+@@ -464,8 +464,6 @@ var FullScreen = {
+     // don't need that kind of precision in our CSS.
+     shiftSize = shiftSize.toFixed(2);
+     let translate = shiftSize > 0 ? `0 ${shiftSize}px` : "";
+-    document.body.style.translate = translate;
+-    gURLBar.style.translate = gURLBar.hasAttribute("breakout") ? translate : "";
     let searchbar = document.getElementById("searchbar-new");
     if (searchbar) {
-       searchbar.style.transform = searchbar.hasAttribute("breakout")
+       searchbar.style.translate = searchbar.hasAttribute("breakout")
--- a/src/browser/base/content/browser-init-js.patch
+++ b/src/browser/base/content/browser-init-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/browser-init.js b/browser/base/content/browser-init.js
-index dba83914d1131616ead67f48949bda74105b7d46..86294fe79cd30b2a24b20738c9cd1f5114e8e669 100644
+index b64d2f52ed1eb3d0b8aa86700bc082d3fc95152b..dd8636148d0646f6949d6279d70e20c09d8c7c17 100644
 --- a/browser/base/content/browser-init.js
 +++ b/browser/base/content/browser-init.js
-@@ -247,6 +247,7 @@ var gBrowserInit = {
+@@ -252,6 +252,7 @@ var gBrowserInit = {
   },
 
   onLoad() {
@@ -10,7 +10,7 @@ index dba83914d1131616ead67f48949bda74105b7d46..86294fe79cd30b2a24b20738c9cd1f51
     gBrowser.addEventListener("DOMUpdateBlockedPopups", e =>
       PopupAndRedirectBlockerObserver.handleEvent(e)
     );
-@@ -444,6 +445,7 @@ var gBrowserInit = {
+@@ -446,6 +447,7 @@ var gBrowserInit = {
 
     this._handleURIToLoad();
 
--- a/src/browser/base/content/browser-js.patch
+++ b/src/browser/base/content/browser-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
-index 0ea3d82b88819c41ffd866ae9533ebb5a7bff957..3ed2fc4d08b20883e0587e4435daacd86ad603de 100644
+index 942bb5688e98f66ad71560fb32e1ca26a8081edf..25ba741c35c49afbf4e6053df3a0a7296d3040d8 100644
 --- a/browser/base/content/browser.js
 +++ b/browser/base/content/browser.js
@@ -33,6 +33,7 @@ ChromeUtils.defineESModuleGetters(this, {
@@ -10,7 +10,7 @@ index 0ea3d82b88819c41ffd866ae9533ebb5a7bff957..3ed2fc4d08b20883e0587e4435daacd8
   DevToolsSocketStatus:
     "resource://devtools/shared/security/DevToolsSocketStatus.sys.mjs",
   DownloadUtils: "resource://gre/modules/DownloadUtils.sys.mjs",
-@@ -814,7 +815,12 @@ function UpdateBackForwardCommands(aWebNavigation) {
+@@ -816,7 +817,12 @@ function UpdateBackForwardCommands(aWebNavigation) {
 
   var backDisabled = backCommand.hasAttribute("disabled");
   var forwardDisabled = forwardCommand.hasAttribute("disabled");
@@ -24,7 +24,7 @@ index 0ea3d82b88819c41ffd866ae9533ebb5a7bff957..3ed2fc4d08b20883e0587e4435daacd8
     if (backDisabled) {
       backCommand.removeAttribute("disabled");
     } else {
-@@ -3820,7 +3826,7 @@ function warnAboutClosingWindow() {
+@@ -3830,7 +3836,7 @@ function warnAboutClosingWindow() {
 
   if (!isPBWindow && !toolbar.visible) {
     return gBrowser.warnAboutClosingTabs(
@@ -33,7 +33,7 @@ index 0ea3d82b88819c41ffd866ae9533ebb5a7bff957..3ed2fc4d08b20883e0587e4435daacd8
       gBrowser.closingTabsEnum.ALL
     );
   }
-@@ -3860,7 +3866,7 @@ function warnAboutClosingWindow() {
+@@ -3870,7 +3876,7 @@ function warnAboutClosingWindow() {
     return (
       isPBWindow ||
       gBrowser.warnAboutClosingTabs(
@@ -42,7 +42,7 @@ index 0ea3d82b88819c41ffd866ae9533ebb5a7bff957..3ed2fc4d08b20883e0587e4435daacd8
         gBrowser.closingTabsEnum.ALL
       )
     );
-@@ -3885,7 +3891,7 @@ function warnAboutClosingWindow() {
+@@ -3895,7 +3901,7 @@ function warnAboutClosingWindow() {
     AppConstants.platform != "macosx" ||
     isPBWindow ||
     gBrowser.warnAboutClosingTabs(
@@ -51,7 +51,7 @@ index 0ea3d82b88819c41ffd866ae9533ebb5a7bff957..3ed2fc4d08b20883e0587e4435daacd8
       gBrowser.closingTabsEnum.ALL
     )
   );
-@@ -4825,6 +4831,9 @@ var ConfirmationHint = {
+@@ -4835,6 +4841,9 @@ var ConfirmationHint = {
     }
 
     document.l10n.setAttributes(this._message, messageId, options.l10nArgs);
--- a/src/browser/base/content/browser-sets-js.patch
+++ b/src/browser/base/content/browser-sets-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser-sets.js b/browser/base/content/browser-sets.js
-index 2918f0c46f404cba1658d4da823c6ca41cba8ded..2cb8e8c1c9dd1059bee45911159bf392f3a86ee9 100644
+index d9ab2ad00b862d56ea7aa8e2469d050d8df7f5dc..2efb25ff9cfd3a224724fffadfa0aee693ddf47d 100644
 --- a/browser/base/content/browser-sets.js
 +++ b/browser/base/content/browser-sets.js
@@ -272,7 +272,7 @@ document.addEventListener(
--- a/src/browser/base/content/browser-xhtml.patch
+++ b/src/browser/base/content/browser-xhtml.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser.xhtml b/browser/base/content/browser.xhtml
-index a95ce8f0b28d98632c06f605b510b5ae3e98c4ed..275b3f5f30046a5e08d9ebceff0d2b91c865eb1b 100644
+index b42287485c2baeabe831b0d54c6f09330b0caabd..6426bb6742401470e4e48b4049cd365e2a5952e8 100644
 --- a/browser/base/content/browser.xhtml
 +++ b/browser/base/content/browser.xhtml
@@ -19,6 +19,7 @@
@@ -10,7 +10,7 @@ index a95ce8f0b28d98632c06f605b510b5ae3e98c4ed..275b3f5f30046a5e08d9ebceff0d2b91
         persist="screenX screenY width height sizemode"
         data-l10n-sync="true">
 <head>
-@@ -100,8 +101,10 @@
+@@ -101,8 +102,10 @@
 
   <title data-l10n-id="browser-main-window-default-title"></title>
 
@@ -21,7 +21,7 @@ index a95ce8f0b28d98632c06f605b510b5ae3e98c4ed..275b3f5f30046a5e08d9ebceff0d2b91
 </head>
 <html:body xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 # All sets except for popupsets (commands, keys, and stringbundles)
-@@ -134,9 +137,11 @@
+@@ -135,9 +138,11 @@
     </vbox>
   </html:template>
 
--- a/src/browser/base/content/main-popupset-inc-xhtml.patch
+++ b/src/browser/base/content/main-popupset-inc-xhtml.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/main-popupset.inc.xhtml b/browser/base/content/main-popupset.inc.xhtml
-index 0d73eb17b340001312a885ea10f5d6ad871f14d2..475824a0f9a4bbc15dc9bc7f1d2a09a51e58bc65 100644
+index 81b3d0a744b9f40358219696e0e52a8114c53e83..71eb93e50f19af1d8f44fb425970cc87416c84a3 100644
 --- a/browser/base/content/main-popupset.inc.xhtml
 +++ b/browser/base/content/main-popupset.inc.xhtml
-@@ -234,6 +234,10 @@
+@@ -235,6 +235,10 @@
            hidden="true"
            tabspecific="true"
            aria-labelledby="editBookmarkPanelTitle">
@@ -13,7 +13,7 @@ index 0d73eb17b340001312a885ea10f5d6ad871f14d2..475824a0f9a4bbc15dc9bc7f1d2a09a5
       <box class="panel-header">
         <html:h1>
           <html:span id="editBookmarkPanelTitle"/>
-@@ -259,6 +263,7 @@
+@@ -260,6 +264,7 @@
                   class="footer-button"/>
         </html:moz-button-group>
       </vbox>
@@ -21,7 +21,7 @@ index 0d73eb17b340001312a885ea10f5d6ad871f14d2..475824a0f9a4bbc15dc9bc7f1d2a09a5
     </panel>
   </html:template>
 
-@@ -678,6 +683,8 @@
+@@ -699,6 +704,8 @@
 
 #include popup-notifications.inc.xhtml
 
--- a/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
+++ b/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
@@ -1,13 +1,13 @@
 diff --git a/browser/base/content/navigator-toolbox.inc.xhtml b/browser/base/content/navigator-toolbox.inc.xhtml
-index 3f7b85086de11923f9453c8f02afb517c49afa8b..5be31a0cb3c5a52ba90cd2cd7f333a0354d9f2af 100644
+index edeb473e46b3aa4b12eb4b59ce62e5ae48edd2a1..d2c6c8c150e732b77d65420520ca4905a9d3ea4d 100644
 --- a/browser/base/content/navigator-toolbox.inc.xhtml
 +++ b/browser/base/content/navigator-toolbox.inc.xhtml
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-<toolbox id="navigator-toolbox" class="browser-toolbox-background">
-+<toolbox id="navigator-toolbox" class="browser-toolbox-background" persist="width style">
+-<toolbox id="navigator-toolbox">
+<toolbox id="navigator-toolbox" persist="width style">
   <script src="chrome://browser/content/navigator-toolbox.js" />
 
   <!-- Menu -->
--- a/src/browser/base/content/nsContextMenu-sys-mjs.patch
+++ b/src/browser/base/content/nsContextMenu-sys-mjs.patch
@@ -1,10 +1,10 @@
 diff --git a/browser/base/content/nsContextMenu.sys.mjs b/browser/base/content/nsContextMenu.sys.mjs
-index a929907fcaf893c00259f56815f202ba475e1e41..9e15f5b8f8eb3fa31fd463e383794acd18314767 100644
+index 5ee0ee4246d1c267b75328666a7f7f54e6f93246..ae778b88e1d295cdae2d0433d943ac467081b126 100644
 --- a/browser/base/content/nsContextMenu.sys.mjs
 +++ b/browser/base/content/nsContextMenu.sys.mjs
-@@ -377,6 +377,9 @@ export class nsContextMenu {
-     this.initPDFItems();
+@@ -370,6 +370,9 @@ export class nsContextMenu {
     this.initTextFragmentItems();
+     this.pdfjsContextMenu.initItems();
 
 +    this.showItem("context-zenSplitLink", this.onLink && !this.onMailtoLink && !this.onTelLink);
 +    this.showItem("context-zenOpenLinkInGlance", this.onLink && !this.onMailtoLink && !this.onTelLink); 
--- a/src/browser/base/jar-mn.patch
+++ b/src/browser/base/jar-mn.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/jar.mn b/browser/base/jar.mn
-index 22550debb8bba2a06bcd34ba9a21737105be5d92..fb4832243078c78926a66693f4ebe447c692b393 100644
+index 7eaca95f7e876809552da5a3af3449b7e7b1a34d..00f1e3047c59565c8830a40da3a85f3b228f7c93 100644
 --- a/browser/base/jar.mn
 +++ b/browser/base/jar.mn
-@@ -108,3 +108,5 @@ browser.jar:
+@@ -110,3 +110,5 @@ browser.jar:
 
 # L10n resources and overrides.
 % override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties
--- a/src/browser/components/BrowserGlue-sys-mjs.patch
+++ b/src/browser/components/BrowserGlue-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/BrowserGlue.sys.mjs b/browser/components/BrowserGlue.sys.mjs
-index 938b7aa84266ad92b6654b4e44f7bca3dc315912..cb4f544e3cb9e035d17079c11420d72148db0d33 100644
+index 75cdab491d35dc30be6c0a4ec6ab88e6fb4239aa..9c26fb1d6032bdecd6c552bd25694f45e3822d50 100644
 --- a/browser/components/BrowserGlue.sys.mjs
 +++ b/browser/components/BrowserGlue.sys.mjs
@@ -8,6 +8,7 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
@@ -10,7 +10,7 @@ index 938b7aa84266ad92b6654b4e44f7bca3dc315912..cb4f544e3cb9e035d17079c11420d721
   AboutHomeStartupCache: "resource:///modules/AboutHomeStartupCache.sys.mjs",
   AWToolbarButton: "resource:///modules/aboutwelcome/AWToolbarUtils.sys.mjs",
   ASRouter: "resource:///modules/asrouter/ASRouter.sys.mjs",
-@@ -1456,7 +1457,7 @@ BrowserGlue.prototype = {
+@@ -1457,7 +1458,7 @@ BrowserGlue.prototype = {
       windowcount++;
       let tabbrowser = win.gBrowser;
       if (tabbrowser) {
@@ -19,7 +19,7 @@ index 938b7aa84266ad92b6654b4e44f7bca3dc315912..cb4f544e3cb9e035d17079c11420d721
       }
     }
 
-@@ -1621,6 +1622,8 @@ BrowserGlue.prototype = {
+@@ -1622,6 +1623,8 @@ BrowserGlue.prototype = {
     } else if (profileDataVersion < APP_DATA_VERSION) {
       lazy.ProfileDataUpgrader.upgrade(profileDataVersion, APP_DATA_VERSION);
     }
--- a/src/browser/components/aboutwelcome/content/aboutwelcome-css.patch
+++ b/src/browser/components/aboutwelcome/content/aboutwelcome-css.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/aboutwelcome/content/aboutwelcome.css b/browser/components/aboutwelcome/content/aboutwelcome.css
-index 6952ca1c306aa8815f662d8c557d4dd6b79fce0f..ce420f1b2f57e3f23ef18cac20938662f3ecf1ae 100644
+index e5bbb4c217ae7b05a2da79b332d72cc5429f061f..ea44d83dd0825a3bc950f6005025498644c7fc67 100644
 --- a/browser/components/aboutwelcome/content/aboutwelcome.css
 +++ b/browser/components/aboutwelcome/content/aboutwelcome.css
@@ -331,6 +331,11 @@ panel#feature-callout {
@@ -14,7 +14,7 @@ index 6952ca1c306aa8815f662d8c557d4dd6b79fce0f..ce420f1b2f57e3f23ef18cac20938662
 }
 
 panel#feature-callout::part(content) {
-@@ -517,6 +522,12 @@ div#feature-callout.hidden {
+@@ -518,6 +523,12 @@ div#feature-callout.hidden {
   width: 25em;
   gap: 16px;
   background: var(--fc-background);
@@ -27,7 +27,7 @@ index 6952ca1c306aa8815f662d8c557d4dd6b79fce0f..ce420f1b2f57e3f23ef18cac20938662
 }
 #feature-callout .screen[pos=callout] .section-main .main-content .main-content-inner {
   gap: 12px;
-@@ -830,6 +841,10 @@ panel#feature-callout::part(content) {
+@@ -850,6 +861,10 @@ panel#feature-callout::part(content) {
   overflow: visible;
   transform: rotate(45deg);
   transform-style: preserve-3d;
--- a/src/browser/components/aiwindow/ui/modules/AIWindow-sys-mjs.patch
+++ b/src/browser/components/aiwindow/ui/modules/AIWindow-sys-mjs.patch
@@ -1,12 +1,12 @@
 diff --git a/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs b/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs
-index 7338737a25c2b75f28c48f573a58b72ec326ad3b..7cf3aa1164d38bc9daaa010f27c567e0d9792bc6 100644
+index 4081f59d041e91291d5e6b6b8c9ad96db5b6b2dc..d420a2fe4ca552b7f24ce9fbefc5f7302d7f2c8e 100644
 --- a/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs
 +++ b/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs
-@@ -200,6 +200,7 @@ export const AIWindow = {
+@@ -269,6 +269,7 @@ export const AIWindow = {
   },
 
-   _updateWindowSwitcherPosition(win) {
+   _updateToolbarButtonPositions(win, { isToggling = false } = {}) {
 +    return;
     const modeSwitcherButton = win.document.getElementById("ai-window-toggle");
+     const hamburgerMenu = win.document.getElementById("PanelUI-button");
 
-     const targetToolbar = win.document.getElementById(
--- a/src/browser/components/asrouter/modules/FeatureCallout-sys-mjs.patch
+++ b/src/browser/components/asrouter/modules/FeatureCallout-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/asrouter/modules/FeatureCallout.sys.mjs b/browser/components/asrouter/modules/FeatureCallout.sys.mjs
-index a380e024e4ad6f77ad3ad74bb7a0784d7dfb6ff3..e990f8c2412f48ca5272a7741dcb7445a406462e 100644
+index f176498a3130b61ac5e75fce8208d1b9eaf13f81..d133526ab5bf3db53e459c36d5f9a7ff37ef972f 100644
 --- a/browser/components/asrouter/modules/FeatureCallout.sys.mjs
 +++ b/browser/components/asrouter/modules/FeatureCallout.sys.mjs
@@ -778,6 +778,7 @@ export class FeatureCallout {
--- a/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
+++ b/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/customizableui/CustomizableUI.sys.mjs b/browser/components/customizableui/CustomizableUI.sys.mjs
-index 4aca0aa0c90603e09b58395debb62875c018a8cf..400ad196c846083001b36d27edec6885c6bde16d 100644
+index db617c65b89643015d91b0f6a20eab7d7a1b598f..9acef640800bdc75f477a8e14e73f08f535e9d9e 100644
 --- a/browser/components/customizableui/CustomizableUI.sys.mjs
 +++ b/browser/components/customizableui/CustomizableUI.sys.mjs
@@ -14,6 +14,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
@@ -127,7 +127,7 @@ index 4aca0aa0c90603e09b58395debb62875c018a8cf..400ad196c846083001b36d27edec6885
     this.notifyDOMChange(aNode, aNextNode, aContainer, false, () => {
       this.setLocationAttributes(aNode, aAreaId);
       aContainer.insertBefore(aNode, aNextNode);
-@@ -4554,7 +4552,7 @@ var CustomizableUIInternal = {
+@@ -4565,7 +4563,7 @@ var CustomizableUIInternal = {
    * For all registered areas, builds those areas to reflect the current
    * placement state of all widgets.
    */
@@ -136,7 +136,7 @@ index 4aca0aa0c90603e09b58395debb62875c018a8cf..400ad196c846083001b36d27edec6885
     for (let [areaId, areaNodes] of gBuildAreas) {
       let placements = gPlacements.get(areaId);
       let isFirstChangedToolbar = true;
-@@ -4565,7 +4563,7 @@ var CustomizableUIInternal = {
+@@ -4576,7 +4574,7 @@ var CustomizableUIInternal = {
         if (area.get("type") == CustomizableUI.TYPE_TOOLBAR) {
           let defaultCollapsed = area.get("defaultCollapsed");
           let win = areaNode.ownerGlobal;
@@ -145,7 +145,7 @@ index 4aca0aa0c90603e09b58395debb62875c018a8cf..400ad196c846083001b36d27edec6885
             win.setToolbarVisibility(
               areaNode,
               typeof defaultCollapsed == "string"
-@@ -5856,6 +5854,7 @@ export var CustomizableUI = {
+@@ -5867,6 +5865,7 @@ export var CustomizableUI = {
   unregisterArea(aName, aDestroyPlacements) {
     CustomizableUIInternal.unregisterArea(aName, aDestroyPlacements);
   },
@@ -153,7 +153,7 @@ index 4aca0aa0c90603e09b58395debb62875c018a8cf..400ad196c846083001b36d27edec6885
   /**
    * Add a widget to an area.
    * If the area to which you try to add is not known to CustomizableUI,
-@@ -7819,7 +7818,9 @@ class OverflowableToolbar {
+@@ -7830,7 +7829,9 @@ class OverflowableToolbar {
         );
 
         if (webExtList && CustomizableUI.isWebExtensionWidget(child.id)) {
@@ -163,7 +163,7 @@ index 4aca0aa0c90603e09b58395debb62875c018a8cf..400ad196c846083001b36d27edec6885
           webExtList.insertBefore(child, webExtList.firstElementChild);
         } else {
           child.setAttribute("cui-anchorid", this.#defaultListButton.id);
-@@ -7879,7 +7880,7 @@ class OverflowableToolbar {
+@@ -7890,7 +7891,7 @@ class OverflowableToolbar {
         ) {
           continue;
         }
@@ -172,7 +172,7 @@ index 4aca0aa0c90603e09b58395debb62875c018a8cf..400ad196c846083001b36d27edec6885
         if (child != aExceptChild) {
           sum += getInlineSize(child);
         }
-@@ -7903,11 +7904,11 @@ class OverflowableToolbar {
+@@ -7914,11 +7915,11 @@ class OverflowableToolbar {
         parseFloat(style.paddingLeft) -
         parseFloat(style.paddingRight) -
         toolbarChildrenWidth;
@@ -186,7 +186,7 @@ index 4aca0aa0c90603e09b58395debb62875c018a8cf..400ad196c846083001b36d27edec6885
     });
 
     lazy.log.debug(
-@@ -7922,7 +7923,14 @@ class OverflowableToolbar {
+@@ -7933,7 +7934,14 @@ class OverflowableToolbar {
       Math.max(targetWidth, targetChildrenWidth)
     );
     totalAvailWidth = Math.ceil(totalAvailWidth);
@@ -202,7 +202,7 @@ index 4aca0aa0c90603e09b58395debb62875c018a8cf..400ad196c846083001b36d27edec6885
     return { isOverflowing, targetContentWidth, totalAvailWidth };
   }
 
-@@ -7983,7 +7991,11 @@ class OverflowableToolbar {
+@@ -7994,7 +8002,11 @@ class OverflowableToolbar {
             return;
           }
         }
@@ -215,7 +215,7 @@ index 4aca0aa0c90603e09b58395debb62875c018a8cf..400ad196c846083001b36d27edec6885
           lazy.log.debug(
             `Need ${minSize} but width is ${totalAvailWidth} so bailing`
           );
-@@ -8016,7 +8028,7 @@ class OverflowableToolbar {
+@@ -8027,7 +8039,7 @@ class OverflowableToolbar {
         }
       }
       if (!inserted) {
@@ -224,7 +224,7 @@ index 4aca0aa0c90603e09b58395debb62875c018a8cf..400ad196c846083001b36d27edec6885
       }
       child.removeAttribute("cui-anchorid");
       child.removeAttribute("overflowedItem");
-@@ -8142,6 +8154,9 @@ class OverflowableToolbar {
+@@ -8153,6 +8165,9 @@ class OverflowableToolbar {
    *   if no such list exists.
    */
   get #webExtList() {
@@ -234,7 +234,7 @@ index 4aca0aa0c90603e09b58395debb62875c018a8cf..400ad196c846083001b36d27edec6885
     if (!this.#webExtListRef) {
       let targetID = this.#toolbar.getAttribute("addon-webext-overflowtarget");
       if (!targetID) {
-@@ -8153,6 +8168,9 @@ class OverflowableToolbar {
+@@ -8164,6 +8179,9 @@ class OverflowableToolbar {
       let win = this.#toolbar.ownerGlobal;
       let { panel } = win.gUnifiedExtensions;
       this.#webExtListRef = panel.querySelector(`#${targetID}`);
@@ -244,7 +244,7 @@ index 4aca0aa0c90603e09b58395debb62875c018a8cf..400ad196c846083001b36d27edec6885
     }
     return this.#webExtListRef;
   }
-@@ -8361,7 +8379,7 @@ class OverflowableToolbar {
+@@ -8372,7 +8390,7 @@ class OverflowableToolbar {
         break;
       }
       case "mousedown": {
--- a/src/browser/components/customizableui/content/panelUI-js.patch
+++ b/src/browser/components/customizableui/content/panelUI-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/customizableui/content/panelUI.js b/browser/components/customizableui/content/panelUI.js
-index e21e54525d197ca5e4c1a62999f9c34c5b4eda7d..3a57749000ba3f04c0dbd034f89e1458f5fa355e 100644
+index 5056ff7fba62f8340c58cbaa30833aad12b4fc70..32dbd206cbc8576ec5a5f958f43670fa90c050b8 100644
 --- a/browser/components/customizableui/content/panelUI.js
 +++ b/browser/components/customizableui/content/panelUI.js
-@@ -627,10 +627,12 @@ const PanelUI = {
+@@ -647,10 +647,12 @@ const PanelUI = {
     if (hasKids && !this.navbar.hasAttribute("nonemptyoverflow")) {
       this.navbar.setAttribute("nonemptyoverflow", "true");
       this.overflowPanel.setAttribute("hasfixeditems", "true");
@@ -15,7 +15,7 @@ index e21e54525d197ca5e4c1a62999f9c34c5b4eda7d..3a57749000ba3f04c0dbd034f89e1458
     }
   },
 
-@@ -978,7 +980,7 @@ const PanelUI = {
+@@ -998,7 +1000,7 @@ const PanelUI = {
         el.removeAttribute("data-lazy-l10n-id");
       });
 
--- a/src/browser/components/extensions/parent/ext-tabs-js.patch
+++ b/src/browser/components/extensions/parent/ext-tabs-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/extensions/parent/ext-tabs.js b/browser/components/extensions/parent/ext-tabs.js
-index 019aa2ef81f76ce4921e261fd4c65c11a28c4149..4848aa4d7d4ad6b11a64abff65d2637de09bd9a5 100644
+index ae004ad48e86aae9d13fc6aa5f77f3095763f829..1e3d14a5c6fcbebbc677e0e57ef2b2176a141a3c 100644
 --- a/browser/components/extensions/parent/ext-tabs.js
 +++ b/browser/components/extensions/parent/ext-tabs.js
@@ -516,6 +516,7 @@ this.tabs = class extends ExtensionAPIPersistent {
--- a/src/browser/components/preferences/jar-mn.patch
+++ b/src/browser/components/preferences/jar-mn.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/preferences/jar.mn b/browser/components/preferences/jar.mn
-index bd094a48b418b8ff1e28ebbe722877262868d750..47f026b74f75329406fe021402124d5307cf6e32 100644
+index b2d65603ec714b49249789d0e48b0b677c9eaea6..6cea34be90e2f181fd3e5770f7e2fd99c483b8d8 100644
 --- a/browser/components/preferences/jar.mn
 +++ b/browser/components/preferences/jar.mn
-@@ -49,3 +49,5 @@ browser.jar:
+@@ -51,3 +51,5 @@ browser.jar:
    content/browser/preferences/widgets/sync-device-name.mjs          (widgets/sync-device-name/sync-device-name.mjs)
    content/browser/preferences/widgets/sync-engines-list.mjs          (widgets/sync-engine-list/sync-engines-list.mjs)
    content/browser/preferences/widgets/sync-engines-list.css          (widgets/sync-engine-list/sync-engines-list.css)
--- a/src/browser/components/preferences/main-inc-xhtml.patch
+++ b/src/browser/components/preferences/main-inc-xhtml.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/preferences/main.inc.xhtml b/browser/components/preferences/main.inc.xhtml
-index f23beeb5c793bc7a6cbea4512a5f2cd379ec98c7..09617b8fbbd01e87b97e323cb3f7ca055bc06778 100644
+index 7d6bbc54d21bf149dd1b99a38ca803654e6908eb..4da0e5fc921bb0ee24ace443c0c119fdd2707fc9 100644
 --- a/browser/components/preferences/main.inc.xhtml
 +++ b/browser/components/preferences/main.inc.xhtml
@@ -96,6 +96,7 @@
--- a/src/browser/components/preferences/main-js.patch
+++ b/src/browser/components/preferences/main-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js
-index a5f2e4258942010ee61ed7a86497f51793366fcd..f01524a09512ec6cd1972a9fdb173ff427a0d753 100644
+index 8f8da3c4cabb4a05b50431b1feeff8f1f1abcf6e..97c651cb3728353b9a0d09d1aaa9ba87f8c05b57 100644
 --- a/browser/components/preferences/main.js
 +++ b/browser/components/preferences/main.js
-@@ -2652,6 +2652,11 @@ SettingGroupManager.registerGroups({
+@@ -2658,6 +2658,11 @@ function createStartupConfig(hidden = false) {
         id: "browserRestoreSession",
         l10nId: "startup-restore-windows-and-tabs",
       },
@@ -14,7 +14,7 @@ index a5f2e4258942010ee61ed7a86497f51793366fcd..f01524a09512ec6cd1972a9fdb173ff4
       {
         id: "windowsLaunchOnLogin",
         l10nId: "windows-launch-on-login",
-@@ -5277,7 +5282,7 @@ function getBundleForLocales(newLocales) {
+@@ -5174,7 +5179,7 @@ function getBundleForLocales(newLocales) {
     ])
   );
   return new Localization(
--- a/src/browser/components/preferences/preferences-js.patch
+++ b/src/browser/components/preferences/preferences-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js
-index 3c60cc9f199ba5836ea1233fbbeb74a6dd63b0c0..252966bca1c8c915885b6c6391360fb6cd90f5ba 100644
+index 2d6cba7fac0c7de6d7c4a819f2c7ad20ce10bb33..15434dac6b501cf6f7a6968c6363c59288043c3e 100644
 --- a/browser/components/preferences/preferences.js
 +++ b/browser/components/preferences/preferences.js
-@@ -119,6 +119,7 @@ ChromeUtils.defineLazyGetter(this, "gSubDialog", function () {
+@@ -121,6 +121,7 @@ ChromeUtils.defineLazyGetter(this, "gSubDialog", function () {
       styleSheets: [
         "chrome://browser/skin/preferences/dialog.css",
         "chrome://browser/skin/preferences/preferences.css",
@@ -10,7 +10,7 @@ index 3c60cc9f199ba5836ea1233fbbeb74a6dd63b0c0..252966bca1c8c915885b6c6391360fb6
       ],
       resizeCallback: async ({ title, frame }) => {
         // Search within main document and highlight matched keyword.
-@@ -359,6 +360,10 @@ function init_all() {
+@@ -324,6 +325,10 @@ function init_all() {
   register_module("paneSearch", gSearchPane);
   register_module("panePrivacy", gPrivacyPane);
   register_module("paneContainers", gContainersPane);
@@ -19,5 +19,5 @@ index 3c60cc9f199ba5836ea1233fbbeb74a6dd63b0c0..252966bca1c8c915885b6c6391360fb6
 +  register_module("paneZenCKS", gZenCKSSettings);
 +  register_module("paneZenMarketplace", gZenMarketplaceManager);
 
-   for (let [id, config] of Object.entries(CONFIG_PANES)) {
-     SettingPaneManager.registerPane(id, config);
+   let redesignEnabled = Services.prefs.getBoolPref(
+     "browser.settings-redesign.enabled"
--- a/src/browser/components/preferences/preferences-xhtml.patch
+++ b/src/browser/components/preferences/preferences-xhtml.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml
-index b006d5e5e64c418fbf930c010401e4ea3a3647a3..27886c04258e40f7c6ec444320a9a2a1cf960db0 100644
+index b006d5e5e64c418fbf930c010401e4ea3a3647a3..ed75c48a2cdf47dd957b0598282fb211ca2fb1b5 100644
 --- a/browser/components/preferences/preferences.xhtml
 +++ b/browser/components/preferences/preferences.xhtml
@@ -42,6 +42,8 @@
@@ -11,19 +11,7 @@ index b006d5e5e64c418fbf930c010401e4ea3a3647a3..27886c04258e40f7c6ec444320a9a2a1
   <link rel="localization" href="branding/brand.ftl"/>
   <link rel="localization" href="browser/browser.ftl"/>
     <!-- Used by fontbuilder.js -->
-@@ -112,6 +114,11 @@
-   <hbox flex="1">
- 
-     <vbox class="navigation">
-+      <html:moz-input-search
-+        id="searchInput"
-+        data-l10n-id="search-input-box2"
-+        data-l10n-attrs="placeholder, style"
-+        />
-       <!-- category list -->
-       <richlistbox id="categories" data-l10n-id="category-list" data-l10n-attrs="aria-label">
-         <richlistitem id="category-general"
-@@ -124,6 +131,50 @@
+@@ -124,6 +126,50 @@
           <label class="category-name" flex="1" data-l10n-id="pane-general-title"></label>
         </richlistitem>
 
@@ -74,18 +62,6 @@ index b006d5e5e64c418fbf930c010401e4ea3a3647a3..27886c04258e40f7c6ec444320a9a2a1
         <richlistitem id="category-home"
                       class="category"
                       value="paneHome"
-@@ -249,11 +300,6 @@
-                 <html:a href="about:policies" target="_blank" data-l10n-id="managed-notice"/>
-               </hbox>
-             </hbox>
-            <html:moz-input-search
-              id="searchInput"
-              data-l10n-id="search-input-box2"
-              data-l10n-attrs="placeholder, style"
-              />
-           </hbox>
-         </hbox>
-         <vbox id="mainPrefPane">
@@ -266,6 +312,10 @@
 #include sync.inc.xhtml
 #include experimental.inc.xhtml
--- a/src/browser/components/preferences/sync-inc-xhtml.patch
+++ b/src/browser/components/preferences/sync-inc-xhtml.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/preferences/sync.inc.xhtml b/browser/components/preferences/sync.inc.xhtml
-index d473643ccf12b1f1116acaed2d5541622982ee6e..2e3496c24533f4c663c9b07bf689d18c1ed11b95 100644
+index b889d42301de3c4f845105bf09d19b052dca9eae..015b751bd46f2499a93e328c903475ce2d60d079 100644
 --- a/browser/components/preferences/sync.inc.xhtml
 +++ b/browser/components/preferences/sync.inc.xhtml
@@ -223,6 +223,10 @@
--- a/src/browser/components/screenshots/overlay/overlay-css.patch
+++ b/src/browser/components/screenshots/overlay/overlay-css.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/screenshots/overlay/overlay.css b/browser/components/screenshots/overlay/overlay.css
-index 94d87522bfaaf59b9138ec5ca960be0a0ea31339..ab3fa41cefdfc1d93edeb8a2d626bd9b1e07344b 100644
+index a2cd691cfcfa7f54f275fcafbb3c6d1a5ef78f0d..bee7703d32404ce3b882e02aa4e60bdad6d43c7f 100644
 --- a/browser/components/screenshots/overlay/overlay.css
 +++ b/browser/components/screenshots/overlay/overlay.css
@@ -200,6 +200,9 @@
--- a/src/browser/components/sessionstore/SessionStore-sys-mjs.patch
+++ b/src/browser/components/sessionstore/SessionStore-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/sessionstore/SessionStore.sys.mjs b/browser/components/sessionstore/SessionStore.sys.mjs
-index 3bebeb70e1a88aefb3ef4bc2114bd85b0d8d1e51..5414adeca242f00bff98c5e41de74f33dd2846bb 100644
+index 71921cec2b6aa0f103856c31254fd6c4affefccb..fbb44402e3201a00eb37765d60829828d40e70ea 100644
 --- a/browser/components/sessionstore/SessionStore.sys.mjs
 +++ b/browser/components/sessionstore/SessionStore.sys.mjs
@@ -129,6 +129,9 @@ const TAB_EVENTS = [
@@ -12,7 +12,7 @@ index 3bebeb70e1a88aefb3ef4bc2114bd85b0d8d1e51..5414adeca242f00bff98c5e41de74f33
 ];
 
 const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-@@ -200,6 +203,8 @@ ChromeUtils.defineESModuleGetters(lazy, {
+@@ -199,6 +202,8 @@ ChromeUtils.defineESModuleGetters(lazy, {
   TabStateCache: "resource:///modules/sessionstore/TabStateCache.sys.mjs",
   TabStateFlusher: "resource:///modules/sessionstore/TabStateFlusher.sys.mjs",
   setTimeout: "resource://gre/modules/Timer.sys.mjs",
@@ -21,7 +21,7 @@ index 3bebeb70e1a88aefb3ef4bc2114bd85b0d8d1e51..5414adeca242f00bff98c5e41de74f33
 });
 
 ChromeUtils.defineLazyGetter(lazy, "blankURI", () => {
-@@ -1292,10 +1297,7 @@ var SessionStoreInternal = {
+@@ -1291,10 +1296,7 @@ var SessionStoreInternal = {
    */
   get willAutoRestore() {
     return (
@@ -33,7 +33,7 @@ index 3bebeb70e1a88aefb3ef4bc2114bd85b0d8d1e51..5414adeca242f00bff98c5e41de74f33
     );
   },
 
-@@ -1972,6 +1974,9 @@ var SessionStoreInternal = {
+@@ -1970,6 +1972,9 @@ var SessionStoreInternal = {
       case "TabPinned":
       case "TabUnpinned":
       case "SwapDocShells":
@@ -43,7 +43,7 @@ index 3bebeb70e1a88aefb3ef4bc2114bd85b0d8d1e51..5414adeca242f00bff98c5e41de74f33
         this.saveStateDelayed(win);
         break;
       case "TabGroupCreate":
-@@ -2085,6 +2090,10 @@ var SessionStoreInternal = {
+@@ -2083,6 +2088,10 @@ var SessionStoreInternal = {
       this._windows[aWindow.__SSi].isTaskbarTab = true;
     }
 
@@ -54,7 +54,7 @@ index 3bebeb70e1a88aefb3ef4bc2114bd85b0d8d1e51..5414adeca242f00bff98c5e41de74f33
     if (lazy.AIWindow.isAIWindowActiveAndEnabled(aWindow)) {
       this._windows[aWindow.__SSi].isAIWindow = true;
     }
-@@ -2121,7 +2130,7 @@ var SessionStoreInternal = {
+@@ -2119,7 +2128,7 @@ var SessionStoreInternal = {
     let isTaskbarTab = this._windows[aWindow.__SSi].isTaskbarTab;
     // A regular window is not a private window, taskbar tab window, or popup window
     let isRegularWindow =
@@ -63,7 +63,7 @@ index 3bebeb70e1a88aefb3ef4bc2114bd85b0d8d1e51..5414adeca242f00bff98c5e41de74f33
 
     // perform additional initialization when the first window is loading
     if (lazy.RunState.isStopped) {
-@@ -2133,7 +2142,7 @@ var SessionStoreInternal = {
+@@ -2131,7 +2140,7 @@ var SessionStoreInternal = {
         // to disk to NOW() to enforce a full interval before the next write.
         lazy.SessionSaver.updateLastSaveTime();
 
@@ -72,7 +72,7 @@ index 3bebeb70e1a88aefb3ef4bc2114bd85b0d8d1e51..5414adeca242f00bff98c5e41de74f33
           this._log.debug(
             "initializeWindow, the window is private or a web app. Saving SessionStartup.state for possibly restoring later"
           );
-@@ -2176,6 +2185,7 @@ var SessionStoreInternal = {
+@@ -2173,6 +2182,7 @@ var SessionStoreInternal = {
           null,
           "sessionstore-one-or-no-tab-restored"
         );
@@ -80,7 +80,7 @@ index 3bebeb70e1a88aefb3ef4bc2114bd85b0d8d1e51..5414adeca242f00bff98c5e41de74f33
         this._deferredAllWindowsRestored.resolve();
       }
       // this window was opened by _openWindowWithState
-@@ -2225,7 +2235,6 @@ var SessionStoreInternal = {
+@@ -2222,7 +2232,6 @@ var SessionStoreInternal = {
       if (closedWindowState) {
         let newWindowState;
         if (
@@ -88,7 +88,7 @@ index 3bebeb70e1a88aefb3ef4bc2114bd85b0d8d1e51..5414adeca242f00bff98c5e41de74f33
           !lazy.SessionStartup.willRestore()
         ) {
           // We want to split the window up into pinned tabs and unpinned tabs.
-@@ -2261,6 +2270,7 @@ var SessionStoreInternal = {
+@@ -2258,6 +2267,7 @@ var SessionStoreInternal = {
         }
 
         if (newWindowState) {
@@ -96,7 +96,7 @@ index 3bebeb70e1a88aefb3ef4bc2114bd85b0d8d1e51..5414adeca242f00bff98c5e41de74f33
           // Ensure that the window state isn't hidden
           this._restoreCount = 1;
           let state = { windows: [newWindowState] };
-@@ -2289,6 +2299,15 @@ var SessionStoreInternal = {
+@@ -2286,6 +2296,15 @@ var SessionStoreInternal = {
       });
       this._shouldRestoreLastSession = false;
     }
@@ -112,7 +112,7 @@ index 3bebeb70e1a88aefb3ef4bc2114bd85b0d8d1e51..5414adeca242f00bff98c5e41de74f33
 
     if (this._restoreLastWindow && aWindow.toolbar.visible) {
       // always reset (if not a popup window)
-@@ -2439,7 +2458,7 @@ var SessionStoreInternal = {
+@@ -2436,7 +2455,7 @@ var SessionStoreInternal = {
 
     var tabbrowser = aWindow.gBrowser;
 
@@ -121,7 +121,7 @@ index 3bebeb70e1a88aefb3ef4bc2114bd85b0d8d1e51..5414adeca242f00bff98c5e41de74f33
 
     TAB_EVENTS.forEach(function (aEvent) {
       tabbrowser.tabContainer.removeEventListener(aEvent, this, true);
-@@ -2490,7 +2509,7 @@ var SessionStoreInternal = {
+@@ -2487,7 +2506,7 @@ var SessionStoreInternal = {
 
       let isLastRegularWindow =
         Object.values(this._windows).filter(
@@ -130,7 +130,7 @@ index 3bebeb70e1a88aefb3ef4bc2114bd85b0d8d1e51..5414adeca242f00bff98c5e41de74f33
         ).length == 1;
       this._log.debug(
         `onClose, closing window isLastRegularWindow? ${isLastRegularWindow}`
-@@ -2547,8 +2566,8 @@ var SessionStoreInternal = {
+@@ -2544,8 +2563,8 @@ var SessionStoreInternal = {
       // 2) Flush the window.
       // 3) When the flush is complete, revisit our decision to store the window
       //    in _closedWindows, and add/remove as necessary.
@@ -141,7 +141,7 @@ index 3bebeb70e1a88aefb3ef4bc2114bd85b0d8d1e51..5414adeca242f00bff98c5e41de74f33
       }
 
       completionPromise = lazy.TabStateFlusher.flushWindow(aWindow).then(() => {
-@@ -2568,8 +2587,9 @@ var SessionStoreInternal = {
+@@ -2565,8 +2584,9 @@ var SessionStoreInternal = {
 
         // Save non-private windows if they have at
         // least one saveable tab or are the last window.
@@ -153,7 +153,7 @@ index 3bebeb70e1a88aefb3ef4bc2114bd85b0d8d1e51..5414adeca242f00bff98c5e41de74f33
 
           if (!isLastWindow && winData.closedId > -1) {
             this._addClosedAction(
-@@ -2645,7 +2665,7 @@ var SessionStoreInternal = {
+@@ -2642,7 +2662,7 @@ var SessionStoreInternal = {
    *        to call this method again asynchronously (for example, after
    *        a window flush).
    */
@@ -162,7 +162,7 @@ index 3bebeb70e1a88aefb3ef4bc2114bd85b0d8d1e51..5414adeca242f00bff98c5e41de74f33
     // Make sure SessionStore is still running, and make sure that we
     // haven't chosen to forget this window.
     if (
-@@ -2662,6 +2682,7 @@ var SessionStoreInternal = {
+@@ -2659,6 +2679,7 @@ var SessionStoreInternal = {
       // _closedWindows from a previous call to this function.
       let winIndex = this._closedWindows.indexOf(winData);
       let alreadyStored = winIndex != -1;
@@ -170,7 +170,7 @@ index 3bebeb70e1a88aefb3ef4bc2114bd85b0d8d1e51..5414adeca242f00bff98c5e41de74f33
       // If sidebar command is truthy, i.e. sidebar is open, store sidebar settings
       let shouldStore = hasSaveableTabs || isLastWindow;
 
-@@ -3483,7 +3504,7 @@ var SessionStoreInternal = {
+@@ -3480,7 +3501,7 @@ var SessionStoreInternal = {
     if (!isPrivateWindow && tabState.isPrivate) {
       return;
     }
@@ -179,7 +179,7 @@ index 3bebeb70e1a88aefb3ef4bc2114bd85b0d8d1e51..5414adeca242f00bff98c5e41de74f33
       return;
     }
 
-@@ -4223,6 +4244,12 @@ var SessionStoreInternal = {
+@@ -4220,6 +4241,12 @@ var SessionStoreInternal = {
         Math.min(tabState.index, tabState.entries.length)
       );
       tabState.pinned = false;
@@ -192,7 +192,7 @@ index 3bebeb70e1a88aefb3ef4bc2114bd85b0d8d1e51..5414adeca242f00bff98c5e41de74f33
 
       if (inBackground === false) {
         aWindow.gBrowser.selectedTab = newTab;
-@@ -4659,6 +4686,8 @@ var SessionStoreInternal = {
+@@ -4656,6 +4683,8 @@ var SessionStoreInternal = {
       // Append the tab if we're opening into a different window,
       tabIndex: aSource == aTargetWindow ? pos : Infinity,
       pinned: state.pinned,
@@ -296,7 +296,7 @@ index 3bebeb70e1a88aefb3ef4bc2114bd85b0d8d1e51..5414adeca242f00bff98c5e41de74f33
 
     // Move the originally open tabs to the end.
     if (initialTabs) {
-@@ -6638,6 +6679,25 @@ var SessionStoreInternal = {
+@@ -6640,6 +6681,25 @@ var SessionStoreInternal = {
 
     // Most of tabData has been restored, now continue with restoring
     // attributes that may trigger external events.
@@ -322,7 +322,7 @@ index 3bebeb70e1a88aefb3ef4bc2114bd85b0d8d1e51..5414adeca242f00bff98c5e41de74f33
 
     if (tabData.pinned) {
       tabbrowser.pinTab(tab);
-@@ -6797,6 +6857,9 @@ var SessionStoreInternal = {
+@@ -6807,6 +6867,9 @@ var SessionStoreInternal = {
         aWindow.gURLBar.readOnly = false;
       }
     }
@@ -332,7 +332,7 @@ index 3bebeb70e1a88aefb3ef4bc2114bd85b0d8d1e51..5414adeca242f00bff98c5e41de74f33
 
     let promiseParts = Promise.withResolvers();
     aWindow.setTimeout(() => {
-@@ -7592,7 +7655,7 @@ var SessionStoreInternal = {
+@@ -7602,7 +7665,7 @@ var SessionStoreInternal = {
 
       let groupsToSave = new Map();
       for (let tIndex = 0; tIndex < window.tabs.length; ) {
@@ -341,7 +341,7 @@ index 3bebeb70e1a88aefb3ef4bc2114bd85b0d8d1e51..5414adeca242f00bff98c5e41de74f33
           // Adjust window.selected
           if (tIndex + 1 < window.selected) {
             window.selected -= 1;
-@@ -7607,7 +7670,7 @@ var SessionStoreInternal = {
+@@ -7617,7 +7680,7 @@ var SessionStoreInternal = {
           );
           // We don't want to increment tIndex here.
           continue;
--- a/src/browser/components/tabbrowser/content/drag-and-drop-js.patch
+++ b/src/browser/components/tabbrowser/content/drag-and-drop-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/drag-and-drop.js b/browser/components/tabbrowser/content/drag-and-drop.js
-index ced2bfd88de2d16e2c028ca3f4d9d27516363575..69b45c7dad9d294e4290de4ce878d184925e5610 100644
+index b93a8fcc8b76ed888524959cbe7d6865fe830f2f..fa192837d06e28bb847acbbd462ad3229ebdc2d2 100644
 --- a/browser/components/tabbrowser/content/drag-and-drop.js
 +++ b/browser/components/tabbrowser/content/drag-and-drop.js
@@ -35,6 +35,9 @@
@@ -185,7 +185,7 @@ index ced2bfd88de2d16e2c028ca3f4d9d27516363575..69b45c7dad9d294e4290de4ce878d184
       return target;
     }
 
-@@ -996,7 +1018,8 @@
+@@ -1002,7 +1024,8 @@
         isTabGroupLabel(draggedTab) &&
         draggedTab._dragData?.expandGroupOnDrop
       ) {
@@ -195,7 +195,7 @@ index ced2bfd88de2d16e2c028ca3f4d9d27516363575..69b45c7dad9d294e4290de4ce878d184
       }
     }
 
-@@ -1180,7 +1203,6 @@
+@@ -1186,7 +1209,6 @@
         // using updateDragImage. On Linux, we can use a panel.
         if (platform == "win" || platform == "macosx") {
           captureListener = function () {
@@ -203,7 +203,7 @@ index ced2bfd88de2d16e2c028ca3f4d9d27516363575..69b45c7dad9d294e4290de4ce878d184
           };
         } else {
           // Create a panel to use it in setDragImage
-@@ -1218,7 +1240,6 @@
+@@ -1224,7 +1246,6 @@
         );
         dragImageOffset = dragImageOffset * scale;
       }
@@ -211,7 +211,7 @@ index ced2bfd88de2d16e2c028ca3f4d9d27516363575..69b45c7dad9d294e4290de4ce878d184
 
       // _dragData.offsetX/Y give the coordinates that the mouse should be
       // positioned relative to the corner of the new window created upon
-@@ -1237,7 +1258,7 @@
+@@ -1243,7 +1264,7 @@
       let dropEffect = this.getDropEffectForTabDrag(event);
       let isMovingInTabStrip = !fromTabList && dropEffect == "move";
       let collapseTabGroupDuringDrag =
@@ -220,7 +220,7 @@ index ced2bfd88de2d16e2c028ca3f4d9d27516363575..69b45c7dad9d294e4290de4ce878d184
 
       tab._dragData = {
         offsetX: this._tabbrowserTabs.verticalMode
-@@ -1247,7 +1268,7 @@
+@@ -1253,7 +1274,7 @@
           ? event.screenY - window.screenY - tabOffset
           : event.screenY - window.screenY,
         scrollPos:
@@ -229,7 +229,7 @@ index ced2bfd88de2d16e2c028ca3f4d9d27516363575..69b45c7dad9d294e4290de4ce878d184
             ? this._tabbrowserTabs.pinnedTabsContainer.scrollPosition
             : this._tabbrowserTabs.arrowScrollbox.scrollPosition,
         screenX: event.screenX,
-@@ -1294,6 +1315,7 @@
+@@ -1300,6 +1321,7 @@
       if (tabStripItemElement.hasAttribute("dragtarget")) {
         return;
       }
@@ -237,7 +237,7 @@ index ced2bfd88de2d16e2c028ca3f4d9d27516363575..69b45c7dad9d294e4290de4ce878d184
       let isPinned = tab.pinned;
       let dragAndDropElements = this._tabbrowserTabs.dragAndDropElements;
       let isGrid = this._tabbrowserTabs.isContainerVerticalPinnedGrid(tab);
-@@ -1660,23 +1682,6 @@
+@@ -1666,23 +1688,6 @@
 
       // Slide the relevant tabs to their new position.
       // non-moving tabs adjust for RTL
@@ -261,7 +261,7 @@ index ced2bfd88de2d16e2c028ca3f4d9d27516363575..69b45c7dad9d294e4290de4ce878d184
       // moving tabs don't adjust for RTL
       for (let item of selectedElements) {
         if (
-@@ -1725,7 +1730,6 @@
+@@ -1731,7 +1736,6 @@
       for (let item of this._tabbrowserTabs.dragAndDropElements) {
         delete item._moveTogetherSelectedTabsData;
         item = elementToMove(item);
@@ -269,7 +269,7 @@ index ced2bfd88de2d16e2c028ca3f4d9d27516363575..69b45c7dad9d294e4290de4ce878d184
         item.removeAttribute("multiselected-move-together");
       }
     }
-@@ -2569,7 +2573,6 @@
+@@ -2578,7 +2582,6 @@
         tab.style.top = "";
         tab.style.maxWidth = "";
         tab.style.pointerEvents = "";
@@ -277,7 +277,7 @@ index ced2bfd88de2d16e2c028ca3f4d9d27516363575..69b45c7dad9d294e4290de4ce878d184
         tab.removeAttribute("small-stack");
         tab.removeAttribute("big-stack");
       }
-@@ -2578,11 +2581,9 @@
+@@ -2587,11 +2590,9 @@
       )) {
         label.style.width = "";
         label.style.maxWidth = "";
--- a/src/browser/components/tabbrowser/content/tab-js.patch
+++ b/src/browser/components/tabbrowser/content/tab-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tab.js b/browser/components/tabbrowser/content/tab.js
-index e4266a159a0d5c42cc294602d00b8f66131f35d5..f3e362f062063ebe08bd26cc694f2d965ccffd84 100644
+index 2e02bad1a7c89b4c3b5aee1e14c13bb953a64eb6..439766a40df5632ad790ab54a0c6af78a831e8ee 100644
 --- a/browser/components/tabbrowser/content/tab.js
 +++ b/browser/components/tabbrowser/content/tab.js
@@ -21,6 +21,7 @@
@@ -140,7 +140,7 @@ index e4266a159a0d5c42cc294602d00b8f66131f35d5..f3e362f062063ebe08bd26cc694f2d96
         event.target.classList.contains("tab-icon-overlay") ||
         event.target.classList.contains("tab-audio-button")
       ) {
-@@ -592,16 +627,21 @@
+@@ -594,6 +629,10 @@
       this.style.MozUserFocus = "";
     }
 
@@ -151,6 +151,8 @@ index e4266a159a0d5c42cc294602d00b8f66131f35d5..f3e362f062063ebe08bd26cc694f2d96
     on_click(event) {
       if (event.button != 0) {
         return;
+@@ -620,11 +659,12 @@
+         return;
       }
 
 -      if (event.getModifierState("Accel") || event.shiftKey) {
@@ -163,7 +165,7 @@ index e4266a159a0d5c42cc294602d00b8f66131f35d5..f3e362f062063ebe08bd26cc694f2d96
         gBrowser.multiSelectedTabsCount > 0 &&
         !event.target.classList.contains("tab-close-button") &&
         !event.target.classList.contains("tab-icon-overlay") &&
-@@ -613,8 +653,9 @@
+@@ -636,8 +676,9 @@
       }
 
       if (
@@ -175,7 +177,7 @@ index e4266a159a0d5c42cc294602d00b8f66131f35d5..f3e362f062063ebe08bd26cc694f2d96
       ) {
         if (this.activeMediaBlocked) {
           if (this.multiselected) {
-@@ -632,7 +673,7 @@
+@@ -655,7 +696,7 @@
         return;
       }
 
@@ -184,7 +186,7 @@ index e4266a159a0d5c42cc294602d00b8f66131f35d5..f3e362f062063ebe08bd26cc694f2d96
         if (this.multiselected) {
           gBrowser.removeMultiSelectedTabs(
             lazy.TabMetrics.userTriggeredContext(
-@@ -652,6 +693,14 @@
+@@ -675,6 +716,14 @@
         // (see tabbrowser-tabs 'click' handler).
         gBrowser.tabContainer._blockDblClick = true;
       }
@@ -199,7 +201,7 @@ index e4266a159a0d5c42cc294602d00b8f66131f35d5..f3e362f062063ebe08bd26cc694f2d96
     }
 
     on_dblclick(event) {
-@@ -675,6 +724,8 @@
+@@ -698,6 +747,8 @@
           animate: true,
           triggeringEvent: event,
         });
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901c18e3136 100644
+index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..642b74cdf0edc63e5cf4ca8c69481e25b964ccbb 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
@@ -413,6 +413,7 @@
@@ -99,7 +99,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
       tab.linkedPanel = uniqueId;
       this._selectedTab = tab;
       this._selectedBrowser = browser;
-@@ -949,13 +1007,18 @@
+@@ -1032,13 +1090,18 @@
       }
 
       this.showTab(aTab);
@@ -119,7 +119,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
 
       aTab.setAttribute("pinned", "true");
       this._updateTabBarForPinnedTabs();
-@@ -968,11 +1031,19 @@
+@@ -1051,11 +1114,19 @@
       }
 
       this.#handleTabMove(aTab, () => {
@@ -140,7 +140,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
       });
 
       aTab.style.marginInlineStart = "";
-@@ -1149,6 +1220,9 @@
+@@ -1232,6 +1303,9 @@
 
       let LOCAL_PROTOCOLS = ["chrome:", "about:", "resource:", "data:"];
 
@@ -150,7 +150,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
       if (
         aIconURL &&
         !LOCAL_PROTOCOLS.some(protocol => aIconURL.startsWith(protocol))
-@@ -1158,6 +1232,9 @@
+@@ -1241,6 +1315,9 @@
         );
         return;
       }
@@ -160,7 +160,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
 
       let browser = this.getBrowserForTab(aTab);
       browser.mIconURL = aIconURL;
-@@ -1479,7 +1556,6 @@
+@@ -1563,7 +1640,6 @@
 
       // Preview mode should not reset the owner
       if (!this._previewMode && !oldTab.selected) {
@@ -168,7 +168,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
       }
 
       let lastRelatedTab = this._lastRelatedTabMap.get(oldTab);
-@@ -1570,6 +1646,7 @@
+@@ -1654,6 +1730,7 @@
       if (!this._previewMode) {
         newTab.recordTimeFromUnloadToReload();
         newTab.updateLastAccessed();
@@ -176,7 +176,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
         oldTab.updateLastAccessed();
         // if this is the foreground window, update the last-seen timestamps.
         if (this.ownerGlobal == BrowserWindowTracker.getTopWindow()) {
-@@ -1784,6 +1861,9 @@
+@@ -1868,6 +1945,9 @@
       }
 
       let activeEl = document.activeElement;
@@ -186,7 +186,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
       // If focus is on the old tab, move it to the new tab.
       if (activeEl == oldTab) {
         newTab.focus();
-@@ -1822,7 +1902,7 @@
+@@ -1906,7 +1986,7 @@
       // Focus the location bar if it was previously focused for that tab.
       // In full screen mode, only bother making the location bar visible
       // if the tab is a blank one.
@@ -195,7 +195,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
         let selectURL = () => {
           if (this._asyncTabSwitching) {
             // Set _awaitingSetURI flag to suppress popup notification
-@@ -2110,7 +2190,12 @@
+@@ -2194,7 +2274,12 @@
       return this._setTabLabel(aTab, aLabel);
     }
 
@@ -209,7 +209,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
       if (!aLabel || aLabel.includes("about:reader?")) {
         return false;
       }
-@@ -2235,7 +2320,7 @@
+@@ -2319,7 +2404,7 @@
         newIndex = this.selectedTab._tPos + 1;
       }
 
@@ -218,7 +218,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
         if (this.isTabGroupLabel(targetTab)) {
           throw new Error(
             "Replacing a tab group label with a tab is not supported"
-@@ -2515,6 +2600,7 @@
+@@ -2599,6 +2684,7 @@
       uriIsAboutBlank,
       userContextId,
       skipLoad,
@@ -226,7 +226,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
     } = {}) {
       let b = document.createXULElement("browser");
       // Use the JSM global to create the permanentKey, so that if the
-@@ -2588,8 +2674,7 @@
+@@ -2672,8 +2758,7 @@
         // we use a different attribute name for this?
         b.setAttribute("name", name);
       }
@@ -236,7 +236,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
         b.setAttribute("transparent", "true");
       }
 
-@@ -2759,7 +2844,7 @@
+@@ -2843,7 +2928,7 @@
 
       let panel = this.getPanel(browser);
       let uniqueId = this._generateUniquePanelID();
@@ -245,7 +245,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
       aTab.linkedPanel = uniqueId;
 
       // Inject the <browser> into the DOM if necessary.
-@@ -2819,8 +2904,8 @@
+@@ -2903,8 +2988,8 @@
       // If we transitioned from one browser to two browsers, we need to set
       // hasSiblings=false on both the existing browser and the new browser.
       if (this.tabs.length == 2) {
@@ -256,7 +256,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
       } else {
         aTab.linkedBrowser.browsingContext.hasSiblings = this.tabs.length > 1;
       }
-@@ -3005,7 +3090,6 @@
+@@ -3089,7 +3174,6 @@
             this.selectedTab = this.addTrustedTab(BROWSER_NEW_TAB_URL, {
               tabIndex: tab._tPos + 1,
               userContextId: tab.userContextId,
@@ -264,7 +264,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
               focusUrlBar: true,
             });
             resolve(this.selectedBrowser);
-@@ -3115,6 +3199,9 @@
+@@ -3199,6 +3283,9 @@
         schemelessInput,
         hasValidUserGestureActivation = false,
         textDirectiveUserActivation = false,
@@ -274,7 +274,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
       } = {}
     ) {
       // all callers of addTab that pass a params object need to pass
-@@ -3125,10 +3212,17 @@
+@@ -3209,10 +3296,17 @@
         );
       }
 
@@ -292,7 +292,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
       // If we're opening a foreground tab, set the owner by default.
       ownerTab ??= inBackground ? null : this.selectedTab;
 
-@@ -3136,6 +3230,7 @@
+@@ -3220,6 +3314,7 @@
       if (this.selectedTab.owner) {
         this.selectedTab.owner = null;
       }
@@ -300,7 +300,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
 
       // Find the tab that opened this one, if any. This is used for
       // determining positioning, and inherited attributes such as the
-@@ -3188,6 +3283,22 @@
+@@ -3272,6 +3367,22 @@
           noInitialLabel,
           skipBackgroundNotify,
         });
@@ -323,7 +323,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
         if (insertTab) {
           // Insert the tab into the tab container in the correct position.
           this.#insertTabAtIndex(t, {
-@@ -3196,6 +3307,7 @@
+@@ -3280,6 +3391,7 @@
             ownerTab,
             openerTab,
             pinned,
@@ -331,7 +331,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
             bulkOrderedOpen,
             tabGroup: tabGroup ?? openerTab?.group,
           });
-@@ -3214,6 +3326,7 @@
+@@ -3298,6 +3410,7 @@
           openWindowInfo,
           skipLoad,
           triggeringRemoteType,
@@ -339,7 +339,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
         }));
 
         if (focusUrlBar) {
-@@ -3338,6 +3451,12 @@
+@@ -3422,6 +3535,12 @@
         }
       }
 
@@ -352,7 +352,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
       // Additionally send pinned tab events
       if (pinned) {
         this.#notifyPinnedStatus(t);
-@@ -3656,6 +3775,7 @@
+@@ -3729,6 +3848,7 @@
         isAdoptingGroup = false,
         isUserTriggered = false,
         telemetryUserCreateSource = "unknown",
@@ -360,7 +360,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
       } = {}
     ) {
       if (
-@@ -3666,9 +3786,6 @@
+@@ -3739,9 +3859,6 @@
             !this.isSplitViewWrapper(tabOrSplitView)
         )
       ) {
@@ -370,7 +370,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
       }
 
       if (!color) {
-@@ -3689,9 +3806,14 @@
+@@ -3762,9 +3879,14 @@
         label,
         isAdoptingGroup
       );
@@ -387,7 +387,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
       );
       group.addTabs(tabsAndSplitViews);
 
-@@ -3812,7 +3934,7 @@
+@@ -3885,7 +4007,7 @@
       }
 
       this.#handleTabMove(tab, () =>
@@ -396,7 +396,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
       );
     }
 
-@@ -3896,6 +4018,7 @@
+@@ -3969,6 +4091,7 @@
         color: group.color,
         insertBefore: newTabs[0],
         isAdoptingGroup: true,
@@ -404,7 +404,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
       });
     }
 
-@@ -4107,6 +4230,7 @@
+@@ -4179,6 +4302,7 @@
         openWindowInfo,
         skipLoad,
         triggeringRemoteType,
@@ -412,7 +412,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
       }
     ) {
       // If we don't have a preferred remote type (or it is `NOT_REMOTE`), and
-@@ -4176,6 +4300,7 @@
+@@ -4248,6 +4372,7 @@
           openWindowInfo,
           name,
           skipLoad,
@@ -420,7 +420,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
         });
       }
 
-@@ -4389,9 +4514,9 @@
+@@ -4461,9 +4586,9 @@
         }
 
         // Add a new tab if needed.
@@ -432,7 +432,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
 
           let url = "about:blank";
           if (tabData.entries?.length) {
-@@ -4428,8 +4553,10 @@
+@@ -4500,8 +4625,10 @@
             insertTab: false,
             skipLoad: true,
             preferredRemoteType,
@@ -444,7 +444,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
           if (select) {
             tabToSelect = tab;
           }
-@@ -4451,7 +4578,8 @@
+@@ -4523,7 +4650,8 @@
           this.pinTab(tab);
           // Then ensure all the tab open/pinning information is sent.
           this._fireTabOpen(tab, {});
@@ -454,7 +454,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
           let { groupId } = tabData;
           const tabGroup = tabGroupWorkingData.get(groupId);
           // if a tab refers to a tab group we don't know, skip any group
-@@ -4471,7 +4599,10 @@
+@@ -4543,7 +4671,10 @@
                 tabGroup.stateData.id,
                 tabGroup.stateData.color,
                 tabGroup.stateData.collapsed,
@@ -466,7 +466,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
               );
               tabsFragment.appendChild(tabGroup.node);
             }
-@@ -4526,9 +4657,22 @@
+@@ -4598,9 +4729,22 @@
       // to remove the old selected tab.
       if (tabToSelect) {
         let leftoverTab = this.selectedTab;
@@ -489,7 +489,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
 
       if (tabs.length > 1 || !tabs[0].selected) {
         this._updateTabsAfterInsert();
-@@ -4719,11 +4863,14 @@
+@@ -4791,11 +4935,14 @@
       if (ownerTab) {
         tab.owner = ownerTab;
       }
@@ -505,7 +505,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
         if (
           !bulkOrderedOpen &&
           ((openerTab &&
-@@ -4735,7 +4882,7 @@
+@@ -4807,7 +4954,7 @@
           let lastRelatedTab =
             openerTab && this._lastRelatedTabMap.get(openerTab);
           let previousTab = lastRelatedTab || openerTab || this.selectedTab;
@@ -514,7 +514,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
             tabGroup = previousTab.group;
           }
           if (
-@@ -4751,7 +4898,7 @@
+@@ -4823,7 +4970,7 @@
                 previousTab.splitview
               ) + 1;
           } else if (previousTab.visible) {
@@ -523,7 +523,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
           } else if (previousTab == FirefoxViewHandler.tab) {
             elementIndex = 0;
           }
-@@ -4779,14 +4926,14 @@
+@@ -4851,14 +4998,14 @@
       }
       // Ensure index is within bounds.
       if (tab.pinned) {
@@ -542,7 +542,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
 
       if (pinned && !itemAfter?.pinned) {
         itemAfter = null;
-@@ -4803,7 +4950,7 @@
+@@ -4875,7 +5022,7 @@
 
       this.tabContainer._invalidateCachedTabs();
 
@@ -551,7 +551,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
         if (
           (this.isTab(itemAfter) && itemAfter.group == tabGroup) ||
           this.isSplitViewWrapper(itemAfter)
-@@ -4834,7 +4981,11 @@
+@@ -4906,7 +5053,11 @@
         const tabContainer = pinned
           ? this.tabContainer.pinnedTabsContainer
           : this.tabContainer;
@@ -563,7 +563,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
       }
 
       if (tab.group?.collapsed) {
-@@ -4849,6 +5000,7 @@
+@@ -4921,6 +5072,7 @@
       if (pinned) {
         this._updateTabBarForPinnedTabs();
       }
@@ -571,7 +571,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
 
       TabBarVisibility.update();
     }
-@@ -5397,6 +5549,7 @@
+@@ -5469,6 +5621,7 @@
         telemetrySource,
       } = {}
     ) {
@@ -579,7 +579,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
       // When 'closeWindowWithLastTab' pref is enabled, closing all tabs
       // can be considered equivalent to closing the window.
       if (
-@@ -5486,6 +5639,7 @@
+@@ -5558,6 +5711,7 @@
         if (lastToClose) {
           this.removeTab(lastToClose, aParams);
         }
@@ -587,7 +587,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
       } catch (e) {
         console.error(e);
       }
-@@ -5531,6 +5685,13 @@
+@@ -5603,6 +5757,13 @@
         return;
       }
 
@@ -601,7 +601,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
       let isVisibleTab = aTab.visible;
       // We have to sample the tab width now, since _beginRemoveTab might
       // end up modifying the DOM in such a way that aTab gets a new
-@@ -5538,6 +5699,9 @@
+@@ -5610,6 +5771,9 @@
       // state).
       let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
       let isLastTab = this.#isLastTabInWindow(aTab);
@@ -611,7 +611,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
       if (
         !this._beginRemoveTab(aTab, {
           closeWindowFastpath: true,
-@@ -5549,13 +5713,14 @@
+@@ -5621,13 +5785,14 @@
           telemetrySource,
         })
       ) {
@@ -627,7 +627,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
       let lockTabSizing =
         !this.tabContainer.verticalMode &&
         !aTab.pinned &&
-@@ -5586,7 +5751,13 @@
+@@ -5658,7 +5823,13 @@
         // We're not animating, so we can cancel the animation stopwatch.
         Glean.browserTabclose.timeAnim.cancel(aTab._closeTimeAnimTimerId);
         aTab._closeTimeAnimTimerId = null;
@@ -642,7 +642,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
         return;
       }
 
-@@ -5720,7 +5891,7 @@
+@@ -5792,7 +5963,7 @@
           closeWindowWithLastTab != null
             ? closeWindowWithLastTab
             : !window.toolbar.visible ||
@@ -651,7 +651,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
 
         if (closeWindow) {
           // We've already called beforeunload on all the relevant tabs if we get here,
-@@ -5744,6 +5915,7 @@
+@@ -5816,6 +5987,7 @@
 
         newTab = true;
       }
@@ -659,7 +659,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
       aTab._endRemoveArgs = [closeWindow, newTab];
 
       // swapBrowsersAndCloseOther will take care of closing the window without animation.
-@@ -5784,13 +5956,7 @@
+@@ -5856,13 +6028,7 @@
       aTab._mouseleave();
 
       if (newTab) {
@@ -674,7 +674,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
       } else {
         TabBarVisibility.update();
       }
-@@ -5923,6 +6089,7 @@
+@@ -5995,6 +6161,7 @@
         this.tabs[i]._tPos = i;
       }
 
@@ -682,7 +682,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
       if (!this._windowIsClosing) {
         // update tab close buttons state
         this.tabContainer._updateCloseButtons();
-@@ -6153,6 +6320,7 @@
+@@ -6225,6 +6392,7 @@
       }
 
       let excludeTabs = new Set(aExcludeTabs);
@@ -690,7 +690,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
 
       // If this tab has a successor, it should be selectable, since
       // hiding or closing a tab removes that tab as a successor.
-@@ -6165,15 +6333,22 @@
+@@ -6237,15 +6405,22 @@
         !excludeTabs.has(aTab.owner) &&
         Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose")
       ) {
@@ -715,7 +715,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
       let tab = this.tabContainer.findNextTab(aTab, {
         direction: 1,
         filter: _tab => remainingTabs.includes(_tab),
-@@ -6187,7 +6362,7 @@
+@@ -6259,7 +6434,7 @@
       }
 
       if (tab) {
@@ -724,7 +724,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
       }
 
       // If no qualifying visible tab was found, see if there is a tab in
-@@ -6208,7 +6383,7 @@
+@@ -6280,7 +6455,7 @@
         });
       }
 
@@ -733,7 +733,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
     }
 
     _blurTab(aTab) {
-@@ -6219,7 +6394,7 @@
+@@ -6291,7 +6466,7 @@
      * @returns {boolean}
      *   False if swapping isn't permitted, true otherwise.
      */
@@ -742,7 +742,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
       // Do not allow transfering a private tab to a non-private window
       // and vice versa.
       if (
-@@ -6273,6 +6448,7 @@
+@@ -6345,6 +6520,7 @@
       // fire the beforeunload event in the process.  Close the other
       // window if this was its last tab.
       if (
@@ -750,7 +750,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
         !remoteBrowser._beginRemoveTab(aOtherTab, {
           adoptedByTab: aOurTab,
           closeWindowWithLastTab: true,
-@@ -6284,7 +6460,7 @@
+@@ -6356,7 +6532,7 @@
       // If this is the last tab of the window, hide the window
       // immediately without animation before the docshell swap, to avoid
       // about:blank being painted.
@@ -759,7 +759,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
       if (closeWindow) {
         let win = aOtherTab.ownerGlobal;
         win.windowUtils.suppressAnimation(true);
-@@ -6412,11 +6588,13 @@
+@@ -6484,11 +6660,13 @@
       }
 
       // Finish tearing down the tab that's going away.
@@ -773,7 +773,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
 
       this.setTabTitle(aOurTab);
 
-@@ -6618,10 +6796,10 @@
+@@ -6690,10 +6868,10 @@
       SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
     }
 
@@ -786,7 +786,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
         aTab.selected ||
         aTab.closing ||
         // Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -6681,7 +6859,8 @@
+@@ -6753,7 +6931,8 @@
      * @param {object} [aOptions={}]
      *   Key-value pairs that will be serialized into the features string.
      */
@@ -796,7 +796,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
       if (this.tabs.length == 1) {
         return null;
       }
-@@ -6698,7 +6877,7 @@
+@@ -6770,7 +6949,7 @@
       // tell a new window to take the "dropped" tab
       let args = Cc["@mozilla.org/array;1"].createInstance(Ci.nsIMutableArray);
       args.appendElement(aTab.splitview ?? aTab);
@@ -805,7 +805,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
         private: PrivateBrowsingUtils.isWindowPrivate(window),
         features: Object.entries(aOptions)
           .map(([key, value]) => `${key}=${value}`)
-@@ -6706,6 +6885,8 @@
+@@ -6778,6 +6957,8 @@
         openerWindow: window,
         args,
       });
@@ -814,7 +814,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
     }
 
     /**
-@@ -6818,7 +6999,7 @@
+@@ -6890,7 +7071,7 @@
      *   `true` if element is a `<tab-group>`
      */
     isTabGroup(element) {
@@ -823,7 +823,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
     }
 
     /**
-@@ -6903,8 +7084,8 @@
+@@ -6975,8 +7156,8 @@
       }
 
       // Don't allow mixing pinned and unpinned tabs.
@@ -834,7 +834,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
       } else {
         tabIndex = Math.max(tabIndex, this.pinnedTabCount);
       }
-@@ -6933,13 +7114,19 @@
+@@ -7005,13 +7186,19 @@
       this.#handleTabMove(
         element,
         () => {
@@ -856,7 +856,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
           let useAfter = false;
           if (this.isTab(element)) {
             useAfter = neighbor && tabIndex > element._tPos;
-@@ -7004,23 +7191,31 @@
+@@ -7076,23 +7263,31 @@
     #moveTabNextTo(element, targetElement, moveBefore = false, metricsContext) {
       if (this.isTabGroupLabel(targetElement)) {
         targetElement = targetElement.group;
@@ -894,7 +894,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
       } else if (!element.pinned && targetElement && targetElement.pinned) {
         // If the caller asks to move an unpinned element next to a pinned
         // tab, move the unpinned element to be the first unpinned element
-@@ -7033,12 +7228,35 @@
+@@ -7105,12 +7300,35 @@
         //    move the tab group right before the first unpinned tab.
         // 4. Moving a tab group and the first unpinned tab is grouped:
         //    move the tab group right before the first unpinned tab's tab group.
@@ -931,7 +931,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
 
       // We want to include the splitview wrapper if it's the targetElement, but
       // not in the case where we want to reverse tabs within the same splitview.
-@@ -7047,6 +7265,7 @@
+@@ -7119,6 +7337,7 @@
       }
 
       let getContainer = () =>
@@ -939,7 +939,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
         element.pinned
           ? this.tabContainer.pinnedTabsContainer
           : this.tabContainer;
-@@ -7055,11 +7274,15 @@
+@@ -7127,11 +7346,15 @@
         element,
         () => {
           if (moveBefore) {
@@ -956,7 +956,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
           }
         },
         metricsContext
-@@ -7133,10 +7356,10 @@
+@@ -7205,10 +7428,10 @@
      * @param {TabMetricsContext} [metricsContext]
      */
     moveTabToExistingGroup(aTab, aGroup, metricsContext) {
@@ -969,7 +969,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
         return;
       }
       if (aTab.group && aTab.group.id === aGroup.id) {
-@@ -7209,6 +7432,7 @@
+@@ -7281,6 +7504,7 @@
 
       let state = {
         tabIndex: tab._tPos,
@@ -977,7 +977,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
       };
       if (tab.visible) {
         state.elementIndex = tab.elementIndex;
-@@ -7240,7 +7464,7 @@
+@@ -7312,7 +7536,7 @@
       let changedSplitView =
         previousTabState.splitViewId != currentTabState.splitViewId;
 
@@ -986,7 +986,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
         tab.dispatchEvent(
           new CustomEvent("TabMove", {
             bubbles: true,
-@@ -7281,6 +7505,10 @@
+@@ -7354,6 +7578,10 @@
 
       moveActionCallback();
 
@@ -997,7 +997,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
       // Clear tabs cache after moving nodes because the order of tabs may have
       // changed.
       this.tabContainer._invalidateCachedTabs();
-@@ -7331,7 +7559,22 @@
+@@ -7404,7 +7632,22 @@
      * @returns {object}
      *    The new tab in the current window, null if the tab couldn't be adopted.
      */
@@ -1021,7 +1021,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
       // Swap the dropped tab with a new one we create and then close
       // it in the other window (making it seem to have moved between
       // windows). We also ensure that the tab we create to swap into has
-@@ -7374,6 +7617,8 @@
+@@ -7447,6 +7690,8 @@
       }
       params.skipLoad = true;
       let newTab = this.addWebTab("about:blank", params);
@@ -1030,7 +1030,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
 
       aTab.container.tabDragAndDrop.finishAnimateTabMove();
 
-@@ -8076,7 +8321,7 @@
+@@ -8149,7 +8394,7 @@
         // preventDefault(). It will still raise the window if appropriate.
         return;
       }
@@ -1039,7 +1039,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
       window.focus();
       aEvent.preventDefault();
     }
-@@ -8093,7 +8338,6 @@
+@@ -8166,7 +8411,6 @@
 
     on_TabGroupCollapse(aEvent) {
       aEvent.target.tabs.forEach(tab => {
@@ -1047,7 +1047,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
       });
     }
 
-@@ -8427,7 +8671,9 @@
+@@ -8500,7 +8744,9 @@
 
         let filter = this._tabFilters.get(tab);
         if (filter) {
@@ -1057,7 +1057,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
 
           let listener = this._tabListeners.get(tab);
           if (listener) {
-@@ -9233,6 +9479,7 @@
+@@ -9306,6 +9552,7 @@
             aWebProgress.isTopLevel
           ) {
             this.mTab.setAttribute("busy", "true");
@@ -1065,7 +1065,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
             gBrowser._tabAttrModified(this.mTab, ["busy"]);
             this.mTab._notselectedsinceload = !this.mTab.selected;
           }
-@@ -9313,6 +9560,7 @@
+@@ -9386,6 +9633,7 @@
         // known defaults. Note we use the original URL since about:newtab
         // redirects to a prerendered page.
         const shouldRemoveFavicon =
@@ -1073,7 +1073,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
           !this.mBrowser.mIconURL &&
           !ignoreBlank &&
           !(originalLocation.spec in FAVICON_DEFAULTS);
-@@ -9487,13 +9735,6 @@
+@@ -9560,13 +9808,6 @@
             this.mBrowser.originalURI = aRequest.originalURI;
           }
 
@@ -1087,7 +1087,7 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..e921639dac90ae3d284b922c5b8aa901
         }
 
         let userContextId = this.mBrowser.getAttribute("usercontextid") || 0;
-@@ -10379,7 +10620,7 @@ var TabContextMenu = {
+@@ -10450,7 +10691,7 @@ var TabContextMenu = {
     );
     contextUnpinSelectedTabs.hidden =
       !this.contextTab.pinned || !this.multiselected;
--- a/src/browser/components/tabbrowser/content/tabgroup-js.patch
+++ b/src/browser/components/tabbrowser/content/tabgroup-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabgroup.js b/browser/components/tabbrowser/content/tabgroup.js
-index 3ca119e8dc72fac652c98505211864483d98add2..b65307ee8df896488a4c51e3a25bf9ad9e1c8179 100644
+index 65c89aab0902cb33ad33fc523d3e0b954618778e..b42298457fdd2f8df6ff202c804122ffc999d409 100644
 --- a/browser/components/tabbrowser/content/tabgroup.js
 +++ b/browser/components/tabbrowser/content/tabgroup.js
@@ -14,11 +14,11 @@
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index 17a56b0e5a7f1fcdf04904586572c7f719e57904..778a4e49fad39a160d1000733a9e27b0c258d78c 100644
+index a2db42fba8d1f1d9df1dc295adb64be3f5885d50..2dd43fe4898badeaf9bc669502ead2c56982d1aa 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
@@ -230,7 +230,7 @@
@@ -214,7 +214,7 @@ index 17a56b0e5a7f1fcdf04904586572c7f719e57904..778a4e49fad39a160d1000733a9e27b0
           const newTab2 = this.newTabButton;
           const newTabVertical = document.getElementById(
             "vertical-tabs-newtab-button"
-@@ -1382,8 +1413,10 @@
+@@ -1386,8 +1417,10 @@
      */
     _handleTabSelect(aInstant) {
       let selectedTab = this.selectedItem;
@@ -225,7 +225,7 @@ index 17a56b0e5a7f1fcdf04904586572c7f719e57904..778a4e49fad39a160d1000733a9e27b0
       selectedTab._notselectedsinceload = false;
     }
 
-@@ -1392,7 +1425,7 @@
+@@ -1396,7 +1429,7 @@
      * @param {boolean} [shouldScrollInstantly=false]
      */
     #ensureTabIsVisible(tab, shouldScrollInstantly = false) {
@@ -234,7 +234,7 @@ index 17a56b0e5a7f1fcdf04904586572c7f719e57904..778a4e49fad39a160d1000733a9e27b0
       if (arrowScrollbox?.overflowing) {
         arrowScrollbox.ensureElementIsVisible(tab, shouldScrollInstantly);
       }
-@@ -1519,7 +1552,7 @@
+@@ -1523,7 +1556,7 @@
     }
 
     _notifyBackgroundTab(aTab) {
--- a/src/browser/components/urlbar/UrlbarController-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarController-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/urlbar/UrlbarController.sys.mjs b/browser/components/urlbar/UrlbarController.sys.mjs
-index 7751871815ac3aa4641a7752c21f625e03e34c82..418dbecd2739fb8a95ce44efb5d671ac97934f21 100644
+index da0a9c73118886d535d574810de8141cb96e54ba..104062e2c0142bd08a4498e7ca282fc46cda09be 100644
 --- a/browser/components/urlbar/UrlbarController.sys.mjs
 +++ b/browser/components/urlbar/UrlbarController.sys.mjs
-@@ -302,7 +302,6 @@ export class UrlbarController {
+@@ -304,7 +304,6 @@ export class UrlbarController {
     const isMac = AppConstants.platform == "macosx";
     // Handle readline/emacs-style navigation bindings on Mac.
     if (
@@ -10,7 +10,7 @@ index 7751871815ac3aa4641a7752c21f625e03e34c82..418dbecd2739fb8a95ce44efb5d671ac
       this.view.isOpen &&
       event.ctrlKey &&
       (event.key == "n" || event.key == "p")
-@@ -451,6 +450,8 @@ export class UrlbarController {
+@@ -455,6 +454,8 @@ export class UrlbarController {
             });
           }
           event.preventDefault();
--- a/src/browser/components/urlbar/UrlbarPrefs-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarPrefs-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/urlbar/UrlbarPrefs.sys.mjs b/browser/components/urlbar/UrlbarPrefs.sys.mjs
-index ec7b7eeee7999aba76286e84808ed09ffc6df463..12bfafdc7e34c5d6345579cd0aaf515a19d82b31 100644
+index 2d21248256c6c2bfb8dac958133c10e3251ef564..6645211ef09518b41cb737e3186fbd0162ecf700 100644
 --- a/browser/components/urlbar/UrlbarPrefs.sys.mjs
 +++ b/browser/components/urlbar/UrlbarPrefs.sys.mjs
-@@ -760,6 +760,7 @@ function makeDefaultResultGroups({ showSearchSuggestionsFirst }) {
+@@ -799,6 +799,7 @@ function makeDefaultResultGroups({ showSearchSuggestionsFirst }) {
    */
   let rootGroup = {
     children: [
--- a/src/browser/components/urlbar/UrlbarProvidersManager-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarProvidersManager-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/urlbar/UrlbarProvidersManager.sys.mjs b/browser/components/urlbar/UrlbarProvidersManager.sys.mjs
-index d9a0566c5ad2a9ae375a23769f856aecc6efd86c..f6e5004806d24e009f96de9482e24c88590939b1 100644
+index 08455d8d5da233639ccebc0e77c0810fb4f674c3..78d0e875978b568b79646489c28b125a44ea79fa 100644
 --- a/browser/components/urlbar/UrlbarProvidersManager.sys.mjs
 +++ b/browser/components/urlbar/UrlbarProvidersManager.sys.mjs
-@@ -912,6 +912,7 @@ export class Query {
+@@ -913,6 +913,7 @@ export class Query {
     if (
       result.heuristic &&
       this.context.searchMode &&
--- a/src/browser/components/urlbar/UrlbarUtils-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarUtils-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/urlbar/UrlbarUtils.sys.mjs b/browser/components/urlbar/UrlbarUtils.sys.mjs
-index 9e9f786b6fd3441000d9cdb0b582f817b73ad814..8f86652520a433c94e34fc0e35dc8aad4a86faa2 100644
+index 64afd613f454edd7786fcc1e2f307a582e4d5f51..b4af9cc2fbddba2c5229e8ffee7b9c0c06c3e1d0 100644
 --- a/browser/components/urlbar/UrlbarUtils.sys.mjs
 +++ b/browser/components/urlbar/UrlbarUtils.sys.mjs
-@@ -84,6 +84,7 @@ export var UrlbarUtils = {
+@@ -85,6 +85,7 @@ export var UrlbarUtils = {
     RESTRICT_SEARCH_KEYWORD: "restrictSearchKeyword",
     SUGGESTED_INDEX: "suggestedIndex",
     TAIL_SUGGESTION: "tailSuggestion",
@@ -10,7 +10,7 @@ index 9e9f786b6fd3441000d9cdb0b582f817b73ad814..8f86652520a433c94e34fc0e35dc8aad
   }),
 
   // Defines provider types.
-@@ -145,6 +146,7 @@ export var UrlbarUtils = {
+@@ -146,6 +147,7 @@ export var UrlbarUtils = {
     OTHER_NETWORK: 6,
     ADDON: 7,
     ACTIONS: 8,
@@ -18,7 +18,7 @@ index 9e9f786b6fd3441000d9cdb0b582f817b73ad814..8f86652520a433c94e34fc0e35dc8aad
   }),
 
   // Per-result exposure telemetry.
-@@ -585,6 +587,8 @@ export var UrlbarUtils = {
+@@ -587,6 +589,8 @@ export var UrlbarUtils = {
           return this.RESULT_GROUP.HEURISTIC_FALLBACK;
         case "UrlbarProviderHistoryUrlHeuristic":
           return this.RESULT_GROUP.HEURISTIC_HISTORY_URL;
--- a/src/browser/components/urlbar/UrlbarView-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarView-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/urlbar/UrlbarView.sys.mjs b/browser/components/urlbar/UrlbarView.sys.mjs
-index cba492223601a8aa4656d9dc60a09faeda9f2313..a40bd5d46912389ef7208c4c7b481027444400fd 100644
+index b665adb1a1ce8bbae8df4cbea6c3248c3e4fb431..7a73907957d38caba5b650749abf80a01b51559d 100644
 --- a/browser/components/urlbar/UrlbarView.sys.mjs
 +++ b/browser/components/urlbar/UrlbarView.sys.mjs
-@@ -618,7 +618,7 @@ export class UrlbarView {
+@@ -640,7 +640,7 @@ export class UrlbarView {
       !this.input.value ||
       this.input.getAttribute("pageproxystate") == "valid"
     ) {
@@ -11,7 +11,7 @@ index cba492223601a8aa4656d9dc60a09faeda9f2313..a40bd5d46912389ef7208c4c7b481027
         // Try to reuse the cached top-sites context. If it's not cached, then
         // there will be a gap of time between when the input is focused and
         // when the view opens that can be perceived as flicker.
-@@ -2871,6 +2871,8 @@ export class UrlbarView {
+@@ -2988,6 +2988,8 @@ export class UrlbarView {
       if (row?.hasAttribute("row-selectable")) {
         row?.toggleAttribute("selected", true);
       }
@@ -20,7 +20,7 @@ index cba492223601a8aa4656d9dc60a09faeda9f2313..a40bd5d46912389ef7208c4c7b481027
       if (element != row) {
         row?.toggleAttribute("descendant-selected", true);
       }
-@@ -3359,7 +3361,7 @@ export class UrlbarView {
+@@ -3477,7 +3479,7 @@ export class UrlbarView {
   }
 
   #enableOrDisableRowWrap() {
--- a/src/browser/components/urlbar/content/UrlbarInput-mjs.patch
+++ b/src/browser/components/urlbar/content/UrlbarInput-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/urlbar/content/UrlbarInput.mjs b/browser/components/urlbar/content/UrlbarInput.mjs
-index 2e6e2be9d7e28c3f189131ec19a26d552d13af99..c17b4553829854340ef512dcb90bfd387069c8da 100644
+index b23244f9d3278918b016bb3fcab19687bc2e292a..ade1f031bbb68202a37e6c9d3071a73f5c811a82 100644
 --- a/browser/components/urlbar/content/UrlbarInput.mjs
 +++ b/browser/components/urlbar/content/UrlbarInput.mjs
-@@ -68,6 +68,13 @@ const lazy = XPCOMUtils.declareLazy({
+@@ -90,6 +90,13 @@ const lazy = XPCOMUtils.declareLazy({
   logger: () => lazy.UrlbarUtils.getLogger({ prefix: "Input" }),
 });
 
@@ -16,7 +16,7 @@ index 2e6e2be9d7e28c3f189131ec19a26d552d13af99..c17b4553829854340ef512dcb90bfd38
 const UNLIMITED_MAX_RESULTS = 99;
 
 let getBoundsWithoutFlushing = element =>
-@@ -649,7 +656,16 @@ export class UrlbarInput extends HTMLElement {
+@@ -708,7 +715,16 @@ export class UrlbarInput extends HTMLElement {
     // See _on_select().  HTMLInputElement.select() dispatches a "select"
     // event but does not set the primary selection.
     this._suppressPrimaryAdjustment = true;
@@ -33,7 +33,7 @@ index 2e6e2be9d7e28c3f189131ec19a26d552d13af99..c17b4553829854340ef512dcb90bfd38
     this._suppressPrimaryAdjustment = false;
   }
 
-@@ -723,6 +739,10 @@ export class UrlbarInput extends HTMLElement {
+@@ -782,6 +798,10 @@ export class UrlbarInput extends HTMLElement {
     hideSearchTerms = false,
     isSameDocument = false,
   } = {}) {
@@ -44,7 +44,7 @@ index 2e6e2be9d7e28c3f189131ec19a26d552d13af99..c17b4553829854340ef512dcb90bfd38
     if (!this.#isAddressbar) {
       throw new Error(
         "Cannot set URI for UrlbarInput that is not an address bar"
-@@ -1012,8 +1032,16 @@ export class UrlbarInput extends HTMLElement {
+@@ -1071,8 +1091,16 @@ export class UrlbarInput extends HTMLElement {
         return;
       }
     }
@@ -62,7 +62,7 @@ index 2e6e2be9d7e28c3f189131ec19a26d552d13af99..c17b4553829854340ef512dcb90bfd38
   }
 
   /**
-@@ -1432,7 +1460,11 @@ export class UrlbarInput extends HTMLElement {
+@@ -1496,7 +1524,11 @@ export class UrlbarInput extends HTMLElement {
     }
 
     if (!this.#providesSearchMode(result)) {
@@ -75,7 +75,7 @@ index 2e6e2be9d7e28c3f189131ec19a26d552d13af99..c17b4553829854340ef512dcb90bfd38
     }
 
     if (isCanonized) {
-@@ -2598,6 +2630,42 @@ export class UrlbarInput extends HTMLElement {
+@@ -2696,6 +2728,42 @@ export class UrlbarInput extends HTMLElement {
     await this.#updateLayoutBreakoutDimensions();
   }
 
@@ -118,7 +118,7 @@ index 2e6e2be9d7e28c3f189131ec19a26d552d13af99..c17b4553829854340ef512dcb90bfd38
   startLayoutExtend() {
     if (!this.#allowBreakout || this.hasAttribute("breakout-extend")) {
       // Do not expand if the Urlbar does not support being expanded or it is
-@@ -2612,6 +2680,13 @@ export class UrlbarInput extends HTMLElement {
+@@ -2710,6 +2778,13 @@ export class UrlbarInput extends HTMLElement {
 
     this.setAttribute("breakout-extend", "true");
 
@@ -132,7 +132,7 @@ index 2e6e2be9d7e28c3f189131ec19a26d552d13af99..c17b4553829854340ef512dcb90bfd38
     // Enable the animation only after the first extend call to ensure it
     // doesn't run when opening a new window.
     if (!this.hasAttribute("breakout-extend-animate")) {
-@@ -2631,6 +2706,27 @@ export class UrlbarInput extends HTMLElement {
+@@ -2729,6 +2804,27 @@ export class UrlbarInput extends HTMLElement {
       return;
     }
 
@@ -160,7 +160,7 @@ index 2e6e2be9d7e28c3f189131ec19a26d552d13af99..c17b4553829854340ef512dcb90bfd38
     this.removeAttribute("breakout-extend");
     this.#updateTextboxPosition();
   }
-@@ -2661,7 +2757,7 @@ export class UrlbarInput extends HTMLElement {
+@@ -2759,7 +2855,7 @@ export class UrlbarInput extends HTMLElement {
     forceUnifiedSearchButtonAvailable = false
   ) {
     let prevState = this.getAttribute("pageproxystate");
@@ -169,7 +169,7 @@ index 2e6e2be9d7e28c3f189131ec19a26d552d13af99..c17b4553829854340ef512dcb90bfd38
     this.setAttribute("pageproxystate", state);
     this._inputContainer.setAttribute("pageproxystate", state);
     this._identityBox?.setAttribute("pageproxystate", state);
-@@ -2915,10 +3011,12 @@ export class UrlbarInput extends HTMLElement {
+@@ -3031,10 +3127,12 @@ export class UrlbarInput extends HTMLElement {
       return;
     }
     this.style.top = px(
@@ -182,7 +182,7 @@ index 2e6e2be9d7e28c3f189131ec19a26d552d13af99..c17b4553829854340ef512dcb90bfd38
     );
   }
 
-@@ -2977,9 +3075,10 @@ export class UrlbarInput extends HTMLElement {
+@@ -3093,9 +3191,10 @@ export class UrlbarInput extends HTMLElement {
           return;
         }
 
@@ -194,7 +194,7 @@ index 2e6e2be9d7e28c3f189131ec19a26d552d13af99..c17b4553829854340ef512dcb90bfd38
         );
         this.style.setProperty(
           "--urlbar-height",
-@@ -3413,6 +3512,7 @@ export class UrlbarInput extends HTMLElement {
+@@ -3597,6 +3696,7 @@ export class UrlbarInput extends HTMLElement {
   }
 
   _toggleActionOverride(event) {
@@ -202,7 +202,7 @@ index 2e6e2be9d7e28c3f189131ec19a26d552d13af99..c17b4553829854340ef512dcb90bfd38
     if (
       event.keyCode == KeyEvent.DOM_VK_SHIFT ||
       event.keyCode == KeyEvent.DOM_VK_ALT ||
-@@ -3516,8 +3616,8 @@ export class UrlbarInput extends HTMLElement {
+@@ -3709,8 +3809,8 @@ export class UrlbarInput extends HTMLElement {
     if (!this.#isAddressbar) {
       return val;
     }
@@ -213,7 +213,7 @@ index 2e6e2be9d7e28c3f189131ec19a26d552d13af99..c17b4553829854340ef512dcb90bfd38
       : val;
     // Only trim value if the directionality doesn't change to RTL and we're not
     // showing a strikeout https protocol.
-@@ -3824,6 +3924,7 @@ export class UrlbarInput extends HTMLElement {
+@@ -4006,6 +4106,7 @@ export class UrlbarInput extends HTMLElement {
     resultDetails = null,
     browser = this.window.gBrowser.selectedBrowser
   ) {
@@ -221,7 +221,7 @@ index 2e6e2be9d7e28c3f189131ec19a26d552d13af99..c17b4553829854340ef512dcb90bfd38
     if (this.#isAddressbar) {
       this.#prepareAddressbarLoad(
         url,
-@@ -3935,6 +4036,10 @@ export class UrlbarInput extends HTMLElement {
+@@ -4117,6 +4218,10 @@ export class UrlbarInput extends HTMLElement {
       }
       reuseEmpty = true;
     }
@@ -232,7 +232,7 @@ index 2e6e2be9d7e28c3f189131ec19a26d552d13af99..c17b4553829854340ef512dcb90bfd38
     if (
       where == "tab" &&
       reuseEmpty &&
-@@ -3942,6 +4047,9 @@ export class UrlbarInput extends HTMLElement {
+@@ -4124,6 +4229,9 @@ export class UrlbarInput extends HTMLElement {
     ) {
       where = "current";
     }
@@ -242,7 +242,7 @@ index 2e6e2be9d7e28c3f189131ec19a26d552d13af99..c17b4553829854340ef512dcb90bfd38
     return where;
   }
 
-@@ -4196,6 +4304,7 @@ export class UrlbarInput extends HTMLElement {
+@@ -4378,6 +4486,7 @@ export class UrlbarInput extends HTMLElement {
       this.setResultForCurrentValue(null);
       this.handleCommand();
       this.controller.clearLastQueryContextCache();
@@ -250,7 +250,7 @@ index 2e6e2be9d7e28c3f189131ec19a26d552d13af99..c17b4553829854340ef512dcb90bfd38
 
       this._suppressStartQuery = false;
     });
-@@ -4203,7 +4312,6 @@ export class UrlbarInput extends HTMLElement {
+@@ -4385,7 +4494,6 @@ export class UrlbarInput extends HTMLElement {
     contextMenu.addEventListener("popupshowing", () => {
       // Close the results pane when the input field contextual menu is open,
       // because paste and go doesn't want a result selection.
@@ -258,7 +258,7 @@ index 2e6e2be9d7e28c3f189131ec19a26d552d13af99..c17b4553829854340ef512dcb90bfd38
 
       let controller =
         this.document.commandDispatcher.getControllerForCommand("cmd_paste");
-@@ -4319,7 +4427,11 @@ export class UrlbarInput extends HTMLElement {
+@@ -4541,7 +4649,11 @@ export class UrlbarInput extends HTMLElement {
     if (!engineName && !source && !this.hasAttribute("searchmode")) {
       return;
     }
@@ -271,7 +271,7 @@ index 2e6e2be9d7e28c3f189131ec19a26d552d13af99..c17b4553829854340ef512dcb90bfd38
     if (this._searchModeIndicatorTitle) {
       this._searchModeIndicatorTitle.textContent = "";
       this._searchModeIndicatorTitle.removeAttribute("data-l10n-id");
-@@ -4629,6 +4741,7 @@ export class UrlbarInput extends HTMLElement {
+@@ -4851,6 +4963,7 @@ export class UrlbarInput extends HTMLElement {
 
     this.document.l10n.setAttributes(
       this.inputField,
@@ -279,7 +279,7 @@ index 2e6e2be9d7e28c3f189131ec19a26d552d13af99..c17b4553829854340ef512dcb90bfd38
       l10nId,
       l10nId == "urlbar-placeholder-with-name"
         ? { name: engineName }
-@@ -4742,6 +4855,11 @@ export class UrlbarInput extends HTMLElement {
+@@ -4964,6 +5077,11 @@ export class UrlbarInput extends HTMLElement {
   }
 
   _on_click(event) {
@@ -291,7 +291,7 @@ index 2e6e2be9d7e28c3f189131ec19a26d552d13af99..c17b4553829854340ef512dcb90bfd38
     switch (event.target) {
       case this.inputField:
       case this._inputContainer:
-@@ -4820,7 +4938,7 @@ export class UrlbarInput extends HTMLElement {
+@@ -5042,7 +5160,7 @@ export class UrlbarInput extends HTMLElement {
       }
     }
 
@@ -300,7 +300,7 @@ index 2e6e2be9d7e28c3f189131ec19a26d552d13af99..c17b4553829854340ef512dcb90bfd38
       this.view.autoOpen({ event });
     } else {
       if (this._untrimOnFocusAfterKeydown) {
-@@ -4860,9 +4978,16 @@ export class UrlbarInput extends HTMLElement {
+@@ -5082,9 +5200,16 @@ export class UrlbarInput extends HTMLElement {
   }
 
   _on_mousedown(event) {
@@ -318,7 +318,7 @@ index 2e6e2be9d7e28c3f189131ec19a26d552d13af99..c17b4553829854340ef512dcb90bfd38
         if (
           event.composedTarget != this.inputField &&
           event.composedTarget != this._inputContainer
-@@ -4872,6 +4997,10 @@ export class UrlbarInput extends HTMLElement {
+@@ -5094,6 +5219,10 @@ export class UrlbarInput extends HTMLElement {
 
         this.focusedViaMousedown = !this.focused;
         this._preventClickSelectsAll = this.focused;
@@ -329,7 +329,7 @@ index 2e6e2be9d7e28c3f189131ec19a26d552d13af99..c17b4553829854340ef512dcb90bfd38
 
         // Keep the focus status, since the attribute may be changed
         // upon calling this.focus().
-@@ -4907,7 +5036,7 @@ export class UrlbarInput extends HTMLElement {
+@@ -5129,7 +5258,7 @@ export class UrlbarInput extends HTMLElement {
         }
         // Don't close the view when clicking on a tab; we may want to keep the
         // view open on tab switch, and the TabSelect event arrived earlier.
@@ -338,7 +338,7 @@ index 2e6e2be9d7e28c3f189131ec19a26d552d13af99..c17b4553829854340ef512dcb90bfd38
           break;
         }
 
-@@ -5235,7 +5364,7 @@ export class UrlbarInput extends HTMLElement {
+@@ -5411,7 +5540,7 @@ export class UrlbarInput extends HTMLElement {
     // When we are in actions search mode we can show more results so
     // increase the limit.
     let maxResults =
--- a/src/browser/extensions/newtab/lib/ActivityStream-sys-mjs.patch
+++ b/src/browser/extensions/newtab/lib/ActivityStream-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/extensions/newtab/lib/ActivityStream.sys.mjs b/browser/extensions/newtab/lib/ActivityStream.sys.mjs
-index 8bb36697cca3761dc98d8be9d8ee954fdff3ce3d..bd40d251eeeff2b61fdd1d2170947d071b8f0872 100644
+index daf4e1dca839a6e882edf598bd82f13f1bf4eadd..ebb584e058c0a15f5a5fa0bd80bdce42636c9ba0 100644
 --- a/browser/extensions/newtab/lib/ActivityStream.sys.mjs
 +++ b/browser/extensions/newtab/lib/ActivityStream.sys.mjs
-@@ -289,7 +289,7 @@ export const PREFS_CONFIG = new Map([
+@@ -287,7 +287,7 @@ export const PREFS_CONFIG = new Map([
     "showSponsoredTopSites",
     {
       title: "Show sponsored top sites",
--- a/src/browser/installer/windows/nsis/installer-nsi.patch
+++ b/src/browser/installer/windows/nsis/installer-nsi.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/installer/windows/nsis/installer.nsi b/browser/installer/windows/nsis/installer.nsi
-index f752555d18b0c6c7325cc99e73a85819fc015f5c..2416d2a79ca358ab901103d9546bc3d0454333eb 100755
+index b3459f8233b2509744e27bfe33884c6a92164e36..76b71e0882381f8f6becaf88bc4e3cc56f8d8ad4 100755
 --- a/browser/installer/windows/nsis/installer.nsi
 +++ b/browser/installer/windows/nsis/installer.nsi
@@ -842,7 +842,7 @@ Section "-InstallEndCleanup"
@@ -11,7 +11,7 @@ index f752555d18b0c6c7325cc99e73a85819fc015f5c..2416d2a79ca358ab901103d9546bc3d0
   ${EndIf}
 SectionEnd
 
-@@ -1984,5 +1984,5 @@ FunctionEnd
+@@ -1978,5 +1978,5 @@ FunctionEnd
 
 Function .onGUIEnd
   ${OnEndCommon}
--- a/src/browser/themes/linux/browser-css.patch
+++ b/src/browser/themes/linux/browser-css.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
-index dfb3e2c843d748e46c0f5878c9d06cebacffb603..4805a0bed7e60713218530c1b03f0f5dd65fe3af 100644
+index b82fa7229ad637a08563c06fa2c2abdf99998d7c..b5ee3aa9679244222a0e9eed4be54a41ec6a11f9 100644
 --- a/browser/themes/linux/browser.css
 +++ b/browser/themes/linux/browser.css
@@ -14,7 +14,6 @@
@@ -10,30 +10,12 @@ index dfb3e2c843d748e46c0f5878c9d06cebacffb603..4805a0bed7e60713218530c1b03f0f5d
       }
     }
   }
-@@ -58,7 +57,8 @@
-       -moz-default-appearance: -moz-window-decorations;
+@@ -59,6 +58,8 @@
       appearance: auto;
 
-      #navigator-toolbox,
+       body,
 +      #zen-main-app-wrapper,
 +      #zen-browser-background,
       dialog::backdrop {
         border-top-left-radius: env(-moz-gtk-csd-titlebar-radius);
         border-top-right-radius: env(-moz-gtk-csd-titlebar-radius);
-@@ -66,13 +66,11 @@
- 
-       /* stylelint-disable-next-line media-query-no-invalid */
-       @media -moz-pref("widget.gtk.rounded-bottom-corners.enabled") {
-        #navigator-toolbox {
-          /* The body clip below covers this. */
-          border-radius: 0;
-        }
- 
-         body,
-        dialog::backdrop {
-+        dialog::backdrop,
-+        #zen-main-app-wrapper,
-+        #zen-browser-background {
-           /* Use an uniform clip to allow WebRender to optimize it better */
-           border-radius: env(-moz-gtk-csd-titlebar-radius);
-         }
--- a/src/browser/themes/shared/browser-shared-css.patch
+++ b/src/browser/themes/shared/browser-shared-css.patch
@@ -1,17 +1,8 @@
 diff --git a/browser/themes/shared/browser-shared.css b/browser/themes/shared/browser-shared.css
-index 4e7ca6259c92da2c45c6ea3157863b971fbd6201..15da124b3e10da664bc0ba3a63cd02b33e31337c 100644
+index d1b11a65e527cf7c13f42b3f980f2f09592c5e53..44fb86b570c69f7d7003d3949e330e08722fbbb8 100644
 --- a/browser/themes/shared/browser-shared.css
 +++ b/browser/themes/shared/browser-shared.css
-@@ -155,8 +155,6 @@ body {
-    */
-   &.fullscreen-with-menubar {
-     z-index: var(--browser-area-z-index-toolbox-while-animating);
-    box-shadow: var(--content-area-shadow);
-    border-bottom-color: var(--chrome-content-separator-color);
-   }
- 
-   /* Themes define a set of toolbox foreground and background colors which we
-@@ -265,13 +263,13 @@ body {
+@@ -250,13 +250,13 @@ body {
 
   @media (-moz-platform: macos) and (not (-moz-mac-rtl)) {
     &:-moz-locale-dir(ltr) {
--- a/src/browser/themes/shared/jar-inc-mn.patch
+++ b/src/browser/themes/shared/jar-inc-mn.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn
-index 94de6f280e709161a54a65ffb621256b4e4e86fa..a882ce63c47e7757a9cd3b5bda7da792c5c3b616 100644
+index 3a12a7a33c33cec463b3d38647bdf647827784f8..4844da4b56b3172b333f5c5eb31fcd74f43fd0b0 100644
 --- a/browser/themes/shared/jar.inc.mn
 +++ b/browser/themes/shared/jar.inc.mn
-@@ -331,3 +331,5 @@
+@@ -334,3 +334,5 @@
 
   skin/classic/browser/illustrations/market-opt-in.svg         (../shared/illustrations/market-opt-in.svg)
   skin/classic/browser/illustrations/yelpRealtime-opt-in.svg   (../shared/illustrations/yelpRealtime-opt-in.svg)
--- a/src/browser/themes/shared/preferences/zen-preferences.css
+++ b/src/browser/themes/shared/preferences/zen-preferences.css
@@ -10,10 +10,6 @@
  --in-content-box-background: var(--zen-colors-tertiary) !important;
 }

-.main-content {
-  padding-top: 60px !important;
-}
-
 .pane-container {
  margin: auto;
 }
@@ -38,10 +34,6 @@ html|dialog {
  animation: dialogPopin 0.2s ease-out;
 }

-.sticky-inner-container {
-  display: none !important;
-}
-
 .subcategory {
  border-top: none !important;
 }
--- a/src/browser/themes/shared/tabbrowser/content-area-css.patch
+++ b/src/browser/themes/shared/tabbrowser/content-area-css.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/themes/shared/tabbrowser/content-area.css b/browser/themes/shared/tabbrowser/content-area.css
-index f01e484caadedbd7094a09c93dbd6f578261f24b..84e682e52f38c41fdaad1aea2f9468ce7040cc9d 100644
+index 13403bf438be18b5bcc9f3d497c94636b5fb5f6f..0505582a7efa212813cf39835c12d34d4d38eb4e 100644
 --- a/browser/themes/shared/tabbrowser/content-area.css
 +++ b/browser/themes/shared/tabbrowser/content-area.css
-@@ -89,7 +89,6 @@
+@@ -85,7 +85,6 @@
   min-height: 0;
 
   /* We want to be able to show the frame color behind the clipped radiused corner */
@@ -10,7 +10,7 @@ index f01e484caadedbd7094a09c93dbd6f578261f24b..84e682e52f38c41fdaad1aea2f9468ce
 
   /* stylelint-disable-next-line media-query-no-invalid */
   @media -moz-pref("sidebar.revamp") {
-@@ -145,7 +144,6 @@
+@@ -141,7 +140,6 @@
   }
 
   browser:is([blank], [pendingpaint]) {
@@ -18,7 +18,7 @@ index f01e484caadedbd7094a09c93dbd6f578261f24b..84e682e52f38c41fdaad1aea2f9468ce
   }
 
   /* Exclude browsers with smartwindow-content attribute which inherit
-@@ -431,7 +429,7 @@ split-view-footer {
+@@ -427,7 +425,7 @@ split-view-footer {
 
 .dialogStack {
   z-index: var(--browser-stack-z-index-dialog-stack);
@@ -27,7 +27,7 @@ index f01e484caadedbd7094a09c93dbd6f578261f24b..84e682e52f38c41fdaad1aea2f9468ce
   inset: 0;
   /* --browser-with-dialog set on browser[tabDialogShowing], we want to position the overlay
      only on the top of the <browser> element so it doesn't overlap the DevTools toolbox */
-@@ -598,7 +596,7 @@ split-view-footer {
+@@ -594,7 +592,7 @@ split-view-footer {
 
 .dialogOverlay[topmost="true"],
 #window-modal-dialog::backdrop {
--- a/src/browser/themes/shared/tabbrowser/ctrlTab-css.patch
+++ b/src/browser/themes/shared/tabbrowser/ctrlTab-css.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/themes/shared/tabbrowser/ctrlTab.css b/browser/themes/shared/tabbrowser/ctrlTab.css
-index 6a7d295bfaed7f0429a8ff5ac9b8a2db4ee911e3..d1a3a8d44bc06102adaef294dc72f8f404be17dc 100644
+index d016bb363f306d7f6b08554f5029d425c01ca358..0f8e4d0a1aa2f9958124ea75423f83eb6ef35afe 100644
 --- a/browser/themes/shared/tabbrowser/ctrlTab.css
 +++ b/browser/themes/shared/tabbrowser/ctrlTab.css
@@ -11,6 +11,7 @@
@@ -7,6 +7,6 @@ index 6a7d295bfaed7f0429a8ff5ac9b8a2db4ee911e3..d1a3a8d44bc06102adaef294dc72f8f4
   --panel-padding: 20px 10px 10px;
   -moz-window-shadow: none;
 +  --panel-shadow-margin: 0;
+   background-color: transparent;
   @media not (-moz-platform: macos) {
     font-weight: var(--font-weight-bold);
-   }
--- a/src/browser/themes/shared/tabbrowser/tabs-css.patch
+++ b/src/browser/themes/shared/tabbrowser/tabs-css.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/themes/shared/tabbrowser/tabs.css b/browser/themes/shared/tabbrowser/tabs.css
-index fc1e0870696fb5866663cdab0fc96faff0d5a3f8..2430d7afd4761c66cd5ad05a7f26200143299425 100644
+index 203b546933842f4b0134188fda020c4db4dcd0d2..011bcfb023d0cabd55dfa7e49d3409383217e2ca 100644
 --- a/browser/themes/shared/tabbrowser/tabs.css
 +++ b/browser/themes/shared/tabbrowser/tabs.css
@@ -24,7 +24,7 @@
@@ -79,7 +79,7 @@ index fc1e0870696fb5866663cdab0fc96faff0d5a3f8..2430d7afd4761c66cd5ad05a7f262001
     &[soundplaying] {
       list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-playing-small.svg");
     }
-@@ -668,7 +660,7 @@ tab-split-view-wrapper[dragtarget] {
+@@ -666,7 +658,7 @@ tab-split-view-wrapper[dragtarget] {
     }
   }
 
@@ -88,7 +88,7 @@ index fc1e0870696fb5866663cdab0fc96faff0d5a3f8..2430d7afd4761c66cd5ad05a7f262001
   &[crashed] {
     display: revert;
   }
-@@ -835,7 +827,7 @@ tab-split-view-wrapper[dragtarget] {
+@@ -832,7 +824,7 @@ tab-split-view-wrapper[dragtarget] {
       has not been added to root. There are certain scenarios when that attribute is temporarily
       removed from root such as when toggling the sidebar to expand with the toolbar button. */
     #tabbrowser-tabs[orient="horizontal"] &:not([pinned]):not([crashed]),
@@ -97,16 +97,16 @@ index fc1e0870696fb5866663cdab0fc96faff0d5a3f8..2430d7afd4761c66cd5ad05a7f262001
       &:is([soundplaying], [muted], [activemedia-blocked]) {
         display: flex;
       }
-@@ -1562,7 +1554,7 @@ tab-group {
+@@ -1614,7 +1606,7 @@ tab-group {
 }
 
 #tabbrowser-tabs[orient="vertical"][expanded] {
 -  tab-group > :is(.tab-group-label-container, .tabbrowser-tab),
 +  tab-group > :is(.tab-group-label-container, .tab-group-container, .tabbrowser-tab),
-   &[movingtab][movingtab-addToGroup]:not([movingtab-group], [movingtab-ungroup]) .tabbrowser-tab:is(:active, [multiselected]) {
+   &[movingtab][movingtab-addToGroup]:not([movingtab-group], [movingtab-ungroup]) tab-group > .tabbrowser-tab:is(:active, [multiselected]) {
     margin-inline-start: var(--space-medium);
   }
-@@ -2057,7 +2049,7 @@ tab-group {
+@@ -2089,7 +2081,7 @@ tab-group {
   }
 }
 
@@ -115,7 +115,7 @@ index fc1e0870696fb5866663cdab0fc96faff0d5a3f8..2430d7afd4761c66cd5ad05a7f262001
 #vertical-tabs-newtab-button {
   appearance: none;
   min-height: var(--tab-min-height);
-@@ -2068,7 +2060,7 @@ tab-group {
+@@ -2100,7 +2092,7 @@ tab-group {
   margin-inline: var(--tab-inner-inline-margin);
 
   #tabbrowser-tabs[orient="vertical"]:not([expanded]) & > .toolbarbutton-text {
@@ -124,7 +124,7 @@ index fc1e0870696fb5866663cdab0fc96faff0d5a3f8..2430d7afd4761c66cd5ad05a7f262001
   }
 
   &:hover {
-@@ -2092,7 +2084,7 @@ tab-group {
+@@ -2124,7 +2116,7 @@ tab-group {
  * flex container. #tabs-newtab-button is a child of the arrowscrollbox where
  * we don't want a gap (between tabs), so we have to add some margin.
  */
@@ -133,7 +133,7 @@ index fc1e0870696fb5866663cdab0fc96faff0d5a3f8..2430d7afd4761c66cd5ad05a7f262001
   margin-block: var(--tab-block-margin);
 }
 
-@@ -2280,7 +2272,6 @@ tab-group {
+@@ -2312,7 +2304,6 @@ tab-group {
 
   &:not([expanded]) {
     .tabbrowser-tab[pinned] {
@@ -141,7 +141,7 @@ index fc1e0870696fb5866663cdab0fc96faff0d5a3f8..2430d7afd4761c66cd5ad05a7f262001
     }
 
     .tab-background {
-@@ -2320,8 +2311,8 @@ tab-group {
+@@ -2352,8 +2343,8 @@ tab-group {
       display: block;
       position: absolute;
       inset: auto;
@@ -152,7 +152,7 @@ index fc1e0870696fb5866663cdab0fc96faff0d5a3f8..2430d7afd4761c66cd5ad05a7f262001
 
       &:-moz-window-inactive {
         background-image:
-@@ -2406,9 +2397,6 @@ tab-group {
+@@ -2438,9 +2429,6 @@ tab-group {
 
 :root:not([privatebrowsingmode]) :is(toolbarbutton, toolbarpaletteitem) ~ #tabbrowser-tabs,
 :root[privatebrowsingmode] :is(toolbarbutton:not(#firefox-view-button), toolbarpaletteitem:not(#wrapper-firefox-view-button)) ~ #tabbrowser-tabs {
@@ -162,7 +162,7 @@ index fc1e0870696fb5866663cdab0fc96faff0d5a3f8..2430d7afd4761c66cd5ad05a7f262001
 }
 
 :root[privatebrowsingmode] :is(#firefox-view-button, #menu_openFirefoxView) {
-@@ -2440,7 +2428,6 @@ toolbar:not(#TabsToolbar) #firefox-view-button {
+@@ -2472,7 +2460,6 @@ toolbar:not(#TabsToolbar) #firefox-view-button {
   list-style-image: url(chrome://global/skin/icons/plus.svg);
 }
 
--- a/src/browser/themes/shared/toolbarbuttons-css.patch
+++ b/src/browser/themes/shared/toolbarbuttons-css.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/themes/shared/toolbarbuttons.css b/browser/themes/shared/toolbarbuttons.css
-index 08e7ff0d00f2f41b0ca253a6a895d5111d65668e..9b24e9f386edb881b95de75776e46a4d5e40c4cd 100644
+index 8c02df47ca003fa5094de0e7802cd8c10ef1bf2a..a16e8d7d3a00af8df648946950b7bb1c3f30efbb 100644
 --- a/browser/themes/shared/toolbarbuttons.css
 +++ b/browser/themes/shared/toolbarbuttons.css
@@ -13,20 +13,6 @@
--- a/src/browser/themes/shared/urlbar-searchbar-css.patch
+++ b/src/browser/themes/shared/urlbar-searchbar-css.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/themes/shared/urlbar-searchbar.css b/browser/themes/shared/urlbar-searchbar.css
-index cbbf55f31ae5e456401172f79ddbbe41256025a4..dc471dfe30dedf7c4917322a5b2257a9ec9c4f90 100644
+index 0ee35cfe67c9bce37a844d4b7d9715d4fb50f709..5cdb8037e49a68ea4126af349690af8a16b5e59b 100644
 --- a/browser/themes/shared/urlbar-searchbar.css
 +++ b/browser/themes/shared/urlbar-searchbar.css
@@ -10,7 +10,7 @@
--- a/src/browser/themes/shared/urlbarView-css.patch
+++ b/src/browser/themes/shared/urlbarView-css.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/themes/shared/urlbarView.css b/browser/themes/shared/urlbarView.css
-index 212f3dc956df418b838e568d0b0fed5c1e848914..0dea37660e44ed5f000638eddf2770ebce049a43 100644
+index 2d6a63328642969e23da0a41ca6c7bb23eb96e8e..3060ba3f52ae7ab2f8fc36ff546d358724909b3e 100644
 --- a/browser/themes/shared/urlbarView.css
 +++ b/browser/themes/shared/urlbarView.css
@@ -21,7 +21,7 @@
--- a/src/browser/themes/windows/browser-css.patch
+++ b/src/browser/themes/windows/browser-css.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
-index a0ffa8cac5a4d7ec220e7ee5dd7d70dba81e9026..766d69d1a2c41f3de7de9b05ef096fcccaa5c2a0 100644
+index eca9fcfb453c6cf41c0a24f2775ad7bcf4678153..b7b609138a12695ff90663a707a7d985f9efb81a 100644
 --- a/browser/themes/windows/browser.css
 +++ b/browser/themes/windows/browser.css
@@ -41,7 +41,6 @@