no-bug: Sync upstream Firefox to version 151.0 (gh-13706)

2026-05-20 03:51:20 +00:00 · 2026-05-16 00:29:01 +02:00
parent 1659838194
commit 90a6ebe948
133 changed files with 1802 additions and 758 deletions
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ Zen is a firefox-based browser with the aim of pushing your productivity to a ne
 ### Firefox Versions

 - [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `150.0.3`! 🚀
- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 150.0.3`!
+- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 151.0`!

 ### Contributing

--- a/build/firefox-cache/l10n-last-commit-hash
+++ b/build/firefox-cache/l10n-last-commit-hash
@@ -1 +1 @@
-69c3d9ff05fd352d761a41ec35f59b06e166e3bc
+0c5fe3a13813ee9cee3324047c8f0294bb8f2aff
--- a/src/-prettierignore.patch
+++ b/src/-prettierignore.patch
@@ -1,8 +1,8 @@
 diff --git a/.prettierignore b/.prettierignore
-index 4c6d186c501f7e1b029db186d387f73d97dfed1e..81d0f7dc7f412151256c13ed93bd34d7bd872681 100644
+index de2efe413e5696a3b8d0467a3a9e668dfadd8a1a..01c76d8e639d5630fca9cccb55d415fc4e903e91 100644
 --- a/.prettierignore
 +++ b/.prettierignore
-@@ -1806,3 +1806,12 @@ tools/ts/test/baselines/
+@@ -1805,3 +1805,12 @@ tools/ts/test/baselines/
 try_task_config.json
 xpcom/idl-parser/xpidl/fixtures/xpctest.d.json
 **/package-lock.json
--- a/src/browser/actors/EncryptedMediaParent-sys-mjs.patch
+++ b/src/browser/actors/EncryptedMediaParent-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/actors/EncryptedMediaParent.sys.mjs b/browser/actors/EncryptedMediaParent.sys.mjs
-index 9d3d3db9761cf5b2fde1f70992e82b1733241863..3dc64dc395d5237bf2c290cb8588cf467fb8729a 100644
+index 492dce93d3cc7c6ec16db047c9e47b175ef3a0fe..757e5543e0e6900c414db6d7a96d511608c1e50a 100644
 --- a/browser/actors/EncryptedMediaParent.sys.mjs
 +++ b/browser/actors/EncryptedMediaParent.sys.mjs
-@@ -200,6 +200,7 @@ export class EncryptedMediaParent extends JSWindowActorParent {
+@@ -199,6 +199,7 @@ export class EncryptedMediaParent extends JSWindowActorParent {
         "drmContentPlaying",
         aBrowser
       )
--- a/src/browser/actors/WebRTCParent-sys-mjs.patch
+++ b/src/browser/actors/WebRTCParent-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/actors/WebRTCParent.sys.mjs b/browser/actors/WebRTCParent.sys.mjs
-index e8b762b4c8f71ddafc090415abfe97674401dbc2..5dda5fe9c9bc02ebe7713f7bd21315fe4ba8b8cd 100644
+index b743bd83529c4cd01a6bc820967186dbe41b6144..e24c48bac0f4ae3d4b26087b7e0cac7910019d0e 100644
 --- a/browser/actors/WebRTCParent.sys.mjs
 +++ b/browser/actors/WebRTCParent.sys.mjs
@@ -152,6 +152,7 @@ export class WebRTCParent extends JSWindowActorParent {
--- a/src/browser/app/splash-rc.patch
+++ b/src/browser/app/splash-rc.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/app/splash.rc b/browser/app/splash.rc
-index 259a8068c3aa256b8c50487a04f1844292b90b2e..8b9c792e1484bb801246b06b6ce43fb6d6271ee8 100644
+index 04c1d3e1db7d067d579512999a08de85a0aa212c..4e04eb5008ca1701c731c3109ba184ccf465b51b 100644
 --- a/browser/app/splash.rc
 +++ b/browser/app/splash.rc
-@@ -6,6 +6,9 @@
+@@ -5,6 +5,9 @@
 #include <windows.h>
 #include "nsNativeAppSupportWin.h"
 
--- a/src/browser/base/content/browser-addons-js.patch
+++ b/src/browser/base/content/browser-addons-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/browser-addons.js b/browser/base/content/browser-addons.js
-index 098cf2408bc462f61fb547716754a3af832ffa1e..d062d03f7d258b66740d785cc30abe7932eaea41 100644
+index 853d3c9dd9dd806d49a3c5a44304dd7370f0c90e..ea927b05213981fbfa5494d8d22bce05f45bce08 100644
 --- a/browser/base/content/browser-addons.js
 +++ b/browser/base/content/browser-addons.js
-@@ -1061,7 +1061,7 @@ var gXPInstallObserver = {
+@@ -1060,7 +1060,7 @@ var gXPInstallObserver = {
       persistent: true,
       hideClose: true,
       popupOptions: {
@@ -11,7 +11,7 @@ index 098cf2408bc462f61fb547716754a3af832ffa1e..d062d03f7d258b66740d785cc30abe79
       },
     };
 
-@@ -1283,7 +1283,7 @@ var gXPInstallObserver = {
+@@ -1282,7 +1282,7 @@ var gXPInstallObserver = {
       hideClose: true,
       timeout: Date.now() + 30000,
       popupOptions: {
@@ -20,7 +20,7 @@ index 098cf2408bc462f61fb547716754a3af832ffa1e..d062d03f7d258b66740d785cc30abe79
       },
     };
 
-@@ -2210,7 +2210,7 @@ var gUnifiedExtensions = {
+@@ -2209,7 +2209,7 @@ var gUnifiedExtensions = {
   // If the new ID is not added in NOTIFICATION_IDS, consider handling the case
   // in the "PopupNotificationsBeforeAnchor" handler elsewhere in this file.
   getPopupAnchorID(aBrowser, aWindow) {
@@ -29,7 +29,7 @@ index 098cf2408bc462f61fb547716754a3af832ffa1e..d062d03f7d258b66740d785cc30abe79
     const attr = anchorID + "popupnotificationanchor";
 
     if (!aBrowser[attr]) {
-@@ -2221,7 +2221,7 @@ var gUnifiedExtensions = {
+@@ -2220,7 +2220,7 @@ var gUnifiedExtensions = {
         anchorID
         // Anchor on the toolbar icon to position the popup right below the
         // button.
@@ -38,7 +38,7 @@ index 098cf2408bc462f61fb547716754a3af832ffa1e..d062d03f7d258b66740d785cc30abe79
     }
 
     return anchorID;
-@@ -2546,7 +2546,7 @@ var gUnifiedExtensions = {
+@@ -2545,7 +2545,7 @@ var gUnifiedExtensions = {
     requestAnimationFrame(() => this.updateAttention());
   },
 
@@ -47,7 +47,7 @@ index 098cf2408bc462f61fb547716754a3af832ffa1e..d062d03f7d258b66740d785cc30abe79
     // A list of extension widget IDs (possibly empty).
     let widgetIDs;
 
-@@ -2560,7 +2560,7 @@ var gUnifiedExtensions = {
+@@ -2559,7 +2559,7 @@ var gUnifiedExtensions = {
     }
 
     // The list of overflowed extensions in the extensions panel.
@@ -56,7 +56,7 @@ index 098cf2408bc462f61fb547716754a3af832ffa1e..d062d03f7d258b66740d785cc30abe79
       "#overflowed-extensions-list"
     );
 
-@@ -2661,37 +2661,41 @@ var gUnifiedExtensions = {
+@@ -2660,37 +2660,41 @@ var gUnifiedExtensions = {
       );
       template.replaceWith(template.content);
       this._panel = document.getElementById("unified-extensions-panel");
@@ -123,7 +123,7 @@ index 098cf2408bc462f61fb547716754a3af832ffa1e..d062d03f7d258b66740d785cc30abe79
     if (!CustomizationHandler.isCustomizing()) {
       if (aEvent) {
         if (
-@@ -2713,6 +2717,7 @@ var gUnifiedExtensions = {
+@@ -2712,6 +2716,7 @@ var gUnifiedExtensions = {
         // and no alternative content is available for display in the panel.
         const policies = this.getActivePolicies();
         if (
@@ -131,7 +131,7 @@ index 098cf2408bc462f61fb547716754a3af832ffa1e..d062d03f7d258b66740d785cc30abe79
           policies.length &&
           !this.hasExtensionsInPanel(policies) &&
           !this.isPrivateWindowMissingExtensionsWithoutPBMAccess() &&
-@@ -2728,32 +2733,30 @@ var gUnifiedExtensions = {
+@@ -2727,32 +2732,30 @@ var gUnifiedExtensions = {
       this.blocklistAttentionInfo =
         await AddonManager.getBlocklistAttentionInfo();
 
@@ -170,7 +170,7 @@ index 098cf2408bc462f61fb547716754a3af832ffa1e..d062d03f7d258b66740d785cc30abe79
           triggerEvent: aEvent,
         });
       }
-@@ -2948,18 +2951,20 @@ var gUnifiedExtensions = {
+@@ -2947,18 +2950,20 @@ var gUnifiedExtensions = {
       this._maybeMoveWidgetNodeBack(widgetId);
     }
 
--- a/src/browser/base/content/browser-commands-js.patch
+++ b/src/browser/base/content/browser-commands-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/browser-commands.js b/browser/base/content/browser-commands.js
-index e7f88f69fcc22efca4c7fc0363b9fe2729e1be6f..d7c4063d38576a34545b9af06c37937dc9090628 100644
+index 2d9f5591c9ffdd5948298555c461850521c0b45f..c46072ca4e96b419987f7e782e26b3de71d7c8e3 100644
 --- a/browser/base/content/browser-commands.js
 +++ b/browser/base/content/browser-commands.js
-@@ -14,6 +14,10 @@ var BrowserCommands = {
+@@ -13,6 +13,10 @@ var BrowserCommands = {
     const where = BrowserUtils.whereToOpenLink(aEvent, false, true);
 
     if (where == "current") {
@@ -13,7 +13,7 @@ index e7f88f69fcc22efca4c7fc0363b9fe2729e1be6f..d7c4063d38576a34545b9af06c37937d
       try {
         gBrowser.goBack();
       } catch (ex) {}
-@@ -229,6 +233,10 @@ var BrowserCommands = {
+@@ -234,6 +238,10 @@ var BrowserCommands = {
       }
     }
 
@@ -24,7 +24,7 @@ index e7f88f69fcc22efca4c7fc0363b9fe2729e1be6f..d7c4063d38576a34545b9af06c37937d
     // 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
-@@ -313,6 +321,14 @@ var BrowserCommands = {
+@@ -318,6 +326,14 @@ var BrowserCommands = {
       return;
     }
 
@@ -39,7 +39,7 @@ index e7f88f69fcc22efca4c7fc0363b9fe2729e1be6f..d7c4063d38576a34545b9af06c37937d
     // Keyboard shortcuts that would close a tab that is pinned select the first
     // unpinned tab instead.
     if (
-@@ -320,8 +336,8 @@ var BrowserCommands = {
+@@ -325,8 +341,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,8 +1,8 @@
 diff --git a/browser/base/content/browser-fullScreenAndPointerLock.js b/browser/base/content/browser-fullScreenAndPointerLock.js
-index cd46701e9f4b672f392533c9ecc1c8570c3b2c5a..beb992702ea90e0b81f7bda4a6c0522932e84dfe 100644
+index 1eaf79a4f6788c518a4759bbce81175fd5fba220..6fde5e944ad4a847180ca83a9e6f4fde20aa7b42 100644
 --- a/browser/base/content/browser-fullScreenAndPointerLock.js
 +++ b/browser/base/content/browser-fullScreenAndPointerLock.js
-@@ -464,8 +464,6 @@ var FullScreen = {
+@@ -501,8 +501,6 @@ var FullScreen = {
     // don't need that kind of precision in our CSS.
     shiftSize = shiftSize.toFixed(2);
     let translate = shiftSize > 0 ? `0 ${shiftSize}px` : "";
--- 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 b64d2f52ed1eb3d0b8aa86700bc082d3fc95152b..dd8636148d0646f6949d6279d70e20c09d8c7c17 100644
+index d09cf65931eda253b2a71131f42883ccf6eb5724..f617863dac8e07def02d1d4ef7e5ade1caf50df1 100644
 --- a/browser/base/content/browser-init.js
 +++ b/browser/base/content/browser-init.js
-@@ -252,6 +252,7 @@ var gBrowserInit = {
+@@ -302,6 +302,7 @@ var gBrowserInit = {
   },
 
   onLoad() {
@@ -10,7 +10,7 @@ index b64d2f52ed1eb3d0b8aa86700bc082d3fc95152b..dd8636148d0646f6949d6279d70e20c0
     gBrowser.addEventListener("DOMUpdateBlockedPopups", e =>
       PopupAndRedirectBlockerObserver.handleEvent(e)
     );
-@@ -446,6 +447,7 @@ var gBrowserInit = {
+@@ -496,6 +497,7 @@ var gBrowserInit = {
 
     this._handleURIToLoad();
 
--- a/src/browser/base/content/browser-js.patch
+++ b/src/browser/base/content/browser-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
-index 942bb5688e98f66ad71560fb32e1ca26a8081edf..25ba741c35c49afbf4e6053df3a0a7296d3040d8 100644
+index d1ab42d59f05513ec60a7578b7acab44875c544c..8c3cd75704991b8572d3f13a936fddd2616b2946 100644
 --- a/browser/base/content/browser.js
 +++ b/browser/base/content/browser.js
-@@ -33,6 +33,7 @@ ChromeUtils.defineESModuleGetters(this, {
+@@ -34,6 +34,7 @@ ChromeUtils.defineESModuleGetters(this, {
     "resource://gre/modules/ContextualIdentityService.sys.mjs",
   CustomizableUI:
     "moz-src:///browser/components/customizableui/CustomizableUI.sys.mjs",
@@ -24,7 +24,7 @@ index 942bb5688e98f66ad71560fb32e1ca26a8081edf..25ba741c35c49afbf4e6053df3a0a729
     if (backDisabled) {
       backCommand.removeAttribute("disabled");
     } else {
-@@ -3830,7 +3836,7 @@ function warnAboutClosingWindow() {
+@@ -3715,7 +3721,7 @@ function warnAboutClosingWindow() {
 
   if (!isPBWindow && !toolbar.visible) {
     return gBrowser.warnAboutClosingTabs(
@@ -33,7 +33,7 @@ index 942bb5688e98f66ad71560fb32e1ca26a8081edf..25ba741c35c49afbf4e6053df3a0a729
       gBrowser.closingTabsEnum.ALL
     );
   }
-@@ -3870,7 +3876,7 @@ function warnAboutClosingWindow() {
+@@ -3755,7 +3761,7 @@ function warnAboutClosingWindow() {
     return (
       isPBWindow ||
       gBrowser.warnAboutClosingTabs(
@@ -42,7 +42,7 @@ index 942bb5688e98f66ad71560fb32e1ca26a8081edf..25ba741c35c49afbf4e6053df3a0a729
         gBrowser.closingTabsEnum.ALL
       )
     );
-@@ -3895,7 +3901,7 @@ function warnAboutClosingWindow() {
+@@ -3780,7 +3786,7 @@ function warnAboutClosingWindow() {
     AppConstants.platform != "macosx" ||
     isPBWindow ||
     gBrowser.warnAboutClosingTabs(
@@ -51,7 +51,7 @@ index 942bb5688e98f66ad71560fb32e1ca26a8081edf..25ba741c35c49afbf4e6053df3a0a729
       gBrowser.closingTabsEnum.ALL
     )
   );
-@@ -4835,6 +4841,9 @@ var ConfirmationHint = {
+@@ -4720,6 +4726,9 @@ var ConfirmationHint = {
     }
 
     document.l10n.setAttributes(this._message, messageId, options.l10nArgs);
--- a/src/browser/base/content/browser-places-js.patch
+++ b/src/browser/base/content/browser-places-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser-places.js b/browser/base/content/browser-places.js
-index 543630b89bc4f1d40eda7e4e7ae68a3c9f45e1e7..fac68af45985ad2feeb1daebd470d028b49d1dde 100644
+index e3feaebc551bfe7127b9701a7f76996022516af0..460b39f2a9f1f36d4b821c693951214098b644f7 100644
 --- a/browser/base/content/browser-places.js
 +++ b/browser/base/content/browser-places.js
@@ -261,6 +261,8 @@ var StarUI = {
@@ -33,7 +33,7 @@ index 543630b89bc4f1d40eda7e4e7ae68a3c9f45e1e7..fac68af45985ad2feeb1daebd470d028
   removeBookmarkButtonCommand: function SU_removeBookmarkButtonCommand() {
     this._removeBookmarksOnPopupHidden = true;
     this.panel.hidePopup();
-@@ -1811,6 +1828,7 @@ var BookmarkingUI = {
+@@ -1815,6 +1832,7 @@ var BookmarkingUI = {
       document.getElementById("context-bookmarkpage"),
       PanelMultiView.getViewNode(document, "panelMenuBookmarkThisPage"),
       document.getElementById("pageAction-panel-bookmark"),
--- a/src/browser/base/content/browser-sets-inc-xhtml.patch
+++ b/src/browser/base/content/browser-sets-inc-xhtml.patch
@@ -0,0 +1,9 @@
+diff --git a/browser/base/content/browser-sets.inc.xhtml b/browser/base/content/browser-sets.inc.xhtml
+index 1263856344c4613ea58639a64e747fd0c3f771f7..c83ed7dd6a2482354c5bd37ce2e2cbf88ee6cf60 100644
+--- a/browser/base/content/browser-sets.inc.xhtml
+++ b/browser/base/content/browser-sets.inc.xhtml
+@@ -418,3 +418,4 @@
+          internal="true"/>
+ #endif
+   </keyset>
+#include zen-keysets.inc.xhtml
--- a/src/browser/base/content/browser-sets-inc.patch
+++ b/src/browser/base/content/browser-sets-inc.patch
@@ -1,9 +0,0 @@
-diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
-index 8871fc984acccfd9c54c7aef9f91934d81ba00c0..923ab3bda423eae77518f437221c32ca4990f5ce 100644
--- a/browser/base/content/browser-sets.inc
-+++ b/browser/base/content/browser-sets.inc
-@@ -415,3 +415,4 @@
-          internal="true"/>
- #endif
-   </keyset>
-+#include zen-keysets.inc.xhtml
--- a/src/browser/base/content/browser-sets-js.patch
+++ b/src/browser/base/content/browser-sets-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/browser-sets.js b/browser/base/content/browser-sets.js
-index d9ab2ad00b862d56ea7aa8e2469d050d8df7f5dc..2efb25ff9cfd3a224724fffadfa0aee693ddf47d 100644
+index 8b153dfac9421f0cce716ed399f33ec9b25eb311..5e461b0fc89455d38869ac70a7ce6a3b20ffd26b 100644
 --- a/browser/base/content/browser-sets.js
 +++ b/browser/base/content/browser-sets.js
-@@ -272,7 +272,7 @@ document.addEventListener(
+@@ -285,7 +285,7 @@ document.addEventListener(
         }
       });
 
@@ -11,7 +11,7 @@ index d9ab2ad00b862d56ea7aa8e2469d050d8df7f5dc..2efb25ff9cfd3a224724fffadfa0aee6
       const SIDEBAR_REVAMP_PREF = "sidebar.revamp";
       const SIDEBAR_REVAMP_ENABLED = Services.prefs.getBoolPref(
         SIDEBAR_REVAMP_PREF,
-@@ -310,6 +310,8 @@ document.addEventListener(
+@@ -323,6 +323,8 @@ document.addEventListener(
               panel: SidebarController.currentID,
               opened: SidebarController._state.launcherExpanded,
             });
--- a/src/browser/base/content/browser-xhtml.patch
+++ b/src/browser/base/content/browser-xhtml.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/browser.xhtml b/browser/base/content/browser.xhtml
-index b42287485c2baeabe831b0d54c6f09330b0caabd..e404c2e028e24eb4fa9b97f143ba476c1b1461fd 100644
+index d8ed09dca6c8ae99ed1a84cef22462a0d7b517fe..dcb65c4268913fdf32302c9b4ac723131187922e 100644
 --- a/browser/base/content/browser.xhtml
 +++ b/browser/base/content/browser.xhtml
-@@ -19,6 +19,7 @@
+@@ -18,6 +18,7 @@
         sizemode="normal"
         retargetdocumentfocus="urlbar-input"
         scrolling="false"
@@ -10,7 +10,7 @@ index b42287485c2baeabe831b0d54c6f09330b0caabd..e404c2e028e24eb4fa9b97f143ba476c
         persist="screenX screenY width height sizemode"
         data-l10n-sync="true">
 <head>
-@@ -101,8 +102,10 @@
+@@ -100,8 +101,10 @@
 
   <title data-l10n-id="browser-main-window-default-title"></title>
 
@@ -21,7 +21,7 @@ index b42287485c2baeabe831b0d54c6f09330b0caabd..e404c2e028e24eb4fa9b97f143ba476c
 </head>
 <html:body xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 # All sets except for popupsets (commands, keys, and stringbundles)
-@@ -135,9 +138,10 @@
+@@ -134,9 +137,10 @@
     </vbox>
   </html:template>
 
--- a/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
+++ b/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/navigator-toolbox.inc.xhtml b/browser/base/content/navigator-toolbox.inc.xhtml
-index edeb473e46b3aa4b12eb4b59ce62e5ae48edd2a1..99210f8bb5633d50d2cba24f1e13ca866c5b6959 100644
+index b4abfb868fc7c13e789acb57b44e386de6d31bf0..ad917f5362ed4f3ba0149c214fb53d3f087bbfcf 100644
 --- a/browser/base/content/navigator-toolbox.inc.xhtml
 +++ b/browser/base/content/navigator-toolbox.inc.xhtml
@@ -2,7 +2,7 @@
@@ -12,7 +12,7 @@ index edeb473e46b3aa4b12eb4b59ce62e5ae48edd2a1..99210f8bb5633d50d2cba24f1e13ca86
 
   <!-- Menu -->
@@ -18,9 +18,13 @@
- #include browser-menubar.inc
+ #include browser-menubar.inc.xhtml
     </toolbaritem>
     <spacer flex="1" skipintoolbarset="true" style="order: 1000;"/>
 -#include titlebar-items.inc.xhtml
@@ -43,7 +43,7 @@ index edeb473e46b3aa4b12eb4b59ce62e5ae48edd2a1..99210f8bb5633d50d2cba24f1e13ca86
         </tabs>
 
         <toolbarbutton id="new-tab-button"
-@@ -114,9 +121,10 @@
+@@ -115,9 +122,10 @@
 
     <toolbarbutton class="content-analysis-indicator toolbarbutton-1 content-analysis-indicator-icon"/>
 
--- a/src/browser/base/content/navigator-toolbox-js.patch
+++ b/src/browser/base/content/navigator-toolbox-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/navigator-toolbox.js b/browser/base/content/navigator-toolbox.js
-index 362a85c20d8f0633fa78f85578e4cf015fdd0e44..ef7d6ff9e0e9876bc1918e365fd0addcd177cecb 100644
+index 1982ebadbd2df5ea309db487a4f30288f1af43e5..926c681d4733c84768a23407d60ca05859408b6d 100644
 --- a/browser/base/content/navigator-toolbox.js
 +++ b/browser/base/content/navigator-toolbox.js
-@@ -11,7 +11,7 @@ ChromeUtils.defineESModuleGetters(this, {
+@@ -10,7 +10,7 @@ ChromeUtils.defineESModuleGetters(this, {
 document.addEventListener(
   "DOMContentLoaded",
   () => {
@@ -11,7 +11,7 @@ index 362a85c20d8f0633fa78f85578e4cf015fdd0e44..ef7d6ff9e0e9876bc1918e365fd0addc
     const widgetOverflow = document.getElementById("widget-overflow");
 
     function onPopupShowing(event) {
-@@ -189,6 +189,7 @@ document.addEventListener(
+@@ -188,6 +188,7 @@ document.addEventListener(
         #forward-button,
         #reload-button ,
         #reader-mode-button,
@@ -19,7 +19,7 @@ index 362a85c20d8f0633fa78f85578e4cf015fdd0e44..ef7d6ff9e0e9876bc1918e365fd0addc
         #picture-in-picture-button,
         #urlbar-zoom-button,
         #star-button-box,
-@@ -215,6 +216,17 @@ document.addEventListener(
+@@ -214,6 +215,17 @@ document.addEventListener(
           gBrowser.handleNewTabMiddleClick(element, event);
           break;
 
@@ -37,7 +37,7 @@ index 362a85c20d8f0633fa78f85578e4cf015fdd0e44..ef7d6ff9e0e9876bc1918e365fd0addc
         case "back-button":
         case "forward-button":
         case "reload-button":
-@@ -330,6 +342,7 @@ document.addEventListener(
+@@ -329,6 +341,7 @@ document.addEventListener(
         #downloads-button,
         #fxa-toolbar-menu-button,
         #unified-extensions-button,
@@ -45,7 +45,7 @@ index 362a85c20d8f0633fa78f85578e4cf015fdd0e44..ef7d6ff9e0e9876bc1918e365fd0addc
         #library-button,
         #split-view-button,
         #smartwindow-ask-button
-@@ -414,6 +427,16 @@ document.addEventListener(
+@@ -413,6 +426,16 @@ document.addEventListener(
           gUnifiedExtensions.togglePanel(event);
           break;
 
--- a/src/browser/base/content/nsContextMenu-sys-mjs.patch
+++ b/src/browser/base/content/nsContextMenu-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/nsContextMenu.sys.mjs b/browser/base/content/nsContextMenu.sys.mjs
-index 5ee0ee4246d1c267b75328666a7f7f54e6f93246..ae778b88e1d295cdae2d0433d943ac467081b126 100644
+index 97cb36e2ed48d00454e169fb0470b47ac994b883..1811a92885620c8a916937f467ebb7d0eb0d3a0e 100644
 --- a/browser/base/content/nsContextMenu.sys.mjs
 +++ b/browser/base/content/nsContextMenu.sys.mjs
-@@ -370,6 +370,9 @@ export class nsContextMenu {
+@@ -369,6 +369,9 @@ export class nsContextMenu {
     this.initTextFragmentItems();
     this.pdfjsContextMenu.initItems();
 
--- a/src/browser/base/moz-build.patch
+++ b/src/browser/base/moz-build.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/moz.build b/browser/base/moz.build
-index 086b462e706bb46727d0fed85b4c98debaeaf721..44a4fcb9b8181678667ee11b0443eed681dd2a43 100644
+index 286e17552e2ab2d7e44c6ba99c84630cadd24e94..076f813aea971db1e1c1429fc0b64c1784a22722 100644
 --- a/browser/base/moz.build
 +++ b/browser/base/moz.build
-@@ -82,3 +82,5 @@ DEFINES["MOZ_APP_VERSION_DISPLAY"] = CONFIG["MOZ_APP_VERSION_DISPLAY"]
+@@ -78,3 +78,5 @@ DEFINES["MOZ_APP_VERSION_DISPLAY"] = CONFIG["MOZ_APP_VERSION_DISPLAY"]
 DEFINES["APP_LICENSE_BLOCK"] = "%s/content/overrides/app-license.html" % SRCDIR
 
 JAR_MANIFESTS += ["jar.mn"]
--- a/src/browser/components/BrowserContentHandler-sys-mjs.patch
+++ b/src/browser/components/BrowserContentHandler-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/BrowserContentHandler.sys.mjs b/browser/components/BrowserContentHandler.sys.mjs
-index 2152327b42c884456785ef065422e3ca6cc8c50b..932150495d23c0a63987abf14b3dc8a12eb42d6c 100644
+index 430c6877c81824d8ab318cacc997d4eda4cb6a11..e8a195e1fe09952b90a0d73d13c6c15da2006bd4 100644
 --- a/browser/components/BrowserContentHandler.sys.mjs
 +++ b/browser/components/BrowserContentHandler.sys.mjs
@@ -603,6 +603,28 @@ nsBrowserContentHandler.prototype = {
--- 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 75cdab491d35dc30be6c0a4ec6ab88e6fb4239aa..9c26fb1d6032bdecd6c552bd25694f45e3822d50 100644
+index af635211046f9f1b2d473a14e8170837cd0d93cd..f07514a7e3ab55aa3321f0a7c0c092e91c2961ce 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 75cdab491d35dc30be6c0a4ec6ab88e6fb4239aa..9c26fb1d6032bdecd6c552bd25694f45
   AboutHomeStartupCache: "resource:///modules/AboutHomeStartupCache.sys.mjs",
   AWToolbarButton: "resource:///modules/aboutwelcome/AWToolbarUtils.sys.mjs",
   ASRouter: "resource:///modules/asrouter/ASRouter.sys.mjs",
-@@ -1457,7 +1458,7 @@ BrowserGlue.prototype = {
+@@ -1458,7 +1459,7 @@ BrowserGlue.prototype = {
       windowcount++;
       let tabbrowser = win.gBrowser;
       if (tabbrowser) {
@@ -19,7 +19,7 @@ index 75cdab491d35dc30be6c0a4ec6ab88e6fb4239aa..9c26fb1d6032bdecd6c552bd25694f45
       }
     }
 
-@@ -1622,6 +1623,8 @@ BrowserGlue.prototype = {
+@@ -1623,6 +1624,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,8 +1,8 @@
 diff --git a/browser/components/aboutwelcome/content/aboutwelcome.css b/browser/components/aboutwelcome/content/aboutwelcome.css
-index e5bbb4c217ae7b05a2da79b332d72cc5429f061f..ea44d83dd0825a3bc950f6005025498644c7fc67 100644
+index 98497769b135efd3200607ee2cf50e82d06ed3fd..68e0778cfc4dc70935a3d48e79542b4133b293d2 100644
 --- a/browser/components/aboutwelcome/content/aboutwelcome.css
 +++ b/browser/components/aboutwelcome/content/aboutwelcome.css
-@@ -331,6 +331,11 @@ panel#feature-callout {
+@@ -330,6 +330,11 @@ panel#feature-callout {
   --panel-shadow-margin: 6px;
   --panel-arrow-space: calc(var(--panel-shadow-margin) + var(--arrow-visible-height) - 1.5px);
   --panel-margin-offset: calc(-1 * (var(--panel-shadow-margin) + var(--arrow-corner-distance) + (var(--arrow-width) / 2)));
@@ -14,7 +14,7 @@ index e5bbb4c217ae7b05a2da79b332d72cc5429f061f..ea44d83dd0825a3bc950f60050254986
 }
 
 panel#feature-callout::part(content) {
-@@ -518,6 +523,12 @@ div#feature-callout.hidden {
+@@ -517,6 +522,12 @@ div#feature-callout.hidden {
   width: 25em;
   gap: 16px;
   background: var(--fc-background);
@@ -27,7 +27,7 @@ index e5bbb4c217ae7b05a2da79b332d72cc5429f061f..ea44d83dd0825a3bc950f60050254986
 }
 #feature-callout .screen[pos=callout] .section-main .main-content .main-content-inner {
   gap: 12px;
-@@ -850,6 +861,10 @@ panel#feature-callout::part(content) {
+@@ -933,6 +944,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,8 +1,8 @@
 diff --git a/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs b/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs
-index 4081f59d041e91291d5e6b6b8c9ad96db5b6b2dc..d420a2fe4ca552b7f24ce9fbefc5f7302d7f2c8e 100644
+index 97710ab0570a1a477ef4ed74a78c16448dfb7674..7d8ba5b1f2f330175fb57b906bb572fd7e1d36c8 100644
 --- a/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs
 +++ b/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs
-@@ -269,6 +269,7 @@ export const AIWindow = {
+@@ -277,6 +277,7 @@ export const AIWindow = {
   },
 
   _updateToolbarButtonPositions(win, { isToggling = false } = {}) {
--- a/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
+++ b/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/customizableui/CustomizableUI.sys.mjs b/browser/components/customizableui/CustomizableUI.sys.mjs
-index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d89ee6ce1d 100644
+index 5905271a3343efa04b45f5d1a63bfca3de342755..af76922c1ba0b35a0072ec044f7d0860f9295d9d 100644
 --- a/browser/components/customizableui/CustomizableUI.sys.mjs
 +++ b/browser/components/customizableui/CustomizableUI.sys.mjs
-@@ -14,6 +14,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
+@@ -13,6 +13,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
   BrowserUsageTelemetry: "resource:///modules/BrowserUsageTelemetry.sys.mjs",
   CustomizableWidgets:
     "moz-src:///browser/components/customizableui/CustomizableWidgets.sys.mjs",
@@ -10,7 +10,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8
   HomePage: "resource:///modules/HomePage.sys.mjs",
   PanelMultiView:
     "moz-src:///browser/components/customizableui/PanelMultiView.sys.mjs",
-@@ -348,7 +349,7 @@ var CustomizableUIInternal = {
+@@ -347,7 +348,7 @@ var CustomizableUIInternal = {
       {
         type: CustomizableUI.TYPE_PANEL,
         defaultPlacements: [],
@@ -19,7 +19,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8
       },
       false
     );
-@@ -358,20 +359,15 @@ var CustomizableUIInternal = {
+@@ -357,20 +358,15 @@ var CustomizableUIInternal = {
       "back-button",
       "forward-button",
       "stop-reload-button",
@@ -41,7 +41,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8
     this.registerArea(
       CustomizableUI.AREA_NAVBAR,
       {
-@@ -379,8 +375,6 @@ var CustomizableUIInternal = {
+@@ -378,8 +374,6 @@ var CustomizableUIInternal = {
         overflowable: true,
         defaultPlacements: navbarPlacements,
         verticalTabsDefaultPlacements: [
@@ -50,7 +50,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8
         ],
         defaultCollapsed: false,
       },
-@@ -404,10 +398,7 @@ var CustomizableUIInternal = {
+@@ -403,10 +397,7 @@ var CustomizableUIInternal = {
       {
         type: CustomizableUI.TYPE_TOOLBAR,
         defaultPlacements: [
@@ -61,7 +61,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8
         ],
         verticalTabsDefaultPlacements: [],
         defaultCollapsed: null,
-@@ -489,6 +480,7 @@ var CustomizableUIInternal = {
+@@ -486,6 +477,7 @@ var CustomizableUIInternal = {
       CustomizableUI.AREA_NAVBAR,
       CustomizableUI.AREA_BOOKMARKS,
       CustomizableUI.AREA_TABSTRIP,
@@ -69,7 +69,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8
     ]);
     if (AppConstants.platform != "macosx") {
       toolbars.add(CustomizableUI.AREA_MENUBAR);
-@@ -1265,6 +1257,9 @@ var CustomizableUIInternal = {
+@@ -1262,6 +1254,9 @@ var CustomizableUIInternal = {
         placements = gPlacements.get(area);
       }
 
@@ -79,7 +79,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8
       // For toolbars that need it, mark as dirty.
       let defaultPlacements = areaProperties.get("defaultPlacements");
       if (
-@@ -1772,7 +1767,6 @@ var CustomizableUIInternal = {
+@@ -1769,7 +1764,6 @@ var CustomizableUIInternal = {
         lazy.log.info(
           "Widget " + aWidgetId + " not found, unable to remove from " + aArea
         );
@@ -87,7 +87,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8
       }
 
       this.notifyDOMChange(widgetNode, null, container, true, () => {
-@@ -1782,7 +1776,7 @@ var CustomizableUIInternal = {
+@@ -1779,7 +1773,7 @@ var CustomizableUIInternal = {
         // We also need to remove the panel context menu if it's there:
         this.ensureButtonContextMenu(widgetNode);
         if (gPalette.has(aWidgetId) || this.isSpecialWidget(aWidgetId)) {
@@ -96,7 +96,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8
         } else {
           window.gNavToolbox.palette.appendChild(widgetNode);
         }
-@@ -1950,16 +1944,16 @@ var CustomizableUIInternal = {
+@@ -1947,16 +1941,16 @@ var CustomizableUIInternal = {
         elem.setAttribute("skipintoolbarset", "true");
       }
     }
@@ -116,7 +116,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8
     // Handle initial state of vertical tabs.
     if (isVerticalTabs) {
       // Show the vertical tabs toolbar
-@@ -2201,6 +2195,10 @@ var CustomizableUIInternal = {
+@@ -2198,6 +2192,10 @@ var CustomizableUIInternal = {
    *   The identifier string of the area that aNode is being inserted into.
    */
   insertWidgetBefore(aNode, aNextNode, aContainer, aAreaId) {
@@ -127,7 +127,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8
     this.notifyDOMChange(aNode, aNextNode, aContainer, false, () => {
       this.setLocationAttributes(aNode, aAreaId);
       aContainer.insertBefore(aNode, aNextNode);
-@@ -4565,7 +4563,7 @@ var CustomizableUIInternal = {
+@@ -4562,7 +4560,7 @@ var CustomizableUIInternal = {
    * For all registered areas, builds those areas to reflect the current
    * placement state of all widgets.
    */
@@ -136,7 +136,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8
     for (let [areaId, areaNodes] of gBuildAreas) {
       let placements = gPlacements.get(areaId);
       let isFirstChangedToolbar = true;
-@@ -4576,7 +4574,7 @@ var CustomizableUIInternal = {
+@@ -4573,7 +4571,7 @@ var CustomizableUIInternal = {
         if (area.get("type") == CustomizableUI.TYPE_TOOLBAR) {
           let defaultCollapsed = area.get("defaultCollapsed");
           let win = areaNode.ownerGlobal;
@@ -145,7 +145,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8
             win.setToolbarVisibility(
               areaNode,
               typeof defaultCollapsed == "string"
-@@ -5867,6 +5865,7 @@ export var CustomizableUI = {
+@@ -5864,6 +5862,7 @@ export var CustomizableUI = {
   unregisterArea(aName, aDestroyPlacements) {
     CustomizableUIInternal.unregisterArea(aName, aDestroyPlacements);
   },
@@ -153,7 +153,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8
   /**
    * Add a widget to an area.
    * If the area to which you try to add is not known to CustomizableUI,
-@@ -7830,7 +7829,9 @@ class OverflowableToolbar {
+@@ -7827,7 +7826,9 @@ class OverflowableToolbar {
         );
 
         if (webExtList && CustomizableUI.isWebExtensionWidget(child.id)) {
@@ -163,7 +163,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8
           webExtList.insertBefore(child, webExtList.firstElementChild);
         } else {
           child.setAttribute("cui-anchorid", this.#defaultListButton.id);
-@@ -7890,7 +7891,7 @@ class OverflowableToolbar {
+@@ -7887,7 +7888,7 @@ class OverflowableToolbar {
         ) {
           continue;
         }
@@ -172,7 +172,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8
         if (child != aExceptChild) {
           sum += getInlineSize(child);
         }
-@@ -7914,11 +7915,11 @@ class OverflowableToolbar {
+@@ -7911,11 +7912,11 @@ class OverflowableToolbar {
         parseFloat(style.paddingLeft) -
         parseFloat(style.paddingRight) -
         toolbarChildrenWidth;
@@ -186,7 +186,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8
     });
 
     lazy.log.debug(
-@@ -7933,7 +7934,37 @@ class OverflowableToolbar {
+@@ -7930,7 +7931,37 @@ class OverflowableToolbar {
       Math.max(targetWidth, targetChildrenWidth)
     );
     totalAvailWidth = Math.ceil(totalAvailWidth);
@@ -225,7 +225,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8
     return { isOverflowing, targetContentWidth, totalAvailWidth };
   }
 
-@@ -7994,7 +8025,11 @@ class OverflowableToolbar {
+@@ -7991,7 +8022,11 @@ class OverflowableToolbar {
             return;
           }
         }
@@ -238,7 +238,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8
           lazy.log.debug(
             `Need ${minSize} but width is ${totalAvailWidth} so bailing`
           );
-@@ -8027,7 +8062,7 @@ class OverflowableToolbar {
+@@ -8024,7 +8059,7 @@ class OverflowableToolbar {
         }
       }
       if (!inserted) {
@@ -247,7 +247,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8
       }
       child.removeAttribute("cui-anchorid");
       child.removeAttribute("overflowedItem");
-@@ -8153,6 +8188,9 @@ class OverflowableToolbar {
+@@ -8150,6 +8185,9 @@ class OverflowableToolbar {
    *   if no such list exists.
    */
   get #webExtList() {
@@ -257,7 +257,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8
     if (!this.#webExtListRef) {
       let targetID = this.#toolbar.getAttribute("addon-webext-overflowtarget");
       if (!targetID) {
-@@ -8164,6 +8202,9 @@ class OverflowableToolbar {
+@@ -8161,6 +8199,9 @@ class OverflowableToolbar {
       let win = this.#toolbar.ownerGlobal;
       let { panel } = win.gUnifiedExtensions;
       this.#webExtListRef = panel.querySelector(`#${targetID}`);
@@ -267,7 +267,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8
     }
     return this.#webExtListRef;
   }
-@@ -8372,7 +8413,7 @@ class OverflowableToolbar {
+@@ -8369,7 +8410,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 5056ff7fba62f8340c58cbaa30833aad12b4fc70..32dbd206cbc8576ec5a5f958f43670fa90c050b8 100644
+index 5a469ce153dada011144fb4b66747c41e778ff1e..83bedb74df5b4064e8a0580f8b2ee9c0c27f81a8 100644
 --- a/browser/components/customizableui/content/panelUI.js
 +++ b/browser/components/customizableui/content/panelUI.js
-@@ -647,10 +647,12 @@ const PanelUI = {
+@@ -666,10 +666,12 @@ const PanelUI = {
     if (hasKids && !this.navbar.hasAttribute("nonemptyoverflow")) {
       this.navbar.setAttribute("nonemptyoverflow", "true");
       this.overflowPanel.setAttribute("hasfixeditems", "true");
@@ -15,7 +15,7 @@ index 5056ff7fba62f8340c58cbaa30833aad12b4fc70..32dbd206cbc8576ec5a5f958f43670fa
     }
   },
 
-@@ -998,7 +1000,7 @@ const PanelUI = {
+@@ -1017,7 +1019,7 @@ const PanelUI = {
         el.removeAttribute("data-lazy-l10n-id");
       });
 
--- a/src/browser/components/extensions/parent/ext-browser-js.patch
+++ b/src/browser/components/extensions/parent/ext-browser-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/extensions/parent/ext-browser.js b/browser/components/extensions/parent/ext-browser.js
-index 3ce6ae3271bb0b3873118a94363a9552877559f8..9e62181986d039cc171dfe87de1d95c1f5aacd8c 100644
+index d1209bc2c828a19ade8cc027cdea6f42007f0de6..0a2def2f3c32618304cd8a263906b0c6e040dcbc 100644
 --- a/browser/components/extensions/parent/ext-browser.js
 +++ b/browser/components/extensions/parent/ext-browser.js
-@@ -354,6 +354,7 @@ class TabTracker extends TabTrackerBase {
+@@ -352,6 +352,7 @@ class TabTracker extends TabTrackerBase {
   }
 
   getId(nativeTab) {
@@ -10,7 +10,7 @@ index 3ce6ae3271bb0b3873118a94363a9552877559f8..9e62181986d039cc171dfe87de1d95c1
     let id = this._tabs.get(nativeTab);
     if (id) {
       return id;
-@@ -388,6 +389,7 @@ class TabTracker extends TabTrackerBase {
+@@ -386,6 +387,7 @@ class TabTracker extends TabTrackerBase {
     if (nativeTab.ownerGlobal.closed) {
       throw new Error("Cannot attach ID to a tab in a closed window.");
     }
@@ -18,7 +18,7 @@ index 3ce6ae3271bb0b3873118a94363a9552877559f8..9e62181986d039cc171dfe87de1d95c1
 
     this._tabs.set(nativeTab, id);
     if (nativeTab.linkedBrowser) {
-@@ -1278,6 +1280,10 @@ class TabManager extends TabManagerBase {
+@@ -1276,6 +1278,10 @@ class TabManager extends TabManagerBase {
   }
 
   canAccessTab(nativeTab) {
--- a/src/browser/components/extensions/parent/ext-tabs-js.patch
+++ b/src/browser/components/extensions/parent/ext-tabs-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/extensions/parent/ext-tabs.js b/browser/components/extensions/parent/ext-tabs.js
-index ae004ad48e86aae9d13fc6aa5f77f3095763f829..1e3d14a5c6fcbebbc677e0e57ef2b2176a141a3c 100644
+index 636e0f8cd1d489658833cf101152576e9fdb52af..e7578a059504b89a852061be037c323a107fe5ce 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 {
+@@ -514,6 +514,7 @@ this.tabs = class extends ExtensionAPIPersistent {
         }
 
         let tab = tabManager.getWrapper(updatedTab);
@@ -10,7 +10,7 @@ index ae004ad48e86aae9d13fc6aa5f77f3095763f829..1e3d14a5c6fcbebbc677e0e57ef2b217
 
         let changeInfo = {};
         for (let prop of needed) {
-@@ -881,6 +882,7 @@ this.tabs = class extends ExtensionAPIPersistent {
+@@ -883,6 +884,7 @@ this.tabs = class extends ExtensionAPIPersistent {
               });
             }
 
--- a/src/browser/components/places/PlacesUIUtils-sys-mjs.patch
+++ b/src/browser/components/places/PlacesUIUtils-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/places/PlacesUIUtils.sys.mjs b/browser/components/places/PlacesUIUtils.sys.mjs
-index 2db11dad245dccca246cc8429a7498af9f143d5f..980ec44d9e92639b249bc83f59ea3bfae40dd921 100644
+index b21f7721dea2d485ccba1fd6fd7e65e17480e3d3..89048d9ea2b4edf2b0cab77f661c07f4d9453c3f 100644
 --- a/browser/components/places/PlacesUIUtils.sys.mjs
 +++ b/browser/components/places/PlacesUIUtils.sys.mjs
@@ -61,6 +61,7 @@ class BookmarkState {
--- a/src/browser/components/places/content/browserPlacesViews-js.patch
+++ b/src/browser/components/places/content/browserPlacesViews-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/places/content/browserPlacesViews.js b/browser/components/places/content/browserPlacesViews.js
-index 384d599c58cefbf80f5a50489fc401df0c8de8a5..aa85972946c3ff7866fbea86b0372432fb02cd6f 100644
+index 463913926c58e6c622e0fcc60534921f02814829..0143c48c48e132464226db810f4ea4d2720c3c49 100644
 --- a/browser/components/places/content/browserPlacesViews.js
 +++ b/browser/components/places/content/browserPlacesViews.js
@@ -328,12 +328,23 @@ class PlacesViewBase {
@@ -37,7 +37,7 @@ index 384d599c58cefbf80f5a50489fc401df0c8de8a5..aa85972946c3ff7866fbea86b0372432
       } else if (PlacesUtils.containerTypes.includes(type)) {
         element = document.createXULElement("menu");
         element.setAttribute("container", "true");
-@@ -1015,25 +1027,33 @@ class PlacesToolbar extends PlacesViewBase {
+@@ -1058,25 +1070,33 @@ class PlacesToolbar extends PlacesViewBase {
       this._rootElt.firstChild.remove();
     }
 
@@ -82,7 +82,7 @@ index 384d599c58cefbf80f5a50489fc401df0c8de8a5..aa85972946c3ff7866fbea86b0372432
           );
           ++startIndex;
           if (elt.localName != "toolbarseparator") {
-@@ -1041,15 +1061,12 @@ class PlacesToolbar extends PlacesViewBase {
+@@ -1084,15 +1104,12 @@ class PlacesToolbar extends PlacesViewBase {
           }
         }
         if (!elt) {
@@ -101,7 +101,7 @@ index 384d599c58cefbf80f5a50489fc401df0c8de8a5..aa85972946c3ff7866fbea86b0372432
         });
       });
 
-@@ -1059,7 +1076,7 @@ class PlacesToolbar extends PlacesViewBase {
+@@ -1102,7 +1119,7 @@ class PlacesToolbar extends PlacesViewBase {
 
       let fragment = document.createDocumentFragment();
       for (let i = startIndex; i < limit; ++i) {
@@ -110,7 +110,7 @@ index 384d599c58cefbf80f5a50489fc401df0c8de8a5..aa85972946c3ff7866fbea86b0372432
       }
       await new Promise(resolve => window.requestAnimationFrame(resolve));
       if (!this._isAlive) {
-@@ -1122,6 +1139,8 @@ class PlacesToolbar extends PlacesViewBase {
+@@ -1165,6 +1182,8 @@ class PlacesToolbar extends PlacesViewBase {
           "scheme",
           PlacesUIUtils.guessUrlSchemeForUI(aChild.uri)
         );
@@ -119,7 +119,7 @@ index 384d599c58cefbf80f5a50489fc401df0c8de8a5..aa85972946c3ff7866fbea86b0372432
       }
     }
 
-@@ -2314,7 +2333,7 @@ this.PlacesPanelview = class PlacesPanelview extends PlacesViewBase {
+@@ -2359,7 +2378,7 @@ this.PlacesPanelview = class PlacesPanelview extends PlacesViewBase {
         PlacesUIUtils.guessUrlSchemeForUI(placesNode.uri)
       );
       element.setAttribute("label", PlacesUIUtils.getBestTitle(placesNode));
--- a/src/browser/components/preferences/dialogs/syncChooseWhatToSync-xhtml.patch
+++ b/src/browser/components/preferences/dialogs/syncChooseWhatToSync-xhtml.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/preferences/dialogs/syncChooseWhatToSync.xhtml b/browser/components/preferences/dialogs/syncChooseWhatToSync.xhtml
-index ef127a1bc2e3ea4221b641156c38a74edb3b44ae..acd39fe7f6dc7ec03ea50928e2d002791b834dcf 100644
+index a893c5ec3d007820d98f5d92dd039640faa2c181..9cbd00102e44ccf98b37845474d92d57bac0842d 100644
 --- a/browser/components/preferences/dialogs/syncChooseWhatToSync.xhtml
 +++ b/browser/components/preferences/dialogs/syncChooseWhatToSync.xhtml
-@@ -27,6 +27,10 @@
+@@ -26,6 +26,10 @@
         rel="localization"
         href="browser/preferences/preferences.ftl"
       />
@@ -13,7 +13,7 @@ index ef127a1bc2e3ea4221b641156c38a74edb3b44ae..acd39fe7f6dc7ec03ea50928e2d00279
     </linkset>
     <script src="chrome://global/content/preferencesBindings.js" />
     <script src="chrome://browser/content/preferences/dialogs/syncChooseWhatToSync.js" />
-@@ -87,6 +91,12 @@
+@@ -86,6 +90,12 @@
           preference="services.sync.engine.prefs"
         />
       </html:div>
--- 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 b2d65603ec714b49249789d0e48b0b677c9eaea6..6cea34be90e2f181fd3e5770f7e2fd99c483b8d8 100644
+index 78e38f98c1f69df31459fd4b6a119c93f6509c02..33abd46566146272da9f561e11ffa290d7000111 100644
 --- a/browser/components/preferences/jar.mn
 +++ b/browser/components/preferences/jar.mn
-@@ -51,3 +51,5 @@ browser.jar:
+@@ -54,3 +54,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 7d6bbc54d21bf149dd1b99a38ca803654e6908eb..4da0e5fc921bb0ee24ace443c0c119fdd2707fc9 100644
+index 6b96ff01e43087f8c609df17204441616b7013f3..df85ec789c54146b3a702169f33adf36c11b85da 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 8f8da3c4cabb4a05b50431b1feeff8f1f1abcf6e..e57102247eb739ed431bd838a3004b353342defb 100644
+index 6f4cb34d1639ac76a6d4ca40f0d33ae6fb6bf565..1f336a09d6f2e367effdf26e8baf58b5686d252d 100644
 --- a/browser/components/preferences/main.js
 +++ b/browser/components/preferences/main.js
-@@ -2658,6 +2658,11 @@ function createStartupConfig(hidden = false) {
+@@ -2537,6 +2537,11 @@ function createStartupConfig(hidden = false) {
         id: "browserRestoreSession",
         l10nId: "startup-restore-windows-and-tabs",
       },
@@ -14,16 +14,16 @@ index 8f8da3c4cabb4a05b50431b1feeff8f1f1abcf6e..e57102247eb739ed431bd838a3004b35
       {
         id: "windowsLaunchOnLogin",
         l10nId: "windows-launch-on-login",
-@@ -2755,7 +2760,7 @@ SettingGroupManager.registerGroups({
-   },
+@@ -2578,7 +2583,7 @@ function createStartupConfig(hidden = false) {
+ SettingGroupManager.registerGroups({
   defaultBrowser: createDefaultBrowserConfig(),
   startup: createStartupConfig(
 -    Services.prefs.getBoolPref("browser.settings-redesign.enabled", false)
 +    false
   ),
-   importBrowserData: {
-     l10nId: "preferences-data-migration-group",
-@@ -5174,7 +5179,7 @@ function getBundleForLocales(newLocales) {
+   zoom: {
+     l10nId: "preferences-zoom-header2",
+@@ -3393,7 +3398,7 @@ function getBundleForLocales(newLocales) {
     ])
   );
   return new Localization(
--- a/src/browser/components/preferences/preferences-js.patch
+++ b/src/browser/components/preferences/preferences-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js
-index 2d6cba7fac0c7de6d7c4a819f2c7ad20ce10bb33..15434dac6b501cf6f7a6968c6363c59288043c3e 100644
+index 9d13733318e7a147adee1e44f96570c94f4948df..fb625d8da021dc0cebd7a14ca47446a0632e8e7a 100644
 --- a/browser/components/preferences/preferences.js
 +++ b/browser/components/preferences/preferences.js
@@ -121,6 +121,7 @@ ChromeUtils.defineLazyGetter(this, "gSubDialog", function () {
@@ -10,7 +10,7 @@ index 2d6cba7fac0c7de6d7c4a819f2c7ad20ce10bb33..15434dac6b501cf6f7a6968c6363c592
       ],
       resizeCallback: async ({ title, frame }) => {
         // Search within main document and highlight matched keyword.
-@@ -324,6 +325,10 @@ function init_all() {
+@@ -398,6 +399,10 @@ function init_all() {
   register_module("paneSearch", gSearchPane);
   register_module("panePrivacy", gPrivacyPane);
   register_module("paneContainers", gContainersPane);
@@ -19,5 +19,5 @@ index 2d6cba7fac0c7de6d7c4a819f2c7ad20ce10bb33..15434dac6b501cf6f7a6968c6363c592
 +  register_module("paneZenCKS", gZenCKSSettings);
 +  register_module("paneZenMarketplace", gZenMarketplaceManager);
 
-   let redesignEnabled = Services.prefs.getBoolPref(
-     "browser.settings-redesign.enabled"
+   if (ExperimentAPI.labsEnabled) {
+     // Set hidden based on previous load's hidden value or if Nimbus is
--- 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..ed75c48a2cdf47dd957b0598282fb211ca2fb1b5 100644
+index 3c4b3225c672bcb172e7f946bc5f98d424e21e84..d10824470c564b6631333f197de897c21ccc19f5 100644
 --- a/browser/components/preferences/preferences.xhtml
 +++ b/browser/components/preferences/preferences.xhtml
@@ -42,6 +42,8 @@
@@ -11,58 +11,34 @@ index b006d5e5e64c418fbf930c010401e4ea3a3647a3..ed75c48a2cdf47dd957b0598282fb211
   <link rel="localization" href="branding/brand.ftl"/>
   <link rel="localization" href="browser/browser.ftl"/>
     <!-- Used by fontbuilder.js -->
-@@ -124,6 +126,50 @@
-           <label class="category-name" flex="1" data-l10n-id="pane-general-title"></label>
-         </richlistitem>
- 
-+        <richlistitem id="category-zen-looks"
-+                      class="category"
-+                      value="paneZenLooks"
-+                      helpTopic="prefs-main"
-+                      data-l10n-id="category-zen-looks"
-+                      data-l10n-attrs="tooltiptext"
-+                      align="center">
-+          <image class="category-icon"/>
-+          <label class="category-name" flex="1" data-l10n-id="pane-zen-looks-title"></label>
-+        </richlistitem>
-+
-+        <richlistitem id="category-zen-tabs-management"
-+                      class="category"
-+                      value="paneZenTabManagement"
-+                      helpTopic="prefs-main"
-+                      data-l10n-id="category-zen-workspaces"
-+                      data-l10n-attrs="tooltiptext"
-+                      align="center">
-+          <image class="category-icon"/>
-+          <label class="category-name" flex="1" data-l10n-id="pane-zen-tabs-title"></label>
-+        </richlistitem>
-+
-+        <richlistitem id="category-zen-CKS"
-+                      class="category"
-+                      value="paneZenCKS"
-+                      helpTopic="prefs-main"
-+                      data-l10n-id="category-zen-CKS"
-+                      data-l10n-attrs="tooltiptext"
-+                      align="center">
-+          <image class="category-icon"/>
-+          <label class="category-name" flex="1" data-l10n-id="pane-zen-CKS-title"></label>
-+        </richlistitem>
-+
-+        <richlistitem id="category-zen-marketplace"
-+                      class="category"
-+                      value="paneZenMarketplace"
-+                      helpTopic="prefs-main"
-+                      data-l10n-id="category-zen-marketplace"
-+                      data-l10n-attrs="tooltiptext"
-+                      align="center">
-+          <image class="category-icon"/>
-+          <label class="category-name" flex="1" data-l10n-id="pane-zen-marketplace-title"></label>
-+        </richlistitem>
-+
-         <richlistitem id="category-home"
-                       class="category"
-                       value="paneHome"
-@@ -266,6 +312,10 @@
+@@ -126,6 +128,26 @@
+         iconsrc="chrome://browser/skin/preferences/category-general.svg"
+         data-l10n-id="pane-general-title">
+       </html:moz-page-nav-button>
+      <html:moz-page-nav-button id="category-zen-looks"
+        view="paneZenLooks"
+        iconsrc="chrome://browser/skin/customize.svg"
+        data-l10n-id="pane-zen-looks-title">
+      </html:moz-page-nav-button>
+      <html:moz-page-nav-button id="category-zen-tabs-management"
+        view="paneZenTabManagement"
+        iconsrc="chrome://browser/skin/window.svg"
+        data-l10n-id="pane-zen-tabs-title">
+      </html:moz-page-nav-button>
+      <html:moz-page-nav-button id="category-zen-CKS"
+        view="paneZenCKS"
+        iconsrc="chrome://browser/skin/quickactions.svg"
+        data-l10n-id="pane-zen-CKS-title">
+      </html:moz-page-nav-button>
+      <html:moz-page-nav-button id="category-zen-marketplace"
+        view="paneZenMarketplace"
+        iconsrc="chrome://mozapps/skin/extensions/category-themes.svg"
+        data-l10n-id="pane-zen-marketplace-title">
+      </html:moz-page-nav-button>
+       <html:moz-page-nav-button id="category-home"
+         view="paneHome"
+         iconsrc="chrome://browser/skin/home.svg"
+@@ -218,6 +240,10 @@
 #include sync.inc.xhtml
 #include experimental.inc.xhtml
 #include moreFromMozilla.inc.xhtml
--- a/src/browser/components/preferences/sync-inc-xhtml.patch
+++ b/src/browser/components/preferences/sync-inc-xhtml.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/preferences/sync.inc.xhtml b/browser/components/preferences/sync.inc.xhtml
-index b889d42301de3c4f845105bf09d19b052dca9eae..015b751bd46f2499a93e328c903475ce2d60d079 100644
+index c379e1a5f82692406a92d9fcd3bca2769dfac5b2..af037dd3d995813d966524ac44a3795d0c227071 100644
 --- a/browser/components/preferences/sync.inc.xhtml
 +++ b/browser/components/preferences/sync.inc.xhtml
-@@ -223,6 +223,10 @@
+@@ -224,6 +224,10 @@
                     <image class="sync-engine-image sync-engine-prefs" alt=""/>
                     <label data-l10n-id="sync-currently-syncing-settings"/>
                   </html:div>
--- 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 71921cec2b6aa0f103856c31254fd6c4affefccb..ed13d7e2aa5ff1199872fedbc26494aae463ace4 100644
+index 95f4960c3d8a2a4ca9bce24bcc54971877ee55ca..5bef8eeeb7cc26c930e3884e6eede6ea30f7d70a 100644
 --- a/browser/components/sessionstore/SessionStore.sys.mjs
 +++ b/browser/components/sessionstore/SessionStore.sys.mjs
@@ -129,6 +129,9 @@ const TAB_EVENTS = [
@@ -358,7 +358,7 @@ index 71921cec2b6aa0f103856c31254fd6c4affefccb..ed13d7e2aa5ff1199872fedbc26494aa
           Glean.sessionRestore.shutdownFlushAllOutcomes.timed_out.add(1);
           deferred.resolve();
         }
-@@ -8552,6 +8614,7 @@ var SessionStoreInternal = {
+@@ -8554,6 +8616,7 @@ var SessionStoreInternal = {
     if (
       !savedTabGroupState.tabs.length ||
       this.getSavedTabGroup(savedTabGroupState.id)
--- a/src/browser/components/sidebar/browser-sidebar-js.patch
+++ b/src/browser/components/sidebar/browser-sidebar-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/sidebar/browser-sidebar.js b/browser/components/sidebar/browser-sidebar.js
-index ae85009ad8f0a1cc6d3f3a890b27178df99e5ece..a432f7ee5d3f92bf623ff6d00d5b68ab7a6ecbe7 100644
+index 2c13f19ec4f962ce3ecaface0ae5d00c50ca913f..eb696819a1af4cfae6352fc5696fd95590bed342 100644
 --- a/browser/components/sidebar/browser-sidebar.js
 +++ b/browser/components/sidebar/browser-sidebar.js
-@@ -807,7 +807,7 @@ var SidebarController = {
+@@ -834,7 +834,7 @@ var SidebarController = {
   setPosition() {
     // First reset all ordinals to match DOM ordering.
     let contentArea = document.getElementById("tabbrowser-tabbox");
--- a/src/browser/components/tabbrowser/AsyncTabSwitcher-sys-mjs.patch
+++ b/src/browser/components/tabbrowser/AsyncTabSwitcher-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs b/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs
-index 9c5e92fbd555d328ce09c0cf0ff8078584f68478..2af7a428bc830d8c12b3d3c0af375c97e6942994 100644
+index eebff0f59df42d3ef075f3eea1bd9269c47ba80d..6ab43a810f4cb61eedc02bb42026f6b5e282e785 100644
 --- a/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs
 +++ b/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs
-@@ -939,6 +939,7 @@ export class AsyncTabSwitcher {
+@@ -938,6 +938,7 @@ export class AsyncTabSwitcher {
       this.tabbrowser._printPreviewBrowsers.has(browser) ||
       this.tabbrowser.splitViewBrowsers.includes(browser) ||
       lazy.PictureInPicture.isOriginatingBrowser(browser)
--- a/src/browser/components/tabbrowser/TabUnloader-sys-mjs.patch
+++ b/src/browser/components/tabbrowser/TabUnloader-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/tabbrowser/TabUnloader.sys.mjs b/browser/components/tabbrowser/TabUnloader.sys.mjs
-index aefccef39f0b81176a5710a794e8a5e2650d6507..53c838b3bc322cadee4ef9b411d02fc0af8c35e5 100644
+index a6d6c5405f98c839b7c0f2007e053e874bb7ce07..9d8c6066ce917e15fbf9e19284a3db50aa5a3815 100644
 --- a/browser/components/tabbrowser/TabUnloader.sys.mjs
 +++ b/browser/components/tabbrowser/TabUnloader.sys.mjs
-@@ -52,7 +52,7 @@ let CRITERIA_WEIGHT = 1;
+@@ -51,7 +51,7 @@ let CRITERIA_WEIGHT = 1;
  */
 let DefaultTabUnloaderMethods = {
   isNonDiscardable(tab, weight) {
@@ -11,7 +11,7 @@ index aefccef39f0b81176a5710a794e8a5e2650d6507..53c838b3bc322cadee4ef9b411d02fc0
       return weight;
     }
 
-@@ -106,7 +106,7 @@ let DefaultTabUnloaderMethods = {
+@@ -105,7 +105,7 @@ let DefaultTabUnloaderMethods = {
 
   *iterateTabs() {
     for (let win of Services.wm.getEnumerator("navigator:browser")) {
--- a/src/browser/components/tabbrowser/content/browser-ctrlTab-js.patch
+++ b/src/browser/components/tabbrowser/content/browser-ctrlTab-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/browser-ctrlTab.js b/browser/components/tabbrowser/content/browser-ctrlTab.js
-index b435917892ac77fb433ea709f2524db2f2347a1d..fcbfeb92f3ae4effbfd3333514ed4d412e3063c6 100644
+index 727e21f1754b0842080d8f3e29060baad445df66..ee9df3a311fc72954e064a2cbc56b716d116314a 100644
 --- a/browser/components/tabbrowser/content/browser-ctrlTab.js
 +++ b/browser/components/tabbrowser/content/browser-ctrlTab.js
@@ -252,7 +252,8 @@ var ctrlTab = {
@@ -30,7 +30,7 @@ index b435917892ac77fb433ea709f2524db2f2347a1d..fcbfeb92f3ae4effbfd3333514ed4d41
       return;
     }
 
-@@ -751,7 +752,7 @@ var ctrlTab = {
+@@ -759,7 +760,7 @@ var ctrlTab = {
   _initRecentlyUsedTabs() {
     this._recentlyUsedTabs = Array.prototype.filter.call(
       gBrowser.tabs,
--- 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 b93a8fcc8b76ed888524959cbe7d6865fe830f2f..9f39316e33daa8a272e48c84d9e07ad9df197586 100644
+index ea4f83fad1757f073ea1bbe5c93a4ebe5ecc0abe..904e604e28c96757fabf0dd3a749c85280e74993 100644
 --- a/browser/components/tabbrowser/content/drag-and-drop.js
 +++ b/browser/components/tabbrowser/content/drag-and-drop.js
@@ -35,6 +35,9 @@
@@ -73,7 +73,7 @@ index b93a8fcc8b76ed888524959cbe7d6865fe830f2f..9f39316e33daa8a272e48c84d9e07ad9
 
         if (this._tabbrowserTabs.isContainerVerticalPinnedGrid(draggedTab)) {
           // Update both translate axis for pinned vertical expanded tabs
-@@ -390,11 +401,13 @@
+@@ -392,11 +403,13 @@
           this._dragToPinPromoCard,
         ];
         let shouldPin =
@@ -87,7 +87,7 @@ index b93a8fcc8b76ed888524959cbe7d6865fe830f2f..9f39316e33daa8a272e48c84d9e07ad9
           isTab(draggedTab) &&
           draggedTab.pinned &&
           this._tabbrowserTabs.arrowScrollbox.contains(event.target);
-@@ -458,6 +471,7 @@
+@@ -466,6 +479,7 @@
           }
         }
 
@@ -95,7 +95,7 @@ index b93a8fcc8b76ed888524959cbe7d6865fe830f2f..9f39316e33daa8a272e48c84d9e07ad9
         if (shouldTranslate) {
           let translationPromises = [];
           for (let item of movingTabs) {
-@@ -469,7 +483,7 @@
+@@ -477,7 +491,7 @@
                 item.removeAttribute("tabdrop-samewindow");
                 resolve();
               };
@@ -104,7 +104,7 @@ index b93a8fcc8b76ed888524959cbe7d6865fe830f2f..9f39316e33daa8a272e48c84d9e07ad9
                 postTransitionCleanup();
               } else {
                 let onTransitionEnd = transitionendEvent => {
-@@ -544,7 +558,7 @@
+@@ -552,7 +566,7 @@
           if (tab.selected) {
             selectedTab = tab;
             indexForSelectedTab = newIndex;
@@ -113,7 +113,7 @@ index b93a8fcc8b76ed888524959cbe7d6865fe830f2f..9f39316e33daa8a272e48c84d9e07ad9
             const droppedIntoPinnedArea = dropIndex < gBrowser.pinnedTabCount;
             const newSplitView = gBrowser.adoptSplitView(tab, {
               elementIndex: droppedIntoPinnedArea
-@@ -569,7 +583,7 @@
+@@ -577,7 +591,7 @@
             }
           }
         }
@@ -122,7 +122,7 @@ index b93a8fcc8b76ed888524959cbe7d6865fe830f2f..9f39316e33daa8a272e48c84d9e07ad9
           const newTab = gBrowser.adoptTab(selectedTab, {
             elementIndex: indexForSelectedTab,
             selectTab: selectedTab == draggedTab,
-@@ -603,10 +617,6 @@
+@@ -611,10 +625,6 @@
               this._tabbrowserTabs.dragAndDropElements[
                 gBrowser.pinnedTabCount + unpinnedSplitViews.length - 1
               ];
@@ -133,7 +133,7 @@ index b93a8fcc8b76ed888524959cbe7d6865fe830f2f..9f39316e33daa8a272e48c84d9e07ad9
           }
         }
       } else {
-@@ -655,6 +665,7 @@
+@@ -664,6 +674,7 @@
 
           let nextItem = this._tabbrowserTabs.dragAndDropElements[newIndex];
           let tabGroup = isTab(nextItem) && nextItem.group;
@@ -141,7 +141,7 @@ index b93a8fcc8b76ed888524959cbe7d6865fe830f2f..9f39316e33daa8a272e48c84d9e07ad9
           gBrowser.loadTabs(urls, {
             inBackground,
             replace,
-@@ -696,7 +707,16 @@
+@@ -705,7 +716,16 @@
         this._expandGroupOnDrop(draggedTab);
       }
       this._resetTabsAfterDrop(draggedTab.ownerDocument);
@@ -159,7 +159,7 @@ index b93a8fcc8b76ed888524959cbe7d6865fe830f2f..9f39316e33daa8a272e48c84d9e07ad9
       if (
         dt.mozUserCancelled ||
         dt.dropEffect != "none" ||
-@@ -909,11 +929,10 @@
+@@ -918,11 +938,10 @@
         return this.#getHorizontalScrollboxDragTarget(event, ignoreSides);
       }
       while (target) {
@@ -175,7 +175,7 @@ index b93a8fcc8b76ed888524959cbe7d6865fe830f2f..9f39316e33daa8a272e48c84d9e07ad9
           break;
         }
         target = target.parentNode;
-@@ -943,6 +962,9 @@
+@@ -952,6 +971,9 @@
           return null;
         }
       }
@@ -185,7 +185,7 @@ index b93a8fcc8b76ed888524959cbe7d6865fe830f2f..9f39316e33daa8a272e48c84d9e07ad9
       return target;
     }
 
-@@ -1002,7 +1024,8 @@
+@@ -1011,7 +1033,8 @@
         isTabGroupLabel(draggedTab) &&
         draggedTab._dragData?.expandGroupOnDrop
       ) {
@@ -195,7 +195,7 @@ index b93a8fcc8b76ed888524959cbe7d6865fe830f2f..9f39316e33daa8a272e48c84d9e07ad9
       }
     }
 
-@@ -1186,7 +1209,6 @@
+@@ -1195,7 +1218,6 @@
         // using updateDragImage. On Linux, we can use a panel.
         if (platform == "win" || platform == "macosx") {
           captureListener = function () {
@@ -203,7 +203,7 @@ index b93a8fcc8b76ed888524959cbe7d6865fe830f2f..9f39316e33daa8a272e48c84d9e07ad9
           };
         } else {
           // Create a panel to use it in setDragImage
-@@ -1224,7 +1246,6 @@
+@@ -1233,7 +1255,6 @@
         );
         dragImageOffset = dragImageOffset * scale;
       }
@@ -211,7 +211,7 @@ index b93a8fcc8b76ed888524959cbe7d6865fe830f2f..9f39316e33daa8a272e48c84d9e07ad9
 
       // _dragData.offsetX/Y give the coordinates that the mouse should be
       // positioned relative to the corner of the new window created upon
-@@ -1243,7 +1264,7 @@
+@@ -1252,7 +1273,7 @@
       let dropEffect = this.getDropEffectForTabDrag(event);
       let isMovingInTabStrip = !fromTabList && dropEffect == "move";
       let collapseTabGroupDuringDrag =
@@ -220,7 +220,7 @@ index b93a8fcc8b76ed888524959cbe7d6865fe830f2f..9f39316e33daa8a272e48c84d9e07ad9
 
       tab._dragData = {
         offsetX: this._tabbrowserTabs.verticalMode
-@@ -1253,7 +1274,7 @@
+@@ -1262,7 +1283,7 @@
           ? event.screenY - window.screenY - tabOffset
           : event.screenY - window.screenY,
         scrollPos:
@@ -229,7 +229,7 @@ index b93a8fcc8b76ed888524959cbe7d6865fe830f2f..9f39316e33daa8a272e48c84d9e07ad9
             ? this._tabbrowserTabs.pinnedTabsContainer.scrollPosition
             : this._tabbrowserTabs.arrowScrollbox.scrollPosition,
         screenX: event.screenX,
-@@ -1300,6 +1321,7 @@
+@@ -1309,6 +1330,7 @@
       if (tabStripItemElement.hasAttribute("dragtarget")) {
         return;
       }
@@ -237,7 +237,7 @@ index b93a8fcc8b76ed888524959cbe7d6865fe830f2f..9f39316e33daa8a272e48c84d9e07ad9
       let isPinned = tab.pinned;
       let dragAndDropElements = this._tabbrowserTabs.dragAndDropElements;
       let isGrid = this._tabbrowserTabs.isContainerVerticalPinnedGrid(tab);
-@@ -1666,23 +1688,6 @@
+@@ -1675,23 +1697,6 @@
 
       // Slide the relevant tabs to their new position.
       // non-moving tabs adjust for RTL
@@ -261,7 +261,7 @@ index b93a8fcc8b76ed888524959cbe7d6865fe830f2f..9f39316e33daa8a272e48c84d9e07ad9
       // moving tabs don't adjust for RTL
       for (let item of selectedElements) {
         if (
-@@ -1731,7 +1736,6 @@
+@@ -1740,7 +1745,6 @@
       for (let item of this._tabbrowserTabs.dragAndDropElements) {
         delete item._moveTogetherSelectedTabsData;
         item = elementToMove(item);
@@ -269,7 +269,7 @@ index b93a8fcc8b76ed888524959cbe7d6865fe830f2f..9f39316e33daa8a272e48c84d9e07ad9
         item.removeAttribute("multiselected-move-together");
       }
     }
-@@ -2578,7 +2582,6 @@
+@@ -2587,7 +2591,6 @@
         tab.style.top = "";
         tab.style.maxWidth = "";
         tab.style.pointerEvents = "";
@@ -277,7 +277,7 @@ index b93a8fcc8b76ed888524959cbe7d6865fe830f2f..9f39316e33daa8a272e48c84d9e07ad9
         tab.removeAttribute("small-stack");
         tab.removeAttribute("big-stack");
       }
-@@ -2587,11 +2590,9 @@
+@@ -2596,11 +2599,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 2e02bad1a7c89b4c3b5aee1e14c13bb953a64eb6..fb9ec4deb5871bc0ba57c323a413f07440e9aa42 100644
+index b9381999a77ecacdb95c69494ac8972e9f13d14d..a210b53bb46373f8bab532a00b25301d645641cd 100644
 --- a/browser/components/tabbrowser/content/tab.js
 +++ b/browser/components/tabbrowser/content/tab.js
@@ -21,6 +21,7 @@
@@ -140,7 +140,16 @@ index 2e02bad1a7c89b4c3b5aee1e14c13bb953a64eb6..fb9ec4deb5871bc0ba57c323a413f074
         event.target.classList.contains("tab-icon-overlay") ||
         event.target.classList.contains("tab-audio-button")
       ) {
-@@ -594,6 +629,10 @@
+@@ -572,7 +607,7 @@
+           }
+         } else if (
+           event.altKey &&
+-          Services.prefs.getBoolPref("browser.tabs.splitView.enabled", false)
+          true
+         ) {
+           eventMaySelectTab = false;
+         } else if (!this.selected && this.multiselected) {
+@@ -597,6 +632,10 @@
       this.style.MozUserFocus = "";
     }
 
@@ -151,7 +160,7 @@ index 2e02bad1a7c89b4c3b5aee1e14c13bb953a64eb6..fb9ec4deb5871bc0ba57c323a413f074
     on_click(event) {
       if (event.button != 0) {
         return;
-@@ -617,14 +656,31 @@
+@@ -620,14 +659,31 @@
             trigger: "alt_click",
           });
         }
@@ -184,7 +193,7 @@ index 2e02bad1a7c89b4c3b5aee1e14c13bb953a64eb6..fb9ec4deb5871bc0ba57c323a413f074
         gBrowser.multiSelectedTabsCount > 0 &&
         !event.target.classList.contains("tab-close-button") &&
         !event.target.classList.contains("tab-icon-overlay") &&
-@@ -636,8 +692,9 @@
+@@ -639,8 +695,9 @@
       }
 
       if (
@@ -196,7 +205,7 @@ index 2e02bad1a7c89b4c3b5aee1e14c13bb953a64eb6..fb9ec4deb5871bc0ba57c323a413f074
       ) {
         if (this.activeMediaBlocked) {
           if (this.multiselected) {
-@@ -655,7 +712,7 @@
+@@ -658,7 +715,7 @@
         return;
       }
 
@@ -205,7 +214,7 @@ index 2e02bad1a7c89b4c3b5aee1e14c13bb953a64eb6..fb9ec4deb5871bc0ba57c323a413f074
         if (this.multiselected) {
           gBrowser.removeMultiSelectedTabs(
             lazy.TabMetrics.userTriggeredContext(
-@@ -675,6 +732,14 @@
+@@ -678,6 +735,14 @@
         // (see tabbrowser-tabs 'click' handler).
         gBrowser.tabContainer._blockDblClick = true;
       }
@@ -220,7 +229,7 @@ index 2e02bad1a7c89b4c3b5aee1e14c13bb953a64eb6..fb9ec4deb5871bc0ba57c323a413f074
     }
 
     on_dblclick(event) {
-@@ -698,6 +763,8 @@
+@@ -701,6 +766,8 @@
           animate: true,
           triggeringEvent: event,
         });
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d8412310b7b7 100644
+index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88f4eec282 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
-@@ -413,6 +413,7 @@
+@@ -502,6 +502,7 @@
      * @type {MozBrowser[]}
      */
     get splitViewBrowsers() {
@@ -10,7 +10,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
       const browsers = [];
       if (this.#activeSplitView) {
         for (const tab of this.#activeSplitView.tabs) {
-@@ -486,15 +487,66 @@
+@@ -575,15 +576,66 @@
       return this.tabContainer.visibleTabs;
     }
 
@@ -79,7 +79,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
     set selectedTab(val) {
       if (
         gSharedTabWarning.willShowSharedTabWarning(val) ||
-@@ -570,6 +622,10 @@
+@@ -659,6 +711,10 @@
         userContextId = parseInt(tabArgument.getAttribute("usercontextid"), 10);
       }
 
@@ -90,7 +90,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
       if (tabArgument && tabArgument.linkedBrowser) {
         remoteType = tabArgument.linkedBrowser.remoteType;
         initialBrowsingContextGroupId =
-@@ -662,6 +718,8 @@
+@@ -751,6 +807,8 @@
       this.tabpanels.appendChild(panel);
 
       let tab = this.tabs[0];
@@ -99,7 +99,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
       tab.linkedPanel = uniqueId;
       this._selectedTab = tab;
       this._selectedBrowser = browser;
-@@ -1032,13 +1090,18 @@
+@@ -1121,13 +1179,18 @@
       }
 
       this.showTab(aTab);
@@ -119,7 +119,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
 
       aTab.setAttribute("pinned", "true");
       this._updateTabBarForPinnedTabs();
-@@ -1051,11 +1114,19 @@
+@@ -1140,11 +1203,19 @@
       }
 
       this.#handleTabMove(aTab, () => {
@@ -140,7 +140,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
       });
 
       aTab.style.marginInlineStart = "";
-@@ -1232,6 +1303,9 @@
+@@ -1321,6 +1392,9 @@
 
       let LOCAL_PROTOCOLS = ["chrome:", "about:", "resource:", "data:"];
 
@@ -150,7 +150,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
       if (
         aIconURL &&
         !LOCAL_PROTOCOLS.some(protocol => aIconURL.startsWith(protocol))
-@@ -1241,6 +1315,9 @@
+@@ -1330,6 +1404,9 @@
         );
         return;
       }
@@ -160,7 +160,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
 
       let browser = this.getBrowserForTab(aTab);
       browser.mIconURL = aIconURL;
-@@ -1563,7 +1640,6 @@
+@@ -1652,7 +1729,6 @@
 
       // Preview mode should not reset the owner
       if (!this._previewMode && !oldTab.selected) {
@@ -168,7 +168,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
       }
 
       let lastRelatedTab = this._lastRelatedTabMap.get(oldTab);
-@@ -1654,6 +1730,7 @@
+@@ -1743,6 +1819,7 @@
       if (!this._previewMode) {
         newTab.recordTimeFromUnloadToReload();
         newTab.updateLastAccessed();
@@ -176,7 +176,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
         oldTab.updateLastAccessed();
         // if this is the foreground window, update the last-seen timestamps.
         if (this.ownerGlobal == BrowserWindowTracker.getTopWindow()) {
-@@ -1868,6 +1945,9 @@
+@@ -1957,6 +2034,9 @@
       }
 
       let activeEl = document.activeElement;
@@ -186,7 +186,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
       // If focus is on the old tab, move it to the new tab.
       if (activeEl == oldTab) {
         newTab.focus();
-@@ -1906,7 +1986,7 @@
+@@ -1995,7 +2075,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 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
         let selectURL = () => {
           if (this._asyncTabSwitching) {
             // Set _awaitingSetURI flag to suppress popup notification
-@@ -2194,7 +2274,12 @@
+@@ -2283,7 +2363,12 @@
       return this._setTabLabel(aTab, aLabel);
     }
 
@@ -206,10 +206,10 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
 +      }
 +      aLabel = (typeof aTab.zenStaticLabel === "string" && aTab.zenStaticLabel) ? aTab.zenStaticLabel : aLabel;
 +      gZenPinnedTabManager.onTabLabelChanged(aTab);
-       if (!aLabel || aLabel.includes("about:reader?")) {
+       if (!aLabel || (isURL && /^about:reader\?url=/.test(aLabel))) {
         return false;
       }
-@@ -2319,7 +2404,7 @@
+@@ -2408,7 +2493,7 @@
         newIndex = this.selectedTab._tPos + 1;
       }
 
@@ -218,7 +218,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
         if (this.isTabGroupLabel(targetTab)) {
           throw new Error(
             "Replacing a tab group label with a tab is not supported"
-@@ -2599,6 +2684,7 @@
+@@ -2685,6 +2770,7 @@
       uriIsAboutBlank,
       userContextId,
       skipLoad,
@@ -226,7 +226,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
     } = {}) {
       let b = document.createXULElement("browser");
       // Use the JSM global to create the permanentKey, so that if the
-@@ -2672,8 +2758,7 @@
+@@ -2758,8 +2844,7 @@
         // we use a different attribute name for this?
         b.setAttribute("name", name);
       }
@@ -236,7 +236,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
         b.setAttribute("transparent", "true");
       }
 
-@@ -2843,7 +2928,7 @@
+@@ -2929,7 +3014,7 @@
 
       let panel = this.getPanel(browser);
       let uniqueId = this._generateUniquePanelID();
@@ -245,7 +245,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
       aTab.linkedPanel = uniqueId;
 
       // Inject the <browser> into the DOM if necessary.
-@@ -2903,8 +2988,8 @@
+@@ -2989,8 +3074,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 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
       } else {
         aTab.linkedBrowser.browsingContext.hasSiblings = this.tabs.length > 1;
       }
-@@ -3089,7 +3174,6 @@
+@@ -3175,7 +3260,6 @@
             this.selectedTab = this.addTrustedTab(BROWSER_NEW_TAB_URL, {
               tabIndex: tab._tPos + 1,
               userContextId: tab.userContextId,
@@ -264,7 +264,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
               focusUrlBar: true,
             });
             resolve(this.selectedBrowser);
-@@ -3199,6 +3283,9 @@
+@@ -3285,6 +3369,9 @@
         schemelessInput,
         hasValidUserGestureActivation = false,
         textDirectiveUserActivation = false,
@@ -274,7 +274,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
       } = {}
     ) {
       // all callers of addTab that pass a params object need to pass
-@@ -3209,10 +3296,17 @@
+@@ -3295,10 +3382,17 @@
         );
       }
 
@@ -292,7 +292,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
       // If we're opening a foreground tab, set the owner by default.
       ownerTab ??= inBackground ? null : this.selectedTab;
 
-@@ -3220,6 +3314,7 @@
+@@ -3306,6 +3400,7 @@
       if (this.selectedTab.owner) {
         this.selectedTab.owner = null;
       }
@@ -300,7 +300,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
 
       // Find the tab that opened this one, if any. This is used for
       // determining positioning, and inherited attributes such as the
-@@ -3272,6 +3367,22 @@
+@@ -3358,6 +3453,22 @@
           noInitialLabel,
           skipBackgroundNotify,
         });
@@ -323,7 +323,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
         if (insertTab) {
           // Insert the tab into the tab container in the correct position.
           this.#insertTabAtIndex(t, {
-@@ -3280,6 +3391,7 @@
+@@ -3366,6 +3477,7 @@
             ownerTab,
             openerTab,
             pinned,
@@ -331,7 +331,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
             bulkOrderedOpen,
             tabGroup: tabGroup ?? openerTab?.group,
           });
-@@ -3298,6 +3410,7 @@
+@@ -3384,6 +3496,7 @@
           openWindowInfo,
           skipLoad,
           triggeringRemoteType,
@@ -339,7 +339,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
         }));
 
         if (focusUrlBar) {
-@@ -3422,6 +3535,12 @@
+@@ -3508,6 +3621,12 @@
         }
       }
 
@@ -352,7 +352,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
       // Additionally send pinned tab events
       if (pinned) {
         this.#notifyPinnedStatus(t);
-@@ -3729,6 +3848,7 @@
+@@ -3750,6 +3869,7 @@
         isAdoptingGroup = false,
         isUserTriggered = false,
         telemetryUserCreateSource = "unknown",
@@ -360,7 +360,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
       } = {}
     ) {
       if (
-@@ -3739,9 +3859,6 @@
+@@ -3760,9 +3880,6 @@
             !this.isSplitViewWrapper(tabOrSplitView)
         )
       ) {
@@ -370,7 +370,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
       }
 
       if (!color) {
-@@ -3762,9 +3879,14 @@
+@@ -3783,9 +3900,14 @@
         label,
         isAdoptingGroup
       );
@@ -387,7 +387,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
       );
       group.addTabs(tabsAndSplitViews);
 
-@@ -3885,7 +4007,7 @@
+@@ -3906,7 +4028,7 @@
       }
 
       this.#handleTabMove(tab, () =>
@@ -396,7 +396,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
       );
     }
 
-@@ -3969,6 +4091,7 @@
+@@ -3990,6 +4112,7 @@
         color: group.color,
         insertBefore: newTabs[0],
         isAdoptingGroup: true,
@@ -404,7 +404,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
       });
     }
 
-@@ -4179,6 +4302,7 @@
+@@ -4200,6 +4323,7 @@
         openWindowInfo,
         skipLoad,
         triggeringRemoteType,
@@ -412,7 +412,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
       }
     ) {
       // If we don't have a preferred remote type (or it is `NOT_REMOTE`), and
-@@ -4248,6 +4372,7 @@
+@@ -4269,6 +4393,7 @@
           openWindowInfo,
           name,
           skipLoad,
@@ -420,7 +420,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
         });
       }
 
-@@ -4461,9 +4586,9 @@
+@@ -4482,9 +4607,9 @@
         }
 
         // Add a new tab if needed.
@@ -432,7 +432,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
 
           let url = "about:blank";
           if (tabData.entries?.length) {
-@@ -4500,8 +4625,10 @@
+@@ -4521,8 +4646,10 @@
             insertTab: false,
             skipLoad: true,
             preferredRemoteType,
@@ -444,7 +444,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
           if (select) {
             tabToSelect = tab;
           }
-@@ -4523,7 +4650,8 @@
+@@ -4544,7 +4671,8 @@
           this.pinTab(tab);
           // Then ensure all the tab open/pinning information is sent.
           this._fireTabOpen(tab, {});
@@ -454,7 +454,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
           let { groupId } = tabData;
           const tabGroup = tabGroupWorkingData.get(groupId);
           // if a tab refers to a tab group we don't know, skip any group
-@@ -4543,7 +4671,10 @@
+@@ -4564,7 +4692,10 @@
                 tabGroup.stateData.id,
                 tabGroup.stateData.color,
                 tabGroup.stateData.collapsed,
@@ -466,7 +466,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
               );
               tabsFragment.appendChild(tabGroup.node);
             }
-@@ -4598,9 +4729,21 @@
+@@ -4619,9 +4750,21 @@
       // to remove the old selected tab.
       if (tabToSelect) {
         let leftoverTab = this.selectedTab;
@@ -488,7 +488,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
 
       if (tabs.length > 1 || !tabs[0].selected) {
         this._updateTabsAfterInsert();
-@@ -4791,11 +4934,14 @@
+@@ -4812,11 +4955,14 @@
       if (ownerTab) {
         tab.owner = ownerTab;
       }
@@ -504,7 +504,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
         if (
           !bulkOrderedOpen &&
           ((openerTab &&
-@@ -4807,7 +4953,7 @@
+@@ -4828,7 +4974,7 @@
           let lastRelatedTab =
             openerTab && this._lastRelatedTabMap.get(openerTab);
           let previousTab = lastRelatedTab || openerTab || this.selectedTab;
@@ -513,7 +513,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
             tabGroup = previousTab.group;
           }
           if (
-@@ -4823,7 +4969,7 @@
+@@ -4844,7 +4990,7 @@
                 previousTab.splitview
               ) + 1;
           } else if (previousTab.visible) {
@@ -522,7 +522,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
           } else if (previousTab == FirefoxViewHandler.tab) {
             elementIndex = 0;
           }
-@@ -4851,14 +4997,14 @@
+@@ -4872,14 +5018,14 @@
       }
       // Ensure index is within bounds.
       if (tab.pinned) {
@@ -541,7 +541,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
 
       if (pinned && !itemAfter?.pinned) {
         itemAfter = null;
-@@ -4875,7 +5021,7 @@
+@@ -4896,7 +5042,7 @@
 
       this.tabContainer._invalidateCachedTabs();
 
@@ -550,7 +550,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
         if (
           (this.isTab(itemAfter) && itemAfter.group == tabGroup) ||
           this.isSplitViewWrapper(itemAfter)
-@@ -4906,7 +5052,11 @@
+@@ -4927,7 +5073,11 @@
         const tabContainer = pinned
           ? this.tabContainer.pinnedTabsContainer
           : this.tabContainer;
@@ -562,7 +562,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
       }
 
       if (tab.group?.collapsed) {
-@@ -4921,6 +5071,7 @@
+@@ -4942,6 +5092,7 @@
       if (pinned) {
         this._updateTabBarForPinnedTabs();
       }
@@ -570,7 +570,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
 
       TabBarVisibility.update();
     }
-@@ -5469,6 +5620,7 @@
+@@ -5490,6 +5641,7 @@
         telemetrySource,
       } = {}
     ) {
@@ -578,7 +578,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
       // When 'closeWindowWithLastTab' pref is enabled, closing all tabs
       // can be considered equivalent to closing the window.
       if (
-@@ -5558,6 +5710,7 @@
+@@ -5579,6 +5731,7 @@
         if (lastToClose) {
           this.removeTab(lastToClose, aParams);
         }
@@ -586,7 +586,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
       } catch (e) {
         console.error(e);
       }
-@@ -5603,6 +5756,14 @@
+@@ -5624,6 +5777,14 @@
         return;
       }
 
@@ -601,7 +601,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
       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
-@@ -5610,6 +5771,9 @@
+@@ -5631,6 +5792,9 @@
       // state).
       let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
       let isLastTab = this.#isLastTabInWindow(aTab);
@@ -611,7 +611,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
       if (
         !this._beginRemoveTab(aTab, {
           closeWindowFastpath: true,
-@@ -5621,13 +5785,14 @@
+@@ -5642,13 +5806,14 @@
           telemetrySource,
         })
       ) {
@@ -627,7 +627,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
       let lockTabSizing =
         !this.tabContainer.verticalMode &&
         !aTab.pinned &&
-@@ -5658,7 +5823,13 @@
+@@ -5679,7 +5844,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 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
         return;
       }
 
-@@ -5792,7 +5963,7 @@
+@@ -5813,7 +5984,7 @@
           closeWindowWithLastTab != null
             ? closeWindowWithLastTab
             : !window.toolbar.visible ||
@@ -651,7 +651,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
 
         if (closeWindow) {
           // We've already called beforeunload on all the relevant tabs if we get here,
-@@ -5816,6 +5987,7 @@
+@@ -5837,6 +6008,7 @@
 
         newTab = true;
       }
@@ -659,7 +659,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
       aTab._endRemoveArgs = [closeWindow, newTab];
 
       // swapBrowsersAndCloseOther will take care of closing the window without animation.
-@@ -5856,13 +6028,7 @@
+@@ -5877,13 +6049,7 @@
       aTab._mouseleave();
 
       if (newTab) {
@@ -674,7 +674,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
       } else {
         TabBarVisibility.update();
       }
-@@ -5995,6 +6161,7 @@
+@@ -6016,6 +6182,7 @@
         this.tabs[i]._tPos = i;
       }
 
@@ -682,7 +682,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
       if (!this._windowIsClosing) {
         // update tab close buttons state
         this.tabContainer._updateCloseButtons();
-@@ -6180,6 +6347,7 @@
+@@ -6201,6 +6368,7 @@
         memory_after: await getTotalMemoryUsage(),
         time_to_unload_in_ms: timeElapsed,
       });
@@ -690,7 +690,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
     }
 
     /**
-@@ -6225,6 +6393,7 @@
+@@ -6246,6 +6414,7 @@
       }
 
       let excludeTabs = new Set(aExcludeTabs);
@@ -698,7 +698,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
 
       // If this tab has a successor, it should be selectable, since
       // hiding or closing a tab removes that tab as a successor.
-@@ -6237,15 +6406,22 @@
+@@ -6258,15 +6427,22 @@
         !excludeTabs.has(aTab.owner) &&
         Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose")
       ) {
@@ -723,7 +723,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
       let tab = this.tabContainer.findNextTab(aTab, {
         direction: 1,
         filter: _tab => remainingTabs.includes(_tab),
-@@ -6259,7 +6435,7 @@
+@@ -6280,7 +6456,7 @@
       }
 
       if (tab) {
@@ -732,7 +732,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
       }
 
       // If no qualifying visible tab was found, see if there is a tab in
-@@ -6280,7 +6456,7 @@
+@@ -6301,7 +6477,7 @@
         });
       }
 
@@ -741,7 +741,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
     }
 
     _blurTab(aTab) {
-@@ -6291,7 +6467,7 @@
+@@ -6312,7 +6488,7 @@
      * @returns {boolean}
      *   False if swapping isn't permitted, true otherwise.
      */
@@ -750,7 +750,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
       // Do not allow transfering a private tab to a non-private window
       // and vice versa.
       if (
-@@ -6345,6 +6521,7 @@
+@@ -6366,6 +6542,7 @@
       // fire the beforeunload event in the process.  Close the other
       // window if this was its last tab.
       if (
@@ -758,7 +758,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
         !remoteBrowser._beginRemoveTab(aOtherTab, {
           adoptedByTab: aOurTab,
           closeWindowWithLastTab: true,
-@@ -6356,7 +6533,7 @@
+@@ -6377,7 +6554,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.
@@ -767,7 +767,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
       if (closeWindow) {
         let win = aOtherTab.ownerGlobal;
         win.windowUtils.suppressAnimation(true);
-@@ -6484,11 +6661,13 @@
+@@ -6511,11 +6688,13 @@
       }
 
       // Finish tearing down the tab that's going away.
@@ -781,7 +781,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
 
       this.setTabTitle(aOurTab);
 
-@@ -6690,10 +6869,10 @@
+@@ -6717,10 +6896,10 @@
       SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
     }
 
@@ -794,7 +794,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
         aTab.selected ||
         aTab.closing ||
         // Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -6753,7 +6932,8 @@
+@@ -6780,7 +6959,8 @@
      * @param {object} [aOptions={}]
      *   Key-value pairs that will be serialized into the features string.
      */
@@ -804,7 +804,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
       if (this.tabs.length == 1) {
         return null;
       }
-@@ -6770,7 +6950,7 @@
+@@ -6797,7 +6977,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);
@@ -813,7 +813,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
         private: PrivateBrowsingUtils.isWindowPrivate(window),
         features: Object.entries(aOptions)
           .map(([key, value]) => `${key}=${value}`)
-@@ -6778,6 +6958,8 @@
+@@ -6805,6 +6985,8 @@
         openerWindow: window,
         args,
       });
@@ -822,7 +822,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
     }
 
     /**
-@@ -6890,7 +7072,7 @@
+@@ -6917,7 +7099,7 @@
      *   `true` if element is a `<tab-group>`
      */
     isTabGroup(element) {
@@ -831,7 +831,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
     }
 
     /**
-@@ -6975,8 +7157,8 @@
+@@ -7002,8 +7184,8 @@
       }
 
       // Don't allow mixing pinned and unpinned tabs.
@@ -842,7 +842,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
       } else {
         tabIndex = Math.max(tabIndex, this.pinnedTabCount);
       }
-@@ -7005,13 +7187,19 @@
+@@ -7049,8 +7231,8 @@
       this.#handleTabMove(
         element,
         () => {
@@ -853,7 +853,9 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
             neighbor = neighbor.group;
           }
           if (neighbor?.splitview) {
-             neighbor = neighbor.splitview;
+@@ -7061,6 +7243,12 @@
+               return;
+             }
           }
 +          if (element.group?.hasAttribute("split-view-group")) {
 +            element = element.group;
@@ -861,10 +863,10 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
 +          if (element.group?.hasAttribute("split-view-group") && neighbor == element.group) {
 +            return;
 +          }
-           let useAfter = false;
-           if (this.isTab(element)) {
-             useAfter = neighbor && tabIndex > element._tPos;
-@@ -7076,23 +7264,31 @@
+ 
+           if (movingForwards && neighbor) {
+             neighbor.after(element);
+@@ -7119,23 +7307,31 @@
     #moveTabNextTo(element, targetElement, moveBefore = false, metricsContext) {
       if (this.isTabGroupLabel(targetElement)) {
         targetElement = targetElement.group;
@@ -902,7 +904,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
       } 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
-@@ -7105,12 +7301,35 @@
+@@ -7148,12 +7344,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.
@@ -939,7 +941,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
 
       // 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.
-@@ -7119,6 +7338,7 @@
+@@ -7162,6 +7381,7 @@
       }
 
       let getContainer = () =>
@@ -947,7 +949,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
         element.pinned
           ? this.tabContainer.pinnedTabsContainer
           : this.tabContainer;
-@@ -7127,11 +7347,15 @@
+@@ -7170,11 +7390,15 @@
         element,
         () => {
           if (moveBefore) {
@@ -964,7 +966,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
           }
         },
         metricsContext
-@@ -7205,11 +7429,15 @@
+@@ -7248,11 +7472,15 @@
      * @param {TabMetricsContext} [metricsContext]
      */
     moveTabToExistingGroup(aTab, aGroup, metricsContext) {
@@ -983,7 +985,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
       }
       if (aTab.group && aTab.group.id === aGroup.id) {
         return;
-@@ -7281,6 +7509,7 @@
+@@ -7324,6 +7552,7 @@
 
       let state = {
         tabIndex: tab._tPos,
@@ -991,7 +993,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
       };
       if (tab.visible) {
         state.elementIndex = tab.elementIndex;
-@@ -7312,7 +7541,7 @@
+@@ -7355,7 +7584,7 @@
       let changedSplitView =
         previousTabState.splitViewId != currentTabState.splitViewId;
 
@@ -1000,7 +1002,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
         tab.dispatchEvent(
           new CustomEvent("TabMove", {
             bubbles: true,
-@@ -7354,6 +7583,10 @@
+@@ -7402,6 +7631,10 @@
 
       moveActionCallback();
 
@@ -1011,7 +1013,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
       // Clear tabs cache after moving nodes because the order of tabs may have
       // changed.
       this.tabContainer._invalidateCachedTabs();
-@@ -7404,7 +7637,22 @@
+@@ -7452,7 +7685,22 @@
      * @returns {object}
      *    The new tab in the current window, null if the tab couldn't be adopted.
      */
@@ -1035,7 +1037,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
       // 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
-@@ -7447,6 +7695,8 @@
+@@ -7495,6 +7743,8 @@
       }
       params.skipLoad = true;
       let newTab = this.addWebTab("about:blank", params);
@@ -1044,7 +1046,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
 
       aTab.container.tabDragAndDrop.finishAnimateTabMove();
 
-@@ -8149,7 +8399,7 @@
+@@ -8205,7 +8455,7 @@
         // preventDefault(). It will still raise the window if appropriate.
         return;
       }
@@ -1053,7 +1055,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
       window.focus();
       aEvent.preventDefault();
     }
-@@ -8166,7 +8416,6 @@
+@@ -8222,7 +8472,6 @@
 
     on_TabGroupCollapse(aEvent) {
       aEvent.target.tabs.forEach(tab => {
@@ -1061,7 +1063,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
       });
     }
 
-@@ -8500,7 +8749,9 @@
+@@ -8556,7 +8805,9 @@
 
         let filter = this._tabFilters.get(tab);
         if (filter) {
@@ -1071,7 +1073,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
 
           let listener = this._tabListeners.get(tab);
           if (listener) {
-@@ -9306,6 +9557,7 @@
+@@ -9359,6 +9610,7 @@
             aWebProgress.isTopLevel
           ) {
             this.mTab.setAttribute("busy", "true");
@@ -1079,7 +1081,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
             gBrowser._tabAttrModified(this.mTab, ["busy"]);
             this.mTab._notselectedsinceload = !this.mTab.selected;
           }
-@@ -9386,6 +9638,7 @@
+@@ -9439,6 +9691,7 @@
         // known defaults. Note we use the original URL since about:newtab
         // redirects to a prerendered page.
         const shouldRemoveFavicon =
@@ -1087,7 +1089,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
           !this.mBrowser.mIconURL &&
           !ignoreBlank &&
           !(originalLocation.spec in FAVICON_DEFAULTS);
-@@ -9560,13 +9813,6 @@
+@@ -9613,13 +9866,6 @@
             this.mBrowser.originalURI = aRequest.originalURI;
           }
 
@@ -1101,7 +1103,7 @@ index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d841
         }
 
         let userContextId = this.mBrowser.getAttribute("usercontextid") || 0;
-@@ -10450,7 +10696,8 @@ var TabContextMenu = {
+@@ -10507,7 +10753,8 @@ 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 65c89aab0902cb33ad33fc523d3e0b954618778e..b42298457fdd2f8df6ff202c804122ffc999d409 100644
+index d1be14df27d76a191eaff05502c030fd68c46738..30e8dda663df8e96dbed5fe5f12f828c1a15b335 100644
 --- a/browser/components/tabbrowser/content/tabgroup.js
 +++ b/browser/components/tabbrowser/content/tabgroup.js
@@ -14,11 +14,11 @@
--- 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 da0a9c73118886d535d574810de8141cb96e54ba..104062e2c0142bd08a4498e7ca282fc46cda09be 100644
+index bb0189fbfc91b3fc3b399b077a35f7b60a3f985f..c4dd60c6fb6d7eb2288a033708836f9983530e2c 100644
 --- a/browser/components/urlbar/UrlbarController.sys.mjs
 +++ b/browser/components/urlbar/UrlbarController.sys.mjs
-@@ -304,7 +304,6 @@ export class UrlbarController {
+@@ -305,7 +305,6 @@ export class UrlbarController {
     const isMac = AppConstants.platform == "macosx";
     // Handle readline/emacs-style navigation bindings on Mac.
     if (
@@ -10,7 +10,7 @@ index da0a9c73118886d535d574810de8141cb96e54ba..104062e2c0142bd08a4498e7ca282fc4
       this.view.isOpen &&
       event.ctrlKey &&
       (event.key == "n" || event.key == "p")
-@@ -455,6 +454,8 @@ export class UrlbarController {
+@@ -456,6 +455,8 @@ export class UrlbarController {
             });
           }
           event.preventDefault();
--- a/src/browser/components/urlbar/UrlbarMuxerStandard-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarMuxerStandard-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/urlbar/UrlbarMuxerStandard.sys.mjs b/browser/components/urlbar/UrlbarMuxerStandard.sys.mjs
-index 136c66310f37bda3229b82eef32a4a22a716a0b0..4ca15850002cefda0484179839280e58eaf42cfa 100644
+index 16041c10755adced9d665539796737a9f55712de..2232bdcc02e20dbb384ca0529a8bd8ce73dc6284 100644
 --- a/browser/components/urlbar/UrlbarMuxerStandard.sys.mjs
 +++ b/browser/components/urlbar/UrlbarMuxerStandard.sys.mjs
@@ -837,11 +837,16 @@ class MuxerUnifiedComplete extends UrlbarMuxer {
@@ -19,7 +19,7 @@ index 136c66310f37bda3229b82eef32a4a22a716a0b0..4ca15850002cefda0484179839280e58
       // Discard the result if a tab-to-search result was added already.
       if (!state.canAddTabToSearch) {
         return false;
-@@ -1490,7 +1495,9 @@ class MuxerUnifiedComplete extends UrlbarMuxer {
+@@ -1491,7 +1496,9 @@ class MuxerUnifiedComplete extends UrlbarMuxer {
       usedLimits.maxResultCount++;
     }
 
--- a/src/browser/components/urlbar/UrlbarProvidersManager-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarProvidersManager-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/urlbar/UrlbarProvidersManager.sys.mjs b/browser/components/urlbar/UrlbarProvidersManager.sys.mjs
-index 08455d8d5da233639ccebc0e77c0810fb4f674c3..da8092b561c3dd8864e57f5a52a1a643db29ace1 100644
+index d9048a3b8b1f18745c01e40e12f529db3cfaa79e..1ba124a710fcf734ea11f7ccfd4f2f6ebe53e7d2 100644
 --- a/browser/components/urlbar/UrlbarProvidersManager.sys.mjs
 +++ b/browser/components/urlbar/UrlbarProvidersManager.sys.mjs
@@ -913,6 +913,7 @@ export class Query {
--- a/src/browser/components/urlbar/UrlbarResult-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarResult-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/urlbar/UrlbarResult.sys.mjs b/browser/components/urlbar/UrlbarResult.sys.mjs
-index 65b8fb67b51c8959fe1d47b98efbb2bca591eafc..c52c50a87b37ca1c885c55b36e5beccc8dd7c5fb 100644
+index 21f7938f76375e7230f9509e4932cafa4d0e57f2..ab96b160b6c65da3bf267d9fe2f1f35c7507466e 100644
 --- a/browser/components/urlbar/UrlbarResult.sys.mjs
 +++ b/browser/components/urlbar/UrlbarResult.sys.mjs
@@ -181,6 +181,10 @@ export class UrlbarResult {
--- 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 64afd613f454edd7786fcc1e2f307a582e4d5f51..92f91379f43785cf5417c96b178884c860db6bd3 100644
+index 62367c5a77614e5973791abacd068b39e0f3ab34..c930943b5bfa8a2e6dee43f0ec7a10274a7c7638 100644
 --- a/browser/components/urlbar/UrlbarUtils.sys.mjs
 +++ b/browser/components/urlbar/UrlbarUtils.sys.mjs
-@@ -85,6 +85,8 @@ export var UrlbarUtils = {
+@@ -109,6 +109,8 @@ export var UrlbarUtils = {
     RESTRICT_SEARCH_KEYWORD: "restrictSearchKeyword",
     SUGGESTED_INDEX: "suggestedIndex",
     TAIL_SUGGESTION: "tailSuggestion",
@@ -11,7 +11,7 @@ index 64afd613f454edd7786fcc1e2f307a582e4d5f51..92f91379f43785cf5417c96b178884c8
   }),
 
   // Defines provider types.
-@@ -146,6 +148,8 @@ export var UrlbarUtils = {
+@@ -170,6 +172,8 @@ export var UrlbarUtils = {
     OTHER_NETWORK: 6,
     ADDON: 7,
     ACTIONS: 8,
@@ -20,9 +20,9 @@ index 64afd613f454edd7786fcc1e2f307a582e4d5f51..92f91379f43785cf5417c96b178884c8
   }),
 
   // Per-result exposure telemetry.
-@@ -295,6 +299,14 @@ export var UrlbarUtils = {
+@@ -319,6 +323,14 @@ export var UrlbarUtils = {
         telemetryLabel: "actions",
-         uiLabel: "urlbar-searchmode-actions",
+         uiLabel: "urlbar-searchmode-actions2",
       },
 +      {
 +        source: this.RESULT_SOURCE.WORKSPACES,
@@ -35,7 +35,7 @@ index 64afd613f454edd7786fcc1e2f307a582e4d5f51..92f91379f43785cf5417c96b178884c8
     ]);
   },
 
-@@ -587,6 +599,12 @@ export var UrlbarUtils = {
+@@ -611,6 +623,12 @@ export var UrlbarUtils = {
           return this.RESULT_GROUP.HEURISTIC_FALLBACK;
         case "UrlbarProviderHistoryUrlHeuristic":
           return this.RESULT_GROUP.HEURISTIC_HISTORY_URL;
--- a/src/browser/components/urlbar/UrlbarValueFormatter-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarValueFormatter-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/urlbar/UrlbarValueFormatter.sys.mjs b/browser/components/urlbar/UrlbarValueFormatter.sys.mjs
-index f28d277764158566bc9406ce0e6160d92d346a63..aee17083999f99670c2de7b47cb917e400da86a6 100644
+index 344a9a5b969e679040a650dad311c7413f52bbbd..211918cd66b2ea9ce230c45607c4482806eb7b64 100644
 --- a/browser/components/urlbar/UrlbarValueFormatter.sys.mjs
 +++ b/browser/components/urlbar/UrlbarValueFormatter.sys.mjs
@@ -77,7 +77,7 @@ export class UrlbarValueFormatter {
--- 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 b23244f9d3278918b016bb3fcab19687bc2e292a..ade1f031bbb68202a37e6c9d3071a73f5c811a82 100644
+index d6615ec5a29f3e3327ac4171f3fc5d9a69bd09fe..e1128b0d7f5accfd48af27f99e3b2e6463b45191 100644
 --- a/browser/components/urlbar/content/UrlbarInput.mjs
 +++ b/browser/components/urlbar/content/UrlbarInput.mjs
-@@ -90,6 +90,13 @@ const lazy = XPCOMUtils.declareLazy({
+@@ -98,6 +98,13 @@ const lazy = XPCOMUtils.declareLazy({
   logger: () => lazy.UrlbarUtils.getLogger({ prefix: "Input" }),
 });
 
@@ -16,7 +16,7 @@ index b23244f9d3278918b016bb3fcab19687bc2e292a..ade1f031bbb68202a37e6c9d3071a73f
 const UNLIMITED_MAX_RESULTS = 99;
 
 let getBoundsWithoutFlushing = element =>
-@@ -708,7 +715,16 @@ export class UrlbarInput extends HTMLElement {
+@@ -743,7 +750,16 @@ ${
     // See _on_select().  HTMLInputElement.select() dispatches a "select"
     // event but does not set the primary selection.
     this._suppressPrimaryAdjustment = true;
@@ -33,7 +33,7 @@ index b23244f9d3278918b016bb3fcab19687bc2e292a..ade1f031bbb68202a37e6c9d3071a73f
     this._suppressPrimaryAdjustment = false;
   }
 
-@@ -782,6 +798,10 @@ export class UrlbarInput extends HTMLElement {
+@@ -817,6 +833,10 @@ ${
     hideSearchTerms = false,
     isSameDocument = false,
   } = {}) {
@@ -44,7 +44,7 @@ index b23244f9d3278918b016bb3fcab19687bc2e292a..ade1f031bbb68202a37e6c9d3071a73f
     if (!this.#isAddressbar) {
       throw new Error(
         "Cannot set URI for UrlbarInput that is not an address bar"
-@@ -1071,8 +1091,16 @@ export class UrlbarInput extends HTMLElement {
+@@ -1106,8 +1126,16 @@ ${
         return;
       }
     }
@@ -62,7 +62,7 @@ index b23244f9d3278918b016bb3fcab19687bc2e292a..ade1f031bbb68202a37e6c9d3071a73f
   }
 
   /**
-@@ -1496,7 +1524,11 @@ export class UrlbarInput extends HTMLElement {
+@@ -1551,7 +1579,11 @@ ${
     }
 
     if (!this.#providesSearchMode(result)) {
@@ -75,7 +75,7 @@ index b23244f9d3278918b016bb3fcab19687bc2e292a..ade1f031bbb68202a37e6c9d3071a73f
     }
 
     if (isCanonized) {
-@@ -2696,6 +2728,42 @@ export class UrlbarInput extends HTMLElement {
+@@ -2858,6 +2890,42 @@ ${
     await this.#updateLayoutBreakoutDimensions();
   }
 
@@ -118,7 +118,7 @@ index b23244f9d3278918b016bb3fcab19687bc2e292a..ade1f031bbb68202a37e6c9d3071a73f
   startLayoutExtend() {
     if (!this.#allowBreakout || this.hasAttribute("breakout-extend")) {
       // Do not expand if the Urlbar does not support being expanded or it is
-@@ -2710,6 +2778,13 @@ export class UrlbarInput extends HTMLElement {
+@@ -2872,6 +2940,13 @@ ${
 
     this.setAttribute("breakout-extend", "true");
 
@@ -132,7 +132,7 @@ index b23244f9d3278918b016bb3fcab19687bc2e292a..ade1f031bbb68202a37e6c9d3071a73f
     // 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")) {
-@@ -2729,6 +2804,27 @@ export class UrlbarInput extends HTMLElement {
+@@ -2891,6 +2966,27 @@ ${
       return;
     }
 
@@ -160,7 +160,7 @@ index b23244f9d3278918b016bb3fcab19687bc2e292a..ade1f031bbb68202a37e6c9d3071a73f
     this.removeAttribute("breakout-extend");
     this.#updateTextboxPosition();
   }
-@@ -2759,7 +2855,7 @@ export class UrlbarInput extends HTMLElement {
+@@ -2921,7 +3017,7 @@ ${
     forceUnifiedSearchButtonAvailable = false
   ) {
     let prevState = this.getAttribute("pageproxystate");
@@ -169,7 +169,7 @@ index b23244f9d3278918b016bb3fcab19687bc2e292a..ade1f031bbb68202a37e6c9d3071a73f
     this.setAttribute("pageproxystate", state);
     this._inputContainer.setAttribute("pageproxystate", state);
     this._identityBox?.setAttribute("pageproxystate", state);
-@@ -3031,10 +3127,12 @@ export class UrlbarInput extends HTMLElement {
+@@ -3198,10 +3294,12 @@ ${
       return;
     }
     this.style.top = px(
@@ -182,7 +182,7 @@ index b23244f9d3278918b016bb3fcab19687bc2e292a..ade1f031bbb68202a37e6c9d3071a73f
     );
   }
 
-@@ -3093,9 +3191,10 @@ export class UrlbarInput extends HTMLElement {
+@@ -3260,9 +3358,10 @@ ${
           return;
         }
 
@@ -194,7 +194,7 @@ index b23244f9d3278918b016bb3fcab19687bc2e292a..ade1f031bbb68202a37e6c9d3071a73f
         );
         this.style.setProperty(
           "--urlbar-height",
-@@ -3597,6 +3696,7 @@ export class UrlbarInput extends HTMLElement {
+@@ -3768,6 +3867,7 @@ ${
   }
 
   _toggleActionOverride(event) {
@@ -202,7 +202,7 @@ index b23244f9d3278918b016bb3fcab19687bc2e292a..ade1f031bbb68202a37e6c9d3071a73f
     if (
       event.keyCode == KeyEvent.DOM_VK_SHIFT ||
       event.keyCode == KeyEvent.DOM_VK_ALT ||
-@@ -3709,8 +3809,8 @@ export class UrlbarInput extends HTMLElement {
+@@ -3880,8 +3980,8 @@ ${
     if (!this.#isAddressbar) {
       return val;
     }
@@ -213,7 +213,7 @@ index b23244f9d3278918b016bb3fcab19687bc2e292a..ade1f031bbb68202a37e6c9d3071a73f
       : val;
     // Only trim value if the directionality doesn't change to RTL and we're not
     // showing a strikeout https protocol.
-@@ -4006,6 +4106,7 @@ export class UrlbarInput extends HTMLElement {
+@@ -4180,6 +4280,7 @@ ${
     resultDetails = null,
     browser = this.window.gBrowser.selectedBrowser
   ) {
@@ -221,7 +221,7 @@ index b23244f9d3278918b016bb3fcab19687bc2e292a..ade1f031bbb68202a37e6c9d3071a73f
     if (this.#isAddressbar) {
       this.#prepareAddressbarLoad(
         url,
-@@ -4117,6 +4218,10 @@ export class UrlbarInput extends HTMLElement {
+@@ -4291,6 +4392,10 @@ ${
       }
       reuseEmpty = true;
     }
@@ -232,7 +232,7 @@ index b23244f9d3278918b016bb3fcab19687bc2e292a..ade1f031bbb68202a37e6c9d3071a73f
     if (
       where == "tab" &&
       reuseEmpty &&
-@@ -4124,6 +4229,9 @@ export class UrlbarInput extends HTMLElement {
+@@ -4298,6 +4403,9 @@ ${
     ) {
       where = "current";
     }
@@ -242,7 +242,7 @@ index b23244f9d3278918b016bb3fcab19687bc2e292a..ade1f031bbb68202a37e6c9d3071a73f
     return where;
   }
 
-@@ -4378,6 +4486,7 @@ export class UrlbarInput extends HTMLElement {
+@@ -4552,6 +4660,7 @@ ${
       this.setResultForCurrentValue(null);
       this.handleCommand();
       this.controller.clearLastQueryContextCache();
@@ -250,7 +250,7 @@ index b23244f9d3278918b016bb3fcab19687bc2e292a..ade1f031bbb68202a37e6c9d3071a73f
 
       this._suppressStartQuery = false;
     });
-@@ -4385,7 +4494,6 @@ export class UrlbarInput extends HTMLElement {
+@@ -4559,7 +4668,6 @@ ${
     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 b23244f9d3278918b016bb3fcab19687bc2e292a..ade1f031bbb68202a37e6c9d3071a73f
 
       let controller =
         this.document.commandDispatcher.getControllerForCommand("cmd_paste");
-@@ -4541,7 +4649,11 @@ export class UrlbarInput extends HTMLElement {
+@@ -4715,7 +4823,11 @@ ${
     if (!engineName && !source && !this.hasAttribute("searchmode")) {
       return;
     }
@@ -271,7 +271,7 @@ index b23244f9d3278918b016bb3fcab19687bc2e292a..ade1f031bbb68202a37e6c9d3071a73f
     if (this._searchModeIndicatorTitle) {
       this._searchModeIndicatorTitle.textContent = "";
       this._searchModeIndicatorTitle.removeAttribute("data-l10n-id");
-@@ -4851,6 +4963,7 @@ export class UrlbarInput extends HTMLElement {
+@@ -5031,6 +5143,7 @@ ${
 
     this.document.l10n.setAttributes(
       this.inputField,
@@ -279,7 +279,7 @@ index b23244f9d3278918b016bb3fcab19687bc2e292a..ade1f031bbb68202a37e6c9d3071a73f
       l10nId,
       l10nId == "urlbar-placeholder-with-name"
         ? { name: engineName }
-@@ -4964,6 +5077,11 @@ export class UrlbarInput extends HTMLElement {
+@@ -5156,6 +5269,11 @@ ${
   }
 
   _on_click(event) {
@@ -291,7 +291,7 @@ index b23244f9d3278918b016bb3fcab19687bc2e292a..ade1f031bbb68202a37e6c9d3071a73f
     switch (event.target) {
       case this.inputField:
       case this._inputContainer:
-@@ -5042,7 +5160,7 @@ export class UrlbarInput extends HTMLElement {
+@@ -5242,7 +5360,7 @@ ${
       }
     }
 
@@ -300,7 +300,7 @@ index b23244f9d3278918b016bb3fcab19687bc2e292a..ade1f031bbb68202a37e6c9d3071a73f
       this.view.autoOpen({ event });
     } else {
       if (this._untrimOnFocusAfterKeydown) {
-@@ -5082,9 +5200,16 @@ export class UrlbarInput extends HTMLElement {
+@@ -5282,9 +5400,16 @@ ${
   }
 
   _on_mousedown(event) {
@@ -318,27 +318,27 @@ index b23244f9d3278918b016bb3fcab19687bc2e292a..ade1f031bbb68202a37e6c9d3071a73f
         if (
           event.composedTarget != this.inputField &&
           event.composedTarget != this._inputContainer
-@@ -5094,6 +5219,10 @@ export class UrlbarInput extends HTMLElement {
+@@ -5294,6 +5419,10 @@ ${
 
         this.focusedViaMousedown = !this.focused;
-         this._preventClickSelectsAll = this.focused;
+         this.#preventClickSelectsAll = this.focused;
 +        if (isProbablyFloating) {
 +          this.focusedViaMousedown = !this.hasAttribute("breakout-extend");
-+          this._preventClickSelectsAll = this.hasAttribute("breakout-extend");
+          this.#preventClickSelectsAll = this.hasAttribute("breakout-extend");
 +        }
 
         // Keep the focus status, since the attribute may be changed
         // upon calling this.focus().
-@@ -5129,7 +5258,7 @@ export class UrlbarInput extends HTMLElement {
+@@ -5329,7 +5458,7 @@ ${
         }
         // 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.
-        if (event.target.closest("tab")) {
-+        if (event.target.closest("tab") || event.target.closest("#tabs-newtab-button")) {
+-        if (event.target.closest?.("tab")) {
+        if (event.target.closest?.("tab") || event.target.closest?.("#tabs-newtab-button")) {
           break;
         }
 
-@@ -5411,7 +5540,7 @@ export class UrlbarInput extends HTMLElement {
+@@ -5636,7 +5765,7 @@ ${
     // When we are in actions search mode we can show more results so
     // increase the limit.
     let maxResults =
--- a/src/browser/components/urlbar/content/enUS-searchFeatures-ftl.patch
+++ b/src/browser/components/urlbar/content/enUS-searchFeatures-ftl.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/urlbar/content/enUS-searchFeatures.ftl b/browser/components/urlbar/content/enUS-searchFeatures.ftl
-index a1fb86058d1f6f015160163f75999b4a429bf1fd..83098291e21a8239513a4105a4604394a1dfabc0 100644
+index e405f0f8844eea7081e4302cc35ccd8d8124aa90..90baec46971c6bd3ec738a338834af0351872d14 100644
 --- a/browser/components/urlbar/content/enUS-searchFeatures.ftl
 +++ b/browser/components/urlbar/content/enUS-searchFeatures.ftl
@@ -2,6 +2,9 @@
--- 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 daf4e1dca839a6e882edf598bd82f13f1bf4eadd..ebb584e058c0a15f5a5fa0bd80bdce42636c9ba0 100644
+index edb61ebece92f53d6edc8522c0dfea01159121dc..fd57751828254ebf9b05af13c26afa55ffa7ed00 100644
 --- a/browser/extensions/newtab/lib/ActivityStream.sys.mjs
 +++ b/browser/extensions/newtab/lib/ActivityStream.sys.mjs
-@@ -287,7 +287,7 @@ export const PREFS_CONFIG = new Map([
+@@ -347,7 +347,7 @@ export const PREFS_CONFIG = new Map([
     "showSponsoredTopSites",
     {
       title: "Show sponsored top sites",
--- a/src/browser/installer/windows/nsis/defines-nsi-in.patch
+++ b/src/browser/installer/windows/nsis/defines-nsi-in.patch
@@ -1,17 +1,8 @@
 diff --git a/browser/installer/windows/nsis/defines.nsi.in b/browser/installer/windows/nsis/defines.nsi.in
-index c6bb41695d70d17e5691e0d1856b79f7111d5026..8a9393a79a60aca23f80fc989fe2ae333ba54e39 100644
+index a9bf2d67ce522054442be664bda1434c63609ea1..16e03732d78207ce602066a4bccc0d2c2385ca91 100644
 --- a/browser/installer/windows/nsis/defines.nsi.in
 +++ b/browser/installer/windows/nsis/defines.nsi.in
-@@ -90,7 +90,7 @@
- !define BETA_UPDATE_CHANNEL
- !endif
- 
-!define BaseURLStubPing "http://download-stats.mozilla.org/stub"
-+!define BaseURLStubPing ""
- 
- # ARCH is used when it is necessary to differentiate the x64 registry keys from
- # the x86 registry keys (e.g. the uninstall registry key).
-@@ -152,7 +152,7 @@ VIAddVersionKey "ProductVersion"  "${AppVersion}"
+@@ -147,7 +147,7 @@ VIAddVersionKey "ProductVersion"  "${AppVersion}"
 !define APPROXIMATE_REQUIRED_SPACE_MB "145"
 
 # Constants for parts of the telemetry submission URL
--- a/src/browser/installer/windows/nsis/installer-nsi.patch
+++ b/src/browser/installer/windows/nsis/installer-nsi.patch
@@ -1,20 +1,20 @@
 diff --git a/browser/installer/windows/nsis/installer.nsi b/browser/installer/windows/nsis/installer.nsi
-index b3459f8233b2509744e27bfe33884c6a92164e36..76b71e0882381f8f6becaf88bc4e3cc56f8d8ad4 100755
+index 36fbee18edd138036c23ee77806f47cd10efce55..f70893700c54bdbc6d6fc5b760fd9a3654eb39e7 100755
 --- a/browser/installer/windows/nsis/installer.nsi
 +++ b/browser/installer/windows/nsis/installer.nsi
-@@ -842,7 +842,7 @@ Section "-InstallEndCleanup"
+@@ -845,7 +845,7 @@ Section "-InstallEndCleanup"
   ; When we're using the GUI, .onGUIEnd sends the ping, but of course that isn't
   ; invoked when we're running silently.
   ${If} ${Silent}
-    Call SendPing
-+    ; Call SendPing
+-    Call SendPingIfApplicable
+    ; Call SendPingIfApplicable
   ${EndIf}
 SectionEnd
 
-@@ -1978,5 +1978,5 @@ FunctionEnd
+@@ -1800,5 +1800,5 @@ FunctionEnd
 
 Function .onGUIEnd
   ${OnEndCommon}
-  Call SendPing
-+  ; Call SendPing
+-  Call SendPingIfApplicable
+  ; Call SendPingIfApplicable
 FunctionEnd
--- a/src/browser/installer/windows/nsis/uninstaller-nsi.patch
+++ b/src/browser/installer/windows/nsis/uninstaller-nsi.patch
@@ -1,10 +1,10 @@
 diff --git a/browser/installer/windows/nsis/uninstaller.nsi b/browser/installer/windows/nsis/uninstaller.nsi
 old mode 100755
 new mode 100644
-index a193a94e4893a8b07111d83ebdd2a6488a98be7a..ab7d84abbf6d9442cbc299194c4ffb74c5785723
+index 0e2f7fa874b865b2a354c5ca612c5714f6ac5b69..0b1182279336972705bc3ff47e69353b997eb1bd
 --- a/browser/installer/windows/nsis/uninstaller.nsi
 +++ b/browser/installer/windows/nsis/uninstaller.nsi
-@@ -515,6 +515,7 @@ Section "Uninstall"
+@@ -516,6 +516,7 @@ Section "Uninstall"
   ${un.RegCleanFileHandler}  ".svg"   "FirefoxHTML-$AppUserModelID"
   ${un.RegCleanFileHandler}  ".webp"  "FirefoxHTML-$AppUserModelID"
   ${un.RegCleanFileHandler}  ".avif"  "FirefoxHTML-$AppUserModelID"
--- a/src/browser/modules/BrowserDOMWindow-sys-mjs.patch
+++ b/src/browser/modules/BrowserDOMWindow-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/modules/BrowserDOMWindow.sys.mjs b/browser/modules/BrowserDOMWindow.sys.mjs
-index e951af5edb966718ee20422c8e46d868c177cd1c..cd41305a4da8e675417eca7df5cd4a1ecee90c3d 100644
+index 29c5b1510696cfdd993388957115709b1a149d7c..6616edbc5f992ffdf3df65028cd26c17ef13f315 100644
 --- a/browser/modules/BrowserDOMWindow.sys.mjs
 +++ b/browser/modules/BrowserDOMWindow.sys.mjs
-@@ -437,7 +437,7 @@ export class BrowserDOMWindow {
+@@ -436,7 +436,7 @@ export class BrowserDOMWindow {
     // Passing a null-URI to only create the content window,
     // and pass true for aSkipLoad to prevent loading of
     // about:blank
@@ -11,7 +11,7 @@ index e951af5edb966718ee20422c8e46d868c177cd1c..cd41305a4da8e675417eca7df5cd4a1e
       null,
       aParams,
       aWhere,
-@@ -445,6 +445,10 @@ export class BrowserDOMWindow {
+@@ -444,6 +444,10 @@ export class BrowserDOMWindow {
       aName,
       true
     );
--- a/src/browser/modules/URILoadingHelper-sys-mjs.patch
+++ b/src/browser/modules/URILoadingHelper-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/modules/URILoadingHelper.sys.mjs b/browser/modules/URILoadingHelper.sys.mjs
-index a005dbdf84609622ef8054f73f78c0c290e76125..d5bf6fb51c9af5e60f69a73612ee91598080730a 100644
+index ed6b9fda700b2b4b35836a77a4da953377a72f4b..22acedcf1006f994ec8b6bf8991b4202e12a6f39 100644
 --- a/browser/modules/URILoadingHelper.sys.mjs
 +++ b/browser/modules/URILoadingHelper.sys.mjs
@@ -224,6 +224,7 @@ function openInWindow(url, params, sourceWindow) {
@@ -28,8 +28,8 @@ index a005dbdf84609622ef8054f73f78c0c290e76125..d5bf6fb51c9af5e60f69a73612ee9159
       for (let i = 0; i < browsers.length; i++) {
         let browser = browsers[i];
         let browserCompare = cleanURL(
-@@ -1030,7 +1031,7 @@ export const URILoadingHelper = {
-               );
+@@ -1026,7 +1027,7 @@ export const URILoadingHelper = {
+               aSplitView.replaceTab(tabToReplace, tabToMove);
               aSplitView.ownerGlobal.focus();
             } else {
 -              aWindow.gBrowser.tabContainer.selectedIndex = i;
--- a/src/browser/themes/linux/browser-css.patch
+++ b/src/browser/themes/linux/browser-css.patch
@@ -1,12 +1,12 @@
 diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
-index b82fa7229ad637a08563c06fa2c2abdf99998d7c..b5ee3aa9679244222a0e9eed4be54a41ec6a11f9 100644
+index a99181fc249a7086e9886d86d85e8650595a0a0c..dd59739078080738d28bf59a1bb26fc0783bcac6 100644
 --- a/browser/themes/linux/browser.css
 +++ b/browser/themes/linux/browser.css
@@ -14,7 +14,6 @@
     @media (-moz-gtk-theme-family) {
       --tabs-navbar-separator-style: none;
       @media (prefers-color-scheme: light) {
-        --urlbar-box-bgcolor: #fafafa;
+-        --urlbar-box-background-color: #fafafa;
       }
     }
   }
--- a/src/browser/themes/osx/browser-css.patch
+++ b/src/browser/themes/osx/browser-css.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
-index 8fe643be3f60da00760775c918ba3228fbd2b610..d634c09685065b4096a74a93e0373e4942fd2a29 100644
+index 92162e2893f7c8aea92c354f3a12cccf48f7576e..3189d75c8e47f3f76ddc1227d3cffee6b09402eb 100644
 --- a/browser/themes/osx/browser.css
 +++ b/browser/themes/osx/browser.css
@@ -37,7 +37,7 @@
--- a/src/browser/themes/shared/browser-shared-css.patch
+++ b/src/browser/themes/shared/browser-shared-css.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/themes/shared/browser-shared.css b/browser/themes/shared/browser-shared.css
-index d1b11a65e527cf7c13f42b3f980f2f09592c5e53..44fb86b570c69f7d7003d3949e330e08722fbbb8 100644
+index 70571d8f32d60d10e59e33cb83e38229de026fc6..8e420ed6f6838499553c55265a1e35f5c3801d35 100644
 --- a/browser/themes/shared/browser-shared.css
 +++ b/browser/themes/shared/browser-shared.css
-@@ -250,13 +250,13 @@ body {
+@@ -253,13 +253,13 @@ body {
 
   @media (-moz-platform: macos) and (not (-moz-mac-rtl)) {
     &:-moz-locale-dir(ltr) {
--- a/src/browser/themes/shared/identity-block/identity-block-css.patch
+++ b/src/browser/themes/shared/identity-block/identity-block-css.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/themes/shared/identity-block/identity-block.css b/browser/themes/shared/identity-block/identity-block.css
-index c867b8602c5b3bdce335b932a3a1cd0c538e4ad6..2dc1cf17603bcdd9b8d81a6f46ed8b6ed75b2763 100644
+index 72b6673094b80e9c109ae6f125cd25c3e00260ef..d116ab9671b02bbb05eddec8318e1f2835c29f32 100644
 --- a/browser/themes/shared/identity-block/identity-block.css
 +++ b/browser/themes/shared/identity-block/identity-block.css
@@ -7,7 +7,7 @@
@@ -17,7 +17,7 @@ index c867b8602c5b3bdce335b932a3a1cd0c538e4ad6..2dc1cf17603bcdd9b8d81a6f46ed8b6e
 
 -#identity-box[pageproxystate="valid"]:is(.notSecureText, .chromeUI, .extensionPage) > .identity-box-button,
 -#urlbar-label-box {
-  background-color: var(--urlbar-box-bgcolor);
+-  background-color: var(--urlbar-box-background-color);
 -  color: var(--urlbar-box-text-color);
 -  padding-inline: 8px;
 -  border-radius: var(--urlbar-inner-border-radius);
--- 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 3a12a7a33c33cec463b3d38647bdf647827784f8..4844da4b56b3172b333f5c5eb31fcd74f43fd0b0 100644
+index e59fb7f095161348e442626997bbb6dc4e1e999e..488c540b07e5ce73048cebec0d75dd33f9dcabd4 100644
 --- a/browser/themes/shared/jar.inc.mn
 +++ b/browser/themes/shared/jar.inc.mn
-@@ -334,3 +334,5 @@
+@@ -343,3 +343,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
@@ -6,10 +6,6 @@

@namespace html "http://www.w3.org/1999/xhtml";

-:root {
-  --in-content-box-background: var(--zen-colors-tertiary) !important;
-}
-
 .pane-container {
  margin: auto;
 }
@@ -58,10 +54,6 @@ groupbox h2 {
  font-size: 15px;
 }

-#categories {
-  margin: 0 !important;
-}
-
 #categories > .category {
  margin-left: 0 !important;
  min-height: 40px !important;
--- a/src/browser/themes/shared/tabbrowser/content-area-css.patch
+++ b/src/browser/themes/shared/tabbrowser/content-area-css.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/themes/shared/tabbrowser/content-area.css b/browser/themes/shared/tabbrowser/content-area.css
-index 13403bf438be18b5bcc9f3d497c94636b5fb5f6f..0505582a7efa212813cf39835c12d34d4d38eb4e 100644
+index 05c1261f0085794e5e81dc8c1ef24fe1a9c5ec82..d0a1938b629338184bc462b4da1e10e1a4d6a4e7 100644
 --- a/browser/themes/shared/tabbrowser/content-area.css
 +++ b/browser/themes/shared/tabbrowser/content-area.css
@@ -85,7 +85,6 @@
@@ -10,7 +10,7 @@ index 13403bf438be18b5bcc9f3d497c94636b5fb5f6f..0505582a7efa212813cf39835c12d34d
 
   /* stylelint-disable-next-line media-query-no-invalid */
   @media -moz-pref("sidebar.revamp") {
-@@ -141,7 +140,6 @@
+@@ -146,7 +145,6 @@
   }
 
   browser:is([blank], [pendingpaint]) {
@@ -18,7 +18,7 @@ index 13403bf438be18b5bcc9f3d497c94636b5fb5f6f..0505582a7efa212813cf39835c12d34d
   }
 
   /* Exclude browsers with smartwindow-content attribute which inherit
-@@ -427,7 +425,7 @@ split-view-footer {
+@@ -440,7 +438,7 @@ split-view-footer {
 
 .dialogStack {
   z-index: var(--browser-stack-z-index-dialog-stack);
@@ -27,7 +27,7 @@ index 13403bf438be18b5bcc9f3d497c94636b5fb5f6f..0505582a7efa212813cf39835c12d34d
   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 */
-@@ -594,7 +592,7 @@ split-view-footer {
+@@ -607,7 +605,7 @@ split-view-footer {
 
 .dialogOverlay[topmost="true"],
 #window-modal-dialog::backdrop {
--- a/src/browser/themes/shared/tabbrowser/tabs-css.patch
+++ b/src/browser/themes/shared/tabbrowser/tabs-css.patch
@@ -1,29 +1,17 @@
 diff --git a/browser/themes/shared/tabbrowser/tabs.css b/browser/themes/shared/tabbrowser/tabs.css
-index 203b546933842f4b0134188fda020c4db4dcd0d2..0d67deabac2984574636248a16e58d1669f2e1a4 100644
+index 2ce8b135dcf087a2e2cb75c3417be8c9ba4178e6..3c297614afd323e210ebf0018d4aca22c000e105 100644
 --- a/browser/themes/shared/tabbrowser/tabs.css
 +++ b/browser/themes/shared/tabbrowser/tabs.css
-@@ -24,7 +24,7 @@
+@@ -25,7 +25,7 @@
   --tab-group-line-thickness: 2px;
   --tab-group-line-toolbar-border-distance: 1px;
   /* Collapsed tabs should be square, so set width to match the min height */
 -  --tab-collapsed-background-width: var(--tab-min-height);
 +  --tab-collapsed-background-width: 48px;
   --tab-collapsed-width: calc(var(--tab-collapsed-background-width) + 2 * var(--tab-inner-inline-margin));
-   --tab-inner-inline-margin: var(--space-medium);
-   --tab-inline-padding: 8px;
-@@ -38,9 +38,9 @@
-   --tab-block-margin: 4px;
-   --tab-icon-end-margin: 5.5px;
-   --tab-label-line-height: 1.7;
-  --tab-loading-fill: #0a84ff;
-+  --tab-loading-fill: var(--zen-primary-color);
-   --tab-hover-background-color: color-mix(in srgb, currentColor 11%, transparent);
-  --tab-selected-textcolor: var(--toolbar-color);
-+  --tab-selected-textcolor: currentColor;
-   --tab-selected-bgcolor: var(--toolbar-bgcolor);
-   --tab-selected-color-scheme: var(--toolbar-color-scheme);
-   &[lwt-tab-selected="light"] {
-@@ -298,7 +298,6 @@ tab-split-view-wrapper[dragtarget] {
+   --tab-pinned-min-width-expanded: calc(var(--tab-pinned-expanded-background-width) + 2 * var(--tab-pinned-margin-inline-expanded));
+   --tab-note-icon-end-margin: var(--dimension-4);
+@@ -276,7 +276,6 @@ tab-split-view-wrapper[dragtarget] {
   }
 
   :root:not([uidensity="compact"], [sidebar-expand-on-hover]) &[pinned] {
@@ -31,7 +19,7 @@ index 203b546933842f4b0134188fda020c4db4dcd0d2..0d67deabac2984574636248a16e58d16
   }
 
   &:is([selected], [multiselected]) {
-@@ -312,6 +311,7 @@ tab-split-view-wrapper[dragtarget] {
+@@ -290,6 +289,7 @@ tab-split-view-wrapper[dragtarget] {
     border-radius: inherit;
     position: relative;
     overflow: hidden;
@@ -39,7 +27,7 @@ index 203b546933842f4b0134188fda020c4db4dcd0d2..0d67deabac2984574636248a16e58d16
 
     &::before {
       position: absolute;
-@@ -511,10 +511,6 @@ tab-split-view-wrapper[dragtarget] {
+@@ -489,10 +489,6 @@ tab-split-view-wrapper[dragtarget] {
   /* stylelint-disable-next-line media-query-no-invalid */
   @media -moz-pref("browser.tabs.fadeOutUnloadedTabs") {
     &[pending] {
@@ -50,7 +38,7 @@ index 203b546933842f4b0134188fda020c4db4dcd0d2..0d67deabac2984574636248a16e58d16
       opacity: 0.5;
       /* Fade the favicon out */
       transition-property: filter, opacity;
-@@ -531,10 +527,6 @@ tab-split-view-wrapper[dragtarget] {
+@@ -509,10 +505,6 @@ tab-split-view-wrapper[dragtarget] {
   /* stylelint-disable-next-line media-query-no-invalid */
   @media -moz-pref("browser.tabs.fadeOutExplicitlyUnloadedTabs") {
     &[pending][discarded] {
@@ -61,7 +49,7 @@ index 203b546933842f4b0134188fda020c4db4dcd0d2..0d67deabac2984574636248a16e58d16
       opacity: 0.5;
       /* Fade the favicon out */
       transition-property: filter, opacity;
-@@ -603,7 +595,7 @@ tab-split-view-wrapper[dragtarget] {
+@@ -581,7 +573,7 @@ tab-split-view-wrapper[dragtarget] {
   z-index: 1; /* Overlay tab title */
 
   #tabbrowser-tabs[orient="vertical"] & {
@@ -70,7 +58,7 @@ index 203b546933842f4b0134188fda020c4db4dcd0d2..0d67deabac2984574636248a16e58d16
   }
 
   &[crashed] {
-@@ -611,7 +603,7 @@ tab-split-view-wrapper[dragtarget] {
+@@ -589,7 +581,7 @@ tab-split-view-wrapper[dragtarget] {
   }
 
   #tabbrowser-tabs[orient="vertical"]:not([expanded]) &:not([crashed]),
@@ -79,7 +67,7 @@ index 203b546933842f4b0134188fda020c4db4dcd0d2..0d67deabac2984574636248a16e58d16
     &[soundplaying] {
       list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-playing-small.svg");
     }
-@@ -666,7 +658,7 @@ tab-split-view-wrapper[dragtarget] {
+@@ -644,7 +636,7 @@ tab-split-view-wrapper[dragtarget] {
     }
   }
 
@@ -88,7 +76,7 @@ index 203b546933842f4b0134188fda020c4db4dcd0d2..0d67deabac2984574636248a16e58d16
   &[crashed] {
     display: revert;
   }
-@@ -832,7 +824,7 @@ tab-split-view-wrapper[dragtarget] {
+@@ -810,7 +802,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,7 +85,7 @@ index 203b546933842f4b0134188fda020c4db4dcd0d2..0d67deabac2984574636248a16e58d16
       &:is([soundplaying], [muted], [activemedia-blocked]) {
         display: flex;
       }
-@@ -1048,7 +1040,6 @@ tab-split-view-wrapper[dragtarget] {
+@@ -1026,7 +1018,6 @@ tab-split-view-wrapper[dragtarget] {
 .tabbrowser-tab:is([image], [pinned]) > .tab-stack > .tab-content[attention]:not([selected]),
 .tabbrowser-tab > .tab-stack > .tab-content[pinned][titlechanged]:not([selected]),
 #tabbrowser-tabs[orient="vertical"] .tabbrowser-tab > .tab-stack > .tab-content[titlechanged]:not([selected]) {
@@ -105,16 +93,16 @@ index 203b546933842f4b0134188fda020c4db4dcd0d2..0d67deabac2984574636248a16e58d16
   background-position: center bottom 6.5px;
   background-size: 4px 4px;
   background-repeat: no-repeat;
-@@ -1614,7 +1605,7 @@ tab-group {
+@@ -1635,7 +1626,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]) tab-group > .tabbrowser-tab:is(:active, [multiselected]) {
+   &[movingtab][movingtab-addToGroup]:not([movingtab-group], [movingtab-ungroup]) .tabbrowser-tab:is(:active, [multiselected]) {
     margin-inline-start: var(--space-medium);
   }
-@@ -2089,7 +2080,7 @@ tab-group {
+@@ -2128,7 +2119,7 @@ tab-group {
   }
 }
 
@@ -123,7 +111,7 @@ index 203b546933842f4b0134188fda020c4db4dcd0d2..0d67deabac2984574636248a16e58d16
 #vertical-tabs-newtab-button {
   appearance: none;
   min-height: var(--tab-min-height);
-@@ -2100,7 +2091,7 @@ tab-group {
+@@ -2139,7 +2130,7 @@ tab-group {
   margin-inline: var(--tab-inner-inline-margin);
 
   #tabbrowser-tabs[orient="vertical"]:not([expanded]) & > .toolbarbutton-text {
@@ -132,7 +120,7 @@ index 203b546933842f4b0134188fda020c4db4dcd0d2..0d67deabac2984574636248a16e58d16
   }
 
   &:hover {
-@@ -2124,7 +2115,7 @@ tab-group {
+@@ -2163,7 +2154,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.
  */
@@ -141,7 +129,7 @@ index 203b546933842f4b0134188fda020c4db4dcd0d2..0d67deabac2984574636248a16e58d16
   margin-block: var(--tab-block-margin);
 }
 
-@@ -2312,7 +2303,6 @@ tab-group {
+@@ -2351,7 +2342,6 @@ tab-group {
 
   &:not([expanded]) {
     .tabbrowser-tab[pinned] {
@@ -149,7 +137,7 @@ index 203b546933842f4b0134188fda020c4db4dcd0d2..0d67deabac2984574636248a16e58d16
     }
 
     .tab-background {
-@@ -2352,8 +2342,8 @@ tab-group {
+@@ -2391,8 +2381,8 @@ tab-group {
       display: block;
       position: absolute;
       inset: auto;
@@ -160,17 +148,17 @@ index 203b546933842f4b0134188fda020c4db4dcd0d2..0d67deabac2984574636248a16e58d16
 
       &:-moz-window-inactive {
         background-image:
-@@ -2438,9 +2428,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 {
-  border-inline-start: var(--tabstrip-inner-border);
-  padding-inline-start: 2px;
-  margin-inline-start: 2px;
+@@ -2480,9 +2470,6 @@ tab-group {
+   ~ #tabbrowser-tabs[orient="horizontal"]::before {
+     display: flex;
+     content: "";
+-    border-inline-start: var(--tabstrip-inner-border);
+-    padding-inline-start: 2px;
+-    margin-inline-start: 2px;
+   }
 }
 
- :root[privatebrowsingmode] :is(#firefox-view-button, #menu_openFirefoxView) {
-@@ -2472,7 +2459,6 @@ toolbar:not(#TabsToolbar) #firefox-view-button {
+@@ -2515,7 +2502,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 8c02df47ca003fa5094de0e7802cd8c10ef1bf2a..a16e8d7d3a00af8df648946950b7bb1c3f30efbb 100644
+index 829501008d7b6fd6bddf899f3cf599a68ff216a0..cbdc770d56c4053d0b9afc13322f072c3376eb30 100644
 --- a/browser/themes/shared/toolbarbuttons.css
 +++ b/browser/themes/shared/toolbarbuttons.css
@@ -13,20 +13,6 @@
@@ -23,7 +23,7 @@ index 8c02df47ca003fa5094de0e7802cd8c10ef1bf2a..a16e8d7d3a00af8df648946950b7bb1c
   &:where([uidensity="compact"]) {
     --toolbarbutton-inner-padding: var(--toolbarbutton-inner-padding-compact);
     --bookmark-block-padding: 1px;
-@@ -65,9 +51,7 @@
+@@ -123,9 +109,7 @@
 #TabsToolbar {
   /* Override the inner padding to ensure the dimensions match the tabs, but also making sure
      different types of buttons (combined-buttons-dropmarker or text) still look correct. */
@@ -33,7 +33,7 @@ index 8c02df47ca003fa5094de0e7802cd8c10ef1bf2a..a16e8d7d3a00af8df648946950b7bb1c
 }
 
 /* Primary toolbar buttons */
-@@ -146,8 +130,8 @@ toolbar .toolbarbutton-1 {
+@@ -204,8 +188,8 @@ toolbar .toolbarbutton-1 {
 
   > .toolbarbutton-icon {
     /* horizontal padding + actual icon width */
@@ -44,7 +44,7 @@ index 8c02df47ca003fa5094de0e7802cd8c10ef1bf2a..a16e8d7d3a00af8df648946950b7bb1c
   }
 
   > .toolbarbutton-text {
-@@ -157,7 +141,7 @@ toolbar .toolbarbutton-1 {
+@@ -215,7 +199,7 @@ toolbar .toolbarbutton-1 {
      * height as the button icons and the same vertical padding, but as a minimum,
      * because otherwise an increase in text sizes would break things.
      */
@@ -53,7 +53,7 @@ index 8c02df47ca003fa5094de0e7802cd8c10ef1bf2a..a16e8d7d3a00af8df648946950b7bb1c
 
     @media (-moz-platform: macos) {
       padding-top: calc(var(--toolbarbutton-inner-padding) + 1px);
-@@ -277,7 +261,7 @@ toolbar .toolbaritem-combined-buttons {
+@@ -325,7 +309,7 @@ toolbar .toolbaritem-combined-buttons {
 #nav-bar-overflow-button {
   list-style-image: url("chrome://global/skin/icons/chevron.svg");
 
@@ -62,7 +62,7 @@ index 8c02df47ca003fa5094de0e7802cd8c10ef1bf2a..a16e8d7d3a00af8df648946950b7bb1c
     display: none;
   }
 
-@@ -487,7 +471,7 @@ toolbarbutton.bookmark-item:not(.subviewbutton) {
+@@ -535,7 +519,7 @@ toolbarbutton.bookmark-item:not(.subviewbutton) {
      */
     align-items: stretch;
     > .toolbarbutton-icon {
--- a/src/browser/themes/shared/urlbar-searchbar-css.patch
+++ b/src/browser/themes/shared/urlbar-searchbar-css.patch
@@ -1,17 +1,17 @@
 diff --git a/browser/themes/shared/urlbar-searchbar.css b/browser/themes/shared/urlbar-searchbar.css
-index 0ee35cfe67c9bce37a844d4b7d9715d4fb50f709..034cf876c8cef5a2b4c0ca5f209d127dbfc90b20 100644
+index 3f46c918e125f9531a536a09358c980b2c923864..cba6f00318ce5dc7b6717b6c9afd2ee916715f8f 100644
 --- a/browser/themes/shared/urlbar-searchbar.css
 +++ b/browser/themes/shared/urlbar-searchbar.css
-@@ -10,7 +10,7 @@
+@@ -11,7 +11,7 @@
   /* Usually we wouldn't need snapping border widths manually, but we use this
    * for other layout calculations too */
   --urlbar-container-border-width: max(env(hairline), round(down, 1px, env(hairline)));
 -  --urlbar-container-padding: round(up, 1px, env(hairline));
 +  --urlbar-container-padding: 2px;
-   --urlbar-container-border-padding: calc(var(--urlbar-container-border-width) + var(--urlbar-container-padding));
-   --urlbar-margin-inline: 5px;
-   --urlbar-padding-block: 4px;
-@@ -55,7 +55,7 @@ toolbar[inactive="true"] .urlbar,
+   --urlbar-container-inset: calc(var(--urlbar-container-border-width) + var(--urlbar-container-padding));
+ 
+   @media (max-width: 770px) {
+@@ -54,7 +54,7 @@ toolbar[inactive="true"] .urlbar,
 .urlbar:not([usertyping]) > .urlbar-input-container > .urlbar-go-button,
 .urlbar:not(#searchbar-new, [focused]) > .urlbar-input-container > .urlbar-go-button,
 #urlbar-revert-button-container {
@@ -20,18 +20,18 @@ index 0ee35cfe67c9bce37a844d4b7d9715d4fb50f709..034cf876c8cef5a2b4c0ca5f209d127d
 }
 
 /* Document Picture-in-Picture API window */
-@@ -200,6 +200,10 @@ toolbar[inactive="true"] .urlbar,
-   .urlbar:not([focused])[textoverflow="left"][domaindir="rtl"] > .urlbar-input-container > .urlbar-input-box > & {
+@@ -201,6 +201,10 @@ toolbar[inactive="true"] .urlbar,
     mask-image: linear-gradient(to right, transparent var(--urlbar-scheme-size), black calc(var(--urlbar-scheme-size) + 3ch));
   }
-+
+ 
 +  #navigator-toolbox[zen-has-implicit-hover="true"] .urlbar:not([focused])[textoverflow="left"] > .urlbar-input-container > .urlbar-input-box > & {
 +    mask-image: linear-gradient(to right, transparent, black 3ch, black calc(100% - 3ch), transparent);
 +  }
- }
- 
- #urlbar-scheme {
-@@ -333,10 +337,14 @@ toolbar[inactive="true"] .urlbar,
+
+   /* stylelint-disable-next-line media-query-no-invalid */
+   @media -moz-pref("browser.nova.enabled") {
+     &::selection {
+@@ -343,10 +347,14 @@ toolbar[inactive="true"] .urlbar,
 
 .urlbar[breakout][breakout-extend] {
   height: auto;
--- a/src/browser/themes/shared/urlbar/variables-css.patch
+++ b/src/browser/themes/shared/urlbar/variables-css.patch
@@ -1,7 +1,7 @@
-diff --git a/browser/themes/shared/urlbar-variables.css b/browser/themes/shared/urlbar-variables.css
-index 0710bcc11e8040750ff826e3d3551454fdad61c6..2be2fa3e386ad9d4296d73ee8814e09750382a0d 100644
--- a/browser/themes/shared/urlbar-variables.css
-+++ b/browser/themes/shared/urlbar-variables.css
+diff --git a/browser/themes/shared/urlbar/variables.css b/browser/themes/shared/urlbar/variables.css
+index 34ab3df5ed433dafed00799c902afc276a722862..1e71860631f33839bdc7e1ec3a1e877bef744b55 100644
+--- a/browser/themes/shared/urlbar/variables.css
+++ b/browser/themes/shared/urlbar/variables.css
@@ -9,7 +9,7 @@
 :root {
   --identity-box-margin-inline: 4px;
--- a/src/browser/themes/shared/urlbar/view-proton-css.patch
+++ b/src/browser/themes/shared/urlbar/view-proton-css.patch
@@ -0,0 +1,21 @@
+diff --git a/browser/themes/shared/urlbar/view-proton.css b/browser/themes/shared/urlbar/view-proton.css
+index 9e041b67988f590bdbea48514937b1fa25c9785c..05507782b91858dff3e181843314af7956528ba9 100644
+--- a/browser/themes/shared/urlbar/view-proton.css
+++ b/browser/themes/shared/urlbar/view-proton.css
+@@ -14,7 +14,7 @@
+ 
+   --urlbarView-small-font-size: 0.85em;
+ 
+-  --urlbarView-results-padding: 7px;
+  --urlbarView-results-padding: 8px;
+   --urlbarView-row-gutter: var(--space-xxsmall);
+   --urlbarView-item-inline-padding: var(--urlbar-icon-padding);
+   --urlbarView-item-block-padding: 6px;
+@@ -168,7 +168,6 @@
+       min-height: 32px;
+     }
+     :root[uidensity="touch"] & {
+-      padding-block: 11px;
+     }
+   }
+ 
--- a/src/browser/themes/shared/urlbarView-css.patch
+++ b/src/browser/themes/shared/urlbarView-css.patch
@@ -1,21 +0,0 @@
-diff --git a/browser/themes/shared/urlbarView.css b/browser/themes/shared/urlbarView.css
-index 2d6a63328642969e23da0a41ca6c7bb23eb96e8e..3060ba3f52ae7ab2f8fc36ff546d358724909b3e 100644
--- a/browser/themes/shared/urlbarView.css
-+++ b/browser/themes/shared/urlbarView.css
-@@ -21,7 +21,7 @@
- 
-   --urlbarView-small-font-size: 0.85em;
- 
-  --urlbarView-results-padding: 7px;
-+  --urlbarView-results-padding: 8px;
-   --urlbarView-row-gutter: 2px;
-   --urlbarView-item-inline-padding: var(--urlbar-icon-padding);
-   --urlbarView-item-block-padding: 6px;
-@@ -172,7 +172,6 @@
-       min-height: 32px;
-     }
-     :root[uidensity="touch"] & {
-      padding-block: 11px;
-     }
-   }
- 
--- 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 eca9fcfb453c6cf41c0a24f2775ad7bcf4678153..b7b609138a12695ff90663a707a7d985f9efb81a 100644
+index 039cd084f23ef27eb4a1d359c8caca690eb75eb5..432302ce8d29de1836aaf0a756b3aa0ebc86562a 100644
 --- a/browser/themes/windows/browser.css
 +++ b/browser/themes/windows/browser.css
@@ -41,7 +41,6 @@
--- a/src/build/moz-build.patch
+++ b/src/build/moz-build.patch
@@ -1,8 +1,8 @@
 diff --git a/build/moz.build b/build/moz.build
-index 238caa7801292926db83b0ad4791b0400d30cba5..87bd7c541cdce8562ce6999e0b59fb5698348699 100644
+index 60cf9a852efa695e09a324d8b2f291c8b43710d6..357f9549ac5a24cd5586dbf42437ba03ba6bc195 100644
 --- a/build/moz.build
 +++ b/build/moz.build
-@@ -91,7 +91,7 @@ if CONFIG["MOZ_APP_BASENAME"]:
+@@ -92,7 +92,7 @@ if CONFIG["MOZ_APP_BASENAME"]:
         if CONFIG[var]:
             appini_defines[var] = True
 
--- a/src/devtools/startup/DevToolsStartup-sys-mjs.patch
+++ b/src/devtools/startup/DevToolsStartup-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/devtools/startup/DevToolsStartup.sys.mjs b/devtools/startup/DevToolsStartup.sys.mjs
-index d6428524107325bc6680947f45a890991936cad4..9dd68c54b72ee17ba2cc998634b38b6155b8b388 100644
+index d604d0e00c623026928d72b1bcb1ce82e6bb6d4a..e3341c9ffc6db9b4bf360445ea031fc558e6076b 100644
 --- a/devtools/startup/DevToolsStartup.sys.mjs
 +++ b/devtools/startup/DevToolsStartup.sys.mjs
@@ -836,6 +836,9 @@ export class DevToolsStartup {
--- a/src/docshell/base/BrowsingContext-h.patch
+++ b/src/docshell/base/BrowsingContext-h.patch
@@ -1,8 +1,8 @@
 diff --git a/docshell/base/BrowsingContext.h b/docshell/base/BrowsingContext.h
-index dc64d5c13628cb7393705ebf96110705b045471f..497c2e646e2bde4d7732fa28efe7496264d58fa0 100644
+index 4e20d7b602932621baf9082f6d28911701b7aa5b..8a59b81f0c82c94bac9d5c536a4b12f69f260dcf 100644
 --- a/docshell/base/BrowsingContext.h
 +++ b/docshell/base/BrowsingContext.h
-@@ -263,6 +263,8 @@ struct EmbedderColorSchemes {
+@@ -265,6 +265,8 @@ struct EmbedderColorSchemes {
   FIELD(HistoryEntryCount, uint32_t)                                          \
   FIELD(HasRestoreData, bool)                                                 \
   FIELD(SessionStoreEpoch, uint32_t)                                          \
@@ -11,7 +11,7 @@ index dc64d5c13628cb7393705ebf96110705b045471f..497c2e646e2bde4d7732fa28efe74962
   /* Whether we can execute scripts in this BrowsingContext. Has no effect    \
    * unless scripts are also allowed in the parent WindowContext. */          \
   FIELD(AllowJavascript, bool)                                                \
-@@ -674,6 +676,8 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
+@@ -680,6 +682,8 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
 
   bool FullscreenAllowed() const;
 
@@ -20,7 +20,7 @@ index dc64d5c13628cb7393705ebf96110705b045471f..497c2e646e2bde4d7732fa28efe74962
   float FullZoom() const { return GetFullZoom(); }
   float TextZoom() const { return GetTextZoom(); }
 
-@@ -1274,6 +1278,8 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
+@@ -1284,6 +1288,8 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
   }
 
   void DidSet(FieldIndex<IDX_SessionStoreEpoch>, uint32_t aOldValue);
--- a/src/docshell/base/nsAboutRedirector-cpp.patch
+++ b/src/docshell/base/nsAboutRedirector-cpp.patch
@@ -1,5 +1,5 @@
 diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp
-index 76f707e5f1e8e20a6acec9a445781377c052ba59..4f8f14deace21ff56157b77c15bcb93e1792e354 100644
+index 9f6fc3eac6f20aedeb993306818fc536f5ce851a..7269a78061f4be829acd2e1b053565b2f945cb54 100644
 --- a/docshell/base/nsAboutRedirector.cpp
 +++ b/docshell/base/nsAboutRedirector.cpp
@@ -115,7 +115,7 @@ static const RedirEntry kRedirMap[] = {
--- a/src/dom/base/Document-cpp.patch
+++ b/src/dom/base/Document-cpp.patch
@@ -1,8 +1,8 @@
 diff --git a/dom/base/Document.cpp b/dom/base/Document.cpp
-index 178078c084aad367f0e5d50e50f981ded24ae43e..e551dc7677e43c8ab179babdcbc6dd05aa962727 100644
+index f5dc958b940b806cc471760ce91a26b1111aafa5..d6841cbef64374d14bc2941651e33669c28e2958 100644
 --- a/dom/base/Document.cpp
 +++ b/dom/base/Document.cpp
-@@ -463,6 +463,7 @@
+@@ -465,6 +465,7 @@
 #include "prtime.h"
 #include "prtypes.h"
 #include "xpcpublic.h"
@@ -10,7 +10,7 @@ index 178078c084aad367f0e5d50e50f981ded24ae43e..e551dc7677e43c8ab179babdcbc6dd05
 
 // clang-format off
 #include "mozilla/Encoding.h"
-@@ -3279,6 +3280,10 @@ void Document::FillStyleSetUserAndUASheets() {
+@@ -3275,6 +3276,10 @@ void Document::FillStyleSetUserAndUASheets() {
   for (StyleSheet* sheet : *sheetService->UserStyleSheets()) {
     styleSet.AppendStyleSheet(*sheet);
   }
--- a/src/dom/chrome-webidl/BrowsingContext-webidl.patch
+++ b/src/dom/chrome-webidl/BrowsingContext-webidl.patch
@@ -1,8 +1,8 @@
 diff --git a/dom/chrome-webidl/BrowsingContext.webidl b/dom/chrome-webidl/BrowsingContext.webidl
-index 3bb17157c1dba1ca75ad9cfee2c21fcafb2dd0ee..a43f8aa1e4c808418f1cc7ccc69ced12c9ebfef0 100644
+index 43f28a6aad9d0dd3e3c908e8472244fc6aa32a74..60bfd83a9da2923ab3811f363320db474323e636 100644
 --- a/dom/chrome-webidl/BrowsingContext.webidl
 +++ b/dom/chrome-webidl/BrowsingContext.webidl
-@@ -169,6 +169,9 @@ interface BrowsingContext {
+@@ -179,6 +179,9 @@ interface BrowsingContext {
 
   [SetterThrows] attribute float textZoom;
 
--- a/src/dom/media/mediaelement/HTMLMediaElement-cpp.patch
+++ b/src/dom/media/mediaelement/HTMLMediaElement-cpp.patch
@@ -1,8 +1,8 @@
 diff --git a/dom/media/mediaelement/HTMLMediaElement.cpp b/dom/media/mediaelement/HTMLMediaElement.cpp
-index df8c9441463e8c08e3f3d21a194df850bd418b67..3fd83aff3a7cc2ff6b9c889c5126befa99a91436 100644
+index 6ea902b7423bb105f23c0cd2092c40938174e4a3..9a1fe4b3fabc23022bb17ffa801d48cd1e6a5b60 100644
 --- a/dom/media/mediaelement/HTMLMediaElement.cpp
 +++ b/dom/media/mediaelement/HTMLMediaElement.cpp
-@@ -449,6 +449,7 @@ class HTMLMediaElement::MediaControlKeyListener final
+@@ -450,6 +450,7 @@ class HTMLMediaElement::MediaControlKeyListener final
     // audible state. Therefore, in that case we would noitfy the audible state
     // when media starts playing.
     if (mState == MediaPlaybackState::ePlayed) {
@@ -10,7 +10,7 @@ index df8c9441463e8c08e3f3d21a194df850bd418b67..3fd83aff3a7cc2ff6b9c889c5126befa
       NotifyAudibleStateChanged(mIsOwnerAudible
                                     ? MediaAudibleState::eAudible
                                     : MediaAudibleState::eInaudible);
-@@ -7444,6 +7445,9 @@ void HTMLMediaElement::FireTimeUpdate(TimeupdateType aType) {
+@@ -7442,6 +7443,9 @@ void HTMLMediaElement::FireTimeUpdate(TimeupdateType aType) {
     QueueTask(std::move(runner));
     mQueueTimeUpdateRunnerTime = TimeStamp::Now();
     mLastCurrentTime = CurrentTime();
--- a/src/eslint-ignores-config-mjs.patch
+++ b/src/eslint-ignores-config-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/eslint-ignores.config.mjs b/eslint-ignores.config.mjs
-index bfb30a0a35af081a2496a05fd78d9efea15ee37f..04fee66309192b3e38986ae09e77ec7a4e1ad83b 100644
+index cad7ef0ef8890ee4af411fdbfa59419c5931388c..0bbded34c89004727ce9893d17bbdacc1fdc2517 100644
 --- a/eslint-ignores.config.mjs
 +++ b/eslint-ignores.config.mjs
-@@ -314,4 +314,8 @@ export default [
+@@ -307,4 +307,8 @@ export default [
   "dom/base/test/jsmodules/import_circular_1.mjs",
   "dom/base/test/jsmodules/importmaps/multiple/import_circular.mjs",
   "dom/base/test/jsmodules/importmaps/multiple/import_circular_1.mjs",
--- a/src/external-patches/firefox/allow_backdrop_to_work_on_transparency.patch
+++ b/src/external-patches/firefox/allow_backdrop_to_work_on_transparency.patch
@@ -38,11 +38,11 @@ diff --git a/gfx/webrender_bindings/src/bindings.rs b/gfx/webrender_bindings/src
         max_shared_surface_size,
         enable_dithering,
 +        opaque_backdrop_fallback,
-         precise_linear_gradients,
         ..Default::default()
     };
 
     let window_size = DeviceIntSize::new(window_width, window_height);
+     let notifier = Box::new(CppNotifier { window_id });
 diff --git a/gfx/wr/webrender/src/device/gl.rs b/gfx/wr/webrender/src/device/gl.rs
 --- a/gfx/wr/webrender/src/device/gl.rs
 +++ b/gfx/wr/webrender/src/device/gl.rs
@@ -73,8 +73,8 @@ diff --git a/gfx/wr/webrender/src/renderer/init.rs b/gfx/wr/webrender/src/render
 +    /// See explanation of `gfx.webrender.opaque-backdrop-fallback`.
 +    pub opaque_backdrop_fallback: bool,
 
-     /// Use a more precise method for sampling gradients.
-     pub precise_linear_gradients: bool,
+     /// Use the new quad primitive path for box-shadow blur rendering.
+     pub use_quad_box_shadow: bool,
 }
 
@@ -277,10 +279,11 @@
@@ -84,7 +84,7 @@ diff --git a/gfx/wr/webrender/src/renderer/init.rs b/gfx/wr/webrender/src/render
             max_shared_surface_size: 2048,
             enable_debugger: true,
 +            opaque_backdrop_fallback: false,
-             precise_linear_gradients: false,
+             use_quad_box_shadow: true,
         }
     }
 }
--- a/src/external-patches/firefox/native_macos_popovers/D284084.patch
+++ b/src/external-patches/firefox/native_macos_popovers/D284084.patch
@@ -168,9 +168,9 @@ diff --git a/toolkit/themes/shared/global-shared.css b/toolkit/themes/shared/glo
 --- a/toolkit/themes/shared/global-shared.css
 +++ b/toolkit/themes/shared/global-shared.css
@@ -72,10 +72,22 @@
-   --menuitem-border-radius: var(--arrowpanel-menuitem-border-radius);
-   --menuitem-padding: var(--arrowpanel-menuitem-padding);
-   --menuitem-margin: var(--arrowpanel-menuitem-margin);
+   --menuitem-border-radius: var(--panel-menuitem-border-radius);
+   --menuitem-padding: var(--panel-menuitem-padding);
+   --menuitem-margin: var(--panel-menuitem-margin);
 }
 
 +/* stylelint-disable-next-line media-query-no-invalid */
--- a/src/external-patches/firefox/session_store_use_size_hint/D247145.patch
+++ b/src/external-patches/firefox/session_store_use_size_hint/D247145.patch
@@ -1,61 +0,0 @@
-diff --git a/js/public/JSON.h b/js/public/JSON.h
--- a/js/public/JSON.h
-+++ b/js/public/JSON.h
-@@ -24,16 +24,23 @@
-  * writing stringified data by exactly one call of |callback|, passing |data| as
-  * argument.
-  *
-  * In cases where JSON.stringify would return undefined, this function calls
-  * |callback| with the string "null".
-+ *
-+ * If a length hint is passed, space will be reserved for at least that many
-+ * characters.
-  */
- extern JS_PUBLIC_API bool JS_Stringify(JSContext* cx,
-                                        JS::MutableHandle<JS::Value> value,
-                                        JS::Handle<JSObject*> replacer,
-                                        JS::Handle<JS::Value> space,
-                                        JSONWriteCallback callback, void* data);
-+extern JS_PUBLIC_API bool JS_StringifyWithLengthHint(
-+    JSContext* cx, JS::MutableHandle<JS::Value> value,
-+    JS::Handle<JSObject*> replacer, JS::Handle<JS::Value> space,
-+    JSONWriteCallback callback, void* data, size_t lengthHint);
- 
- namespace JS {
- 
- /**
-  * An API akin to JS_Stringify but with the goal of not having observable
-diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
--- a/js/src/jsapi.cpp
-+++ b/js/src/jsapi.cpp
-@@ -3663,17 +3663,29 @@
- }
- 
- JS_PUBLIC_API bool JS_Stringify(JSContext* cx, MutableHandleValue vp,
-                                 HandleObject replacer, HandleValue space,
-                                 JSONWriteCallback callback, void* data) {
-+  return JS_StringifyWithLengthHint(cx, vp, replacer, space, callback, data, 0);
-+}
-+
-+JS_PUBLIC_API bool JS_StringifyWithLengthHint(JSContext* cx,
-+                                              MutableHandleValue vp,
-+                                              HandleObject replacer,
-+                                              HandleValue space,
-+                                              JSONWriteCallback callback,
-+                                              void* data, size_t lengthHint) {
-   AssertHeapIsIdle();
-   CHECK_THREAD(cx);
-   cx->check(replacer, space);
-   StringBuilder sb(cx);
-   if (!sb.ensureTwoByteChars()) {
-     return false;
-   }
-+  if (lengthHint && !sb.reserve(lengthHint)) {
-+    return false;
-+  }
-   if (!Stringify(cx, vp, replacer, space, sb, StringifyBehavior::Normal)) {
-     return false;
-   }
-   if (sb.empty() && !sb.append(cx->names().null)) {
-     return false;
-
--- a/src/external-patches/firefox/session_store_use_size_hint/D247215.patch
+++ b/src/external-patches/firefox/session_store_use_size_hint/D247215.patch
@@ -0,0 +1,251 @@
+diff --git a/dom/chrome-webidl/IOUtils.webidl b/dom/chrome-webidl/IOUtils.webidl
+--- a/dom/chrome-webidl/IOUtils.webidl
+++ b/dom/chrome-webidl/IOUtils.webidl
+@@ -93,23 +93,23 @@
+    *         otherwise rejects with a DOMException.
+    */
+   [NewObject]
+   Promise<unsigned long long> writeUTF8(DOMString path, UTF8String string, optional WriteOptions options = {});
+   /**
+-   * Attempts to serialize |value| into a JSON string and encode it as into a
+-   * UTF-8 string, then safely write the result to a file at |path|. Works
+-   * exactly like |write|.
+   * Attempts to serialize |value| into a JSON string and encode it as a UTF-8
+   * string, then safely write the result to a file at |path|. Works exactly
+   * like |write|.
+    *
+    * @param path      An absolute file path
+    * @param value     The value to be serialized.
+    * @param options   Options for writing the file. The "append" mode is not supported.
+    *
+    * @return Resolves with the number of bytes successfully written to the file,
+    *         otherwise rejects with a DOMException.
+    */
+   [NewObject]
+-  Promise<unsigned long long> writeJSON(DOMString path, any value, optional WriteOptions options = {});
+  Promise<WriteJSONResult> writeJSON(DOMString path, any value, optional WriteJSONOptions options = {});
+   /**
+    * Moves the file from |sourcePath| to |destPath|, creating necessary parents.
+    * If |destPath| is a directory, then the source file will be moved into the
+    * destination directory.
+    *
+@@ -566,10 +566,39 @@
+    * If true, compress the data with LZ4-encoding before writing to the file.
+    */
+   boolean compress = false;
+ };
+ 
+/**
+ * Options to be passed to the |IOUtils.writeJSON| method.
+ */
+dictionary WriteJSONOptions: WriteOptions {
+  /**
+   * An optional length hint that will be used to pre-allocate the buffer that
+   * will hold the stringified JSON.
+   *
+   * This is the *length* and not the size (i.e., it is the number of UTF-16
+   * codepoints and not the number of bytes).
+   */
+  unsigned long long lengthHint = 0;
+};
+
+/**
+ * Information about a WriteJSON operation.
+ */
+dictionary WriteJSONResult {
+  /**
+   * The number of bytes written.
+   */
+  required unsigned long long size;
+
+  /**
+   * The length of the stringified JSON (in UTF-16 codepoints).
+   */
+  required unsigned long long jsonLength;
+};
+
+ /**
+  * Options to be passed to the |IOUtils.move| method.
+  */
+ dictionary MoveOptions {
+   /**
+diff --git a/xpcom/ioutils/IOUtils.h b/xpcom/ioutils/IOUtils.h
+--- a/xpcom/ioutils/IOUtils.h
+++ b/xpcom/ioutils/IOUtils.h
+@@ -92,11 +92,11 @@
+       const nsACString& aString, const dom::WriteOptions& aOptions,
+       ErrorResult& aError);
+ 
+   static already_AddRefed<dom::Promise> WriteJSON(
+       dom::GlobalObject& aGlobal, const nsAString& aPath,
+-      JS::Handle<JS::Value> aValue, const dom::WriteOptions& aOptions,
+      JS::Handle<JS::Value> aValue, const dom::WriteJSONOptions& aOptions,
+       ErrorResult& aError);
+ 
+   static already_AddRefed<dom::Promise> Move(dom::GlobalObject& aGlobal,
+                                              const nsAString& aSourcePath,
+                                              const nsAString& aDestPath,
+@@ -734,13 +734,16 @@
+   RefPtr<nsIFile> mBackupFile;
+   RefPtr<nsIFile> mTmpFile;
+   dom::WriteMode mMode;
+   bool mFlush = false;
+   bool mCompress = false;
+  size_t mLengthHint = 0;
+ 
+   static Result<InternalWriteOpts, IOUtils::IOError> FromBinding(
+       const dom::WriteOptions& aOptions);
+  static Result<InternalWriteOpts, IOUtils::IOError> FromBinding(
+      const dom::WriteJSONOptions& aOptions);
+ };
+ 
+ /**
+  * Re-implements the file compression and decompression utilities found
+  * in toolkit/components/lz4/lz4.js
+diff --git a/xpcom/ioutils/IOUtils.cpp b/xpcom/ioutils/IOUtils.cpp
+--- a/xpcom/ioutils/IOUtils.cpp
+++ b/xpcom/ioutils/IOUtils.cpp
+@@ -587,15 +587,21 @@
+               return WriteSync(file, AsBytes(Span(str)), opts);
+             });
+       });
+ }
+ 
+static bool AppendJSON(const char16_t* aBuf, uint32_t aLen, void* aStr) {
+  nsAString* str = static_cast<nsAString*>(aStr);
+
+  return str->Append(aBuf, aLen, fallible);
+}
+
+ /* static */
+ already_AddRefed<Promise> IOUtils::WriteJSON(GlobalObject& aGlobal,
+                                              const nsAString& aPath,
+                                              JS::Handle<JS::Value> aValue,
+-                                             const WriteOptions& aOptions,
+                                             const WriteJSONOptions& aOptions,
+                                              ErrorResult& aError) {
+   return WithPromiseAndState(
+       aGlobal, aError, [&](Promise* promise, auto& state) {
+         nsCOMPtr<nsIFile> file = new nsLocalFile();
+         REJECT_IF_INIT_PATH_FAILED(file, aPath, promise,
+@@ -621,14 +627,15 @@
+                               file->HumanReadablePath().get()));
+           return;
+         }
+ 
+         JSContext* cx = aGlobal.Context();
+-        JS::Rooted<JS::Value> rootedValue(cx, aValue);
+        JS::Rooted<JS::Value> value(cx, aValue);
+         nsString string;
+-        if (!nsContentUtils::StringifyJSON(cx, aValue, string,
+-                                           UndefinedIsNullStringLiteral)) {
+        if (!JS_StringifyWithLengthHint(cx, &value, nullptr,
+                                        JS::NullHandleValue, AppendJSON,
+                                        &string, opts.mLengthHint)) {
+           JS::Rooted<JS::Value> exn(cx, JS::UndefinedValue());
+           if (JS_GetPendingException(cx, &exn)) {
+             JS_ClearPendingException(cx);
+             promise->MaybeReject(exn);
+           } else {
+@@ -637,22 +644,29 @@
+                                     "Could not serialize object to JSON"_ns));
+           }
+           return;
+         }
+ 
+-        DispatchAndResolve<uint32_t>(
+        DispatchAndResolve<dom::WriteJSONResult>(
+             state->mEventQueue, promise,
+             [file = std::move(file), string = std::move(string),
+-             opts = std::move(opts)]() -> Result<uint32_t, IOError> {
+             opts = std::move(opts)]() -> Result<WriteJSONResult, IOError> {
+               nsAutoCString utf8Str;
+               if (!CopyUTF16toUTF8(string, utf8Str, fallible)) {
+                 return Err(IOError(
+                     NS_ERROR_OUT_OF_MEMORY,
+                     "Failed to write to `%s': could not allocate buffer",
+                     file->HumanReadablePath().get()));
+               }
+-              return WriteSync(file, AsBytes(Span(utf8Str)), opts);
+
+              uint32_t size =
+                  MOZ_TRY(WriteSync(file, AsBytes(Span(utf8Str)), opts));
+
+              dom::WriteJSONResult result;
+              result.mSize = size;
+              result.mJsonLength = static_cast<uint32_t>(string.Length());
+              return result;
+             });
+       });
+ }
+ 
+ /* static */
+@@ -2838,10 +2852,20 @@
+ 
+   opts.mCompress = aOptions.mCompress;
+   return opts;
+ }
+ 
+Result<IOUtils::InternalWriteOpts, IOUtils::IOError>
+IOUtils::InternalWriteOpts::FromBinding(const WriteJSONOptions& aOptions) {
+  InternalWriteOpts opts =
+      MOZ_TRY(FromBinding(static_cast<const WriteOptions&>(aOptions)));
+
+  opts.mLengthHint = aOptions.mLengthHint;
+
+  return opts;
+}
+
+ /* static */
+ Result<IOUtils::JsBuffer, IOUtils::IOError> IOUtils::JsBuffer::Create(
+     IOUtils::BufferKind aBufferKind, size_t aCapacity) {
+   JsBuffer buffer(aBufferKind, aCapacity);
+   if (aCapacity != 0 && !buffer.mBuffer) {
+diff --git a/xpcom/ioutils/tests/test_ioutils_read_write_json.html b/xpcom/ioutils/tests/test_ioutils_read_write_json.html
+--- a/xpcom/ioutils/tests/test_ioutils_read_write_json.html
+++ b/xpcom/ioutils/tests/test_ioutils_read_write_json.html
+@@ -140,10 +140,43 @@
+       );
+ 
+       await cleanup(filename);
+     });
+ 
+    add_task(async function test_writeJSON_return() {
+      const filename = PathUtils.join(PathUtils.tempDir, "test_ioutils_writeJSON_return.tmp");
+
+      const obj = { emoji: "☕️ ⚧️ 😀 🖖🏿 🤠 🏳️‍🌈 🥠 🏴‍☠️ 🪐" };
+
+      const expectedJson = JSON.stringify(obj);
+      const size = new TextEncoder().encode(expectedJson).byteLength;
+
+      {
+        const result = await IOUtils.writeJSON(filename, obj, { lengthHint: 0 });
+
+        is(await IOUtils.readUTF8(filename), expectedJson, "should have written expected JSON");
+
+        is(typeof result, "object", "writeJSON returns an object");
+        ok(result !== null, "writeJSON returns non-null");
+
+        ok(Object.hasOwn(result, "size"), "result has size property");
+        ok(Object.hasOwn(result, "jsonLength"), "result has jsonLength property");
+
+        is(result.size, size, "Should have written the expected number of bytes");
+        is(result.jsonLength, expectedJson.length, "Should have written the expected number of UTF-16 codepoints");
+      }
+
+      {
+        const result = await IOUtils.writeJSON(filename, obj, { lengthHint: expectedJson.length, compress: true });
+
+        isnot(result.size, size, "Should have written a different number of bytes due to compression");
+        is(result.jsonLength, expectedJson.length, "Should have written the same number of UTF-16 codepoints");
+      }
+
+      await cleanup(filename);
+    });
+
+     add_task(async function test_append_json() {
+       const filename = PathUtils.join(PathUtils.tempDir, "test_ioutils_append_json.tmp");
+ 
+       await IOUtils.writeJSON(filename, OBJECT);
+ 
+
--- a/src/external-patches/firefox/session_store_use_size_hint/D298708.patch
+++ b/src/external-patches/firefox/session_store_use_size_hint/D298708.patch
@@ -214,7 +214,7 @@ diff --git a/dom/chrome-webidl/IOUtils.webidl b/dom/chrome-webidl/IOUtils.webidl
 +   *         bytes (UTF-8), otherwise rejects with a DOMException.
    */
   [NewObject]
-   Promise<unsigned long long> writeJSON(DOMString path, any value, optional WriteOptions options = {});
+   Promise<WriteJSONResult> writeJSON(DOMString path, any value, optional WriteJSONOptions options = {});
   /**
    * Moves the file from |sourcePath| to |destPath|, creating necessary parents.
@@ -564,10 +564,16 @@
@@ -232,49 +232,23 @@ diff --git a/dom/chrome-webidl/IOUtils.webidl b/dom/chrome-webidl/IOUtils.webidl
 };
 
 /**
-  * Options to be passed to the |IOUtils.move| method.
+  * Options to be passed to the |IOUtils.writeJSON| method.
  */
 diff --git a/xpcom/ioutils/IOUtils.cpp b/xpcom/ioutils/IOUtils.cpp
 --- a/xpcom/ioutils/IOUtils.cpp
 +++ b/xpcom/ioutils/IOUtils.cpp
-@@ -622,13 +622,22 @@
-           return;
+@@ -629,10 +629,13 @@
         }
 
         JSContext* cx = aGlobal.Context();
-         JS::Rooted<JS::Value> rootedValue(cx, aValue);
-+        size_t lengthHint = aOptions.mJsonLengthHint;
+         JS::Rooted<JS::Value> value(cx, aValue);
         nsString string;
-        if (!nsContentUtils::StringifyJSON(cx, aValue, string,
-                                           UndefinedIsNullStringLiteral)) {
-+        if (lengthHint) {
-+          string.SetCapacity(lengthHint);
+        if (opts.mLengthHint) {
+          string.SetCapacity(opts.mLengthHint);
 +        }
-+        if (!JS_StringifyWithLengthHint(
-+                cx, &rootedValue, nullptr, JS::NullHandleValue,
-+                [](const char16_t* aBuf, uint32_t aLen, void* aData) -> bool {
-+                  return static_cast<nsAString*>(aData)->Append(aBuf, aLen,
-+                                                                fallible);
-+                },
-+                &string, lengthHint)) {
+         if (!JS_StringifyWithLengthHint(cx, &value, nullptr,
+                                         JS::NullHandleValue, AppendJSON,
+                                         &string, opts.mLengthHint)) {
           JS::Rooted<JS::Value> exn(cx, JS::UndefinedValue());
           if (JS_GetPendingException(cx, &exn)) {
-             JS_ClearPendingException(cx);
-             promise->MaybeReject(exn);
-           } else {
-@@ -648,11 +657,13 @@
-                 return Err(IOError(
-                     NS_ERROR_OUT_OF_MEMORY,
-                     "Failed to write to `%s': could not allocate buffer",
-                     file->HumanReadablePath().get()));
-               }
-              return WriteSync(file, AsBytes(Span(utf8Str)), opts);
-+              uint32_t uncompressedSize = utf8Str.Length();
-+              MOZ_TRY(WriteSync(file, AsBytes(Span(utf8Str)), opts));
-+              return uncompressedSize;
-             });
-       });
- }
- 
- /* static */

--- a/src/external-patches/manifest.json
+++ b/src/external-patches/manifest.json
@@ -66,7 +66,7 @@
  {
    "type": "phabricator",
    "ids": [
-      "D247145",
+      "D247215",
      "D298708"
    ],
    "name": "Session store use size hint"
--- a/src/gfx/layers/AnimationInfo-cpp.patch
+++ b/src/gfx/layers/AnimationInfo-cpp.patch
@@ -1,8 +1,8 @@
 diff --git a/gfx/layers/AnimationInfo.cpp b/gfx/layers/AnimationInfo.cpp
-index dd67af463d383dd98da80ce44f41b395e4a9a7cf..9da3849630a80fea2b254659a218e5ed38b44bc0 100644
+index 1d330056bd7a4e89aac5e5296a3c164fb42b5c42..ef112715580b6bb7238e8f37bbe3133e187685dc 100644
 --- a/gfx/layers/AnimationInfo.cpp
 +++ b/gfx/layers/AnimationInfo.cpp
-@@ -16,6 +16,7 @@
+@@ -14,6 +14,7 @@
 #include "mozilla/MotionPathUtils.h"
 #include "mozilla/PresShell.h"
 #include "mozilla/ScrollContainerFrame.h"
@@ -10,7 +10,7 @@ index dd67af463d383dd98da80ce44f41b395e4a9a7cf..9da3849630a80fea2b254659a218e5ed
 #include "nsIContent.h"
 #include "nsLayoutUtils.h"
 #include "nsRefreshDriver.h"
-@@ -344,7 +345,7 @@ static void SetAnimatable(NonCustomCSSPropertyId aProperty,
+@@ -343,7 +344,7 @@ static void SetAnimatable(NonCustomCSSPropertyId aProperty,
       // resolve currentColor at this moment.
       nscolor foreground =
           aFrame->Style()->GetVisitedDependentColor(&nsStyleText::mColor);
--- a/src/layout/base/PresShell-cpp.patch
+++ b/src/layout/base/PresShell-cpp.patch
@@ -1,8 +1,8 @@
 diff --git a/layout/base/PresShell.cpp b/layout/base/PresShell.cpp
-index dd4df91b14137c2aa1ffd978faf1f4c91e234f8a..99976e9416d8a5b814bbb3a5421899f450ceeee5 100644
+index b5930f71e362eb78f74888e1b33b2a6f9dbb4ea4..dc1ba0b462402f62e47fcb32e2d7cd1a671a7fd8 100644
 --- a/layout/base/PresShell.cpp
 +++ b/layout/base/PresShell.cpp
-@@ -136,6 +136,7 @@
+@@ -135,6 +135,7 @@
 #include "mozilla/layers/WebRenderLayerManager.h"
 #include "mozilla/layers/WebRenderUserData.h"
 #include "mozilla/layout/ScrollAnchorContainer.h"
@@ -10,7 +10,7 @@ index dd4df91b14137c2aa1ffd978faf1f4c91e234f8a..99976e9416d8a5b814bbb3a5421899f4
 #include "nsAnimationManager.h"
 #include "nsAutoLayoutPhase.h"
 #include "nsCOMArray.h"
-@@ -5546,7 +5547,7 @@ nscolor PresShell::GetDefaultBackgroundColorToDraw() const {
+@@ -5572,7 +5573,7 @@ nscolor PresShell::GetDefaultBackgroundColorToDraw() const {
   if (!mPresContext) {
     return NS_RGB(255, 255, 255);
   }
--- a/src/layout/generic/ViewportFrame-cpp.patch
+++ b/src/layout/generic/ViewportFrame-cpp.patch
@@ -1,8 +1,8 @@
 diff --git a/layout/generic/ViewportFrame.cpp b/layout/generic/ViewportFrame.cpp
-index ea018fff9f549cd8e07b20f4c8073391a6fdf40d..acb9428cf2276ed04064484600024d9e2c7e2bb7 100644
+index 9d1c25c3834da50fd7dfa3a9583144f5817ee231..08b69a63ea3a8067861984fa2fcd25435c921c0d 100644
 --- a/layout/generic/ViewportFrame.cpp
 +++ b/layout/generic/ViewportFrame.cpp
-@@ -24,6 +24,7 @@
+@@ -23,6 +23,7 @@
 #include "nsLayoutUtils.h"
 #include "nsPlaceholderFrame.h"
 #include "nsSubDocumentFrame.h"
@@ -10,7 +10,7 @@ index ea018fff9f549cd8e07b20f4c8073391a6fdf40d..acb9428cf2276ed04064484600024d9e
 
 using namespace mozilla;
 
-@@ -299,15 +300,20 @@ ViewportFrame::BuildDisplayListForViewTransitionsAndNACTopLayer(
+@@ -291,15 +292,20 @@ ViewportFrame::BuildDisplayListForViewTransitionsAndNACTopLayer(
     }
   }
 
--- a/src/layout/painting/nsDisplayList-cpp.patch
+++ b/src/layout/painting/nsDisplayList-cpp.patch
@@ -1,5 +1,5 @@
 diff --git a/layout/painting/nsDisplayList.cpp b/layout/painting/nsDisplayList.cpp
-index c045de789d924d0fd652b81f4fef37cb0bc19112..ac3d3904626132257a1ffce4a8d7bd6b8c12728e 100644
+index 4488dc2025da64fbad0e0ec998793a476de640ef..82990853e7279723666635ab8d9a929ede3f3aca 100644
 --- a/layout/painting/nsDisplayList.cpp
 +++ b/layout/painting/nsDisplayList.cpp
@@ -81,6 +81,7 @@
--- a/src/python/mozlint/mozlint/roller-py.patch
+++ b/src/python/mozlint/mozlint/roller-py.patch
@@ -1,8 +1,8 @@
 diff --git a/python/mozlint/mozlint/roller.py b/python/mozlint/mozlint/roller.py
-index aeafa93cc525d2846614b600e95fd817b832b0ef..69414ed032523f1b53b78ad867145efaea422c63 100644
+index 607b1f1b386ee0ed85277f00b62184fc726c9946..6d460349d1b75b6c4f2caaaf16afdaa1249a4d54 100644
 --- a/python/mozlint/mozlint/roller.py
 +++ b/python/mozlint/mozlint/roller.py
-@@ -92,7 +92,6 @@ def _run_worker(config, paths, **lintargs):
+@@ -87,7 +87,6 @@ def _run_worker(config, paths, **lintargs):
             res = res or []
         else:
             log.error(f"Unexpected result type received: {type(res)}")
--- a/src/security/mac/hardenedruntime/production/firefox-browser-xml.patch
+++ b/src/security/mac/hardenedruntime/production/firefox-browser-xml.patch
@@ -1,8 +1,8 @@
 diff --git a/security/mac/hardenedruntime/production/firefox.browser.xml b/security/mac/hardenedruntime/production/firefox.browser.xml
-index abbf33e9d2b3c9d1e0a34bd46e7cd289c435533b..d580b156fed13f4de8eb73e5c29c646a7a22a1d2 100644
+index b7b74dd2bdfee3c724c4361e98c8addaf6148465..ad1da805bc76df1ea7f8504305e0deccd9ed3f65 100644
 --- a/security/mac/hardenedruntime/production/firefox.browser.xml
 +++ b/security/mac/hardenedruntime/production/firefox.browser.xml
-@@ -26,7 +26,7 @@
+@@ -29,7 +29,7 @@
 
     <!-- Required for com.apple.developer.web-browser.public-key-credential -->
     <key>com.apple.application-identifier</key>
--- a/src/servo/components/style/queries/feature_expression-rs.patch
+++ b/src/servo/components/style/queries/feature_expression-rs.patch
@@ -1,8 +1,8 @@
 diff --git a/servo/components/style/queries/feature_expression.rs b/servo/components/style/queries/feature_expression.rs
-index 6e974cd1978cf39d786aff4ad8eb73216cbfac10..0513173afbff77764c8ffeb92688dda5d3a0d876 100644
+index e007f3e1583b5c53475e9dbbb3a52cde16d37e25..906d86922311cfe2339719d07d64b2af8819b05a 100644
 --- a/servo/components/style/queries/feature_expression.rs
 +++ b/servo/components/style/queries/feature_expression.rs
-@@ -17,7 +17,7 @@ use crate::str::{starts_with_ignore_ascii_case, string_as_ascii_lowercase};
+@@ -21,7 +21,7 @@ use crate::str::{starts_with_ignore_ascii_case, string_as_ascii_lowercase};
 use crate::stylesheets::{CssRuleType, Origin, UrlExtraData};
 use crate::values::computed::{self, CSSPixelLength, Ratio, ToComputedValue};
 use crate::values::specified::{Angle, Integer, Length, Number, Percentage, Resolution, Time};
@@ -11,7 +11,7 @@ index 6e974cd1978cf39d786aff4ad8eb73216cbfac10..0513173afbff77764c8ffeb92688dda5
 use crate::{Atom, Zero};
 use cssparser::{Parser, ParserInput, Token};
 use selectors::kleene_value::KleeneValue;
-@@ -629,6 +629,10 @@ impl QueryFeatureExpression {
+@@ -633,6 +633,10 @@ impl QueryFeatureExpression {
                     .map(|v| *expect!(Enumerated, v));
                 return evaluator(context, computed);
             },
@@ -22,7 +22,7 @@ index 6e974cd1978cf39d786aff4ad8eb73216cbfac10..0513173afbff77764c8ffeb92688dda5
             Evaluator::BoolInteger(eval) => {
                 let computed = self
                     .kind
-@@ -667,6 +671,7 @@ pub enum QueryExpressionValue {
+@@ -671,6 +675,7 @@ pub enum QueryExpressionValue {
     /// An enumerated value, defined by the variant keyword table in the
     /// feature's `mData` member.
     Enumerated(KeywordDiscriminant),
@@ -30,7 +30,7 @@ index 6e974cd1978cf39d786aff4ad8eb73216cbfac10..0513173afbff77764c8ffeb92688dda5
     /// Value types only used by style-range query expressions, not feature queries.
     /// A CSS-wide keyword.
     Keyword(CSSWideKeyword),
-@@ -717,6 +722,7 @@ impl QueryExpressionValue {
+@@ -718,6 +723,7 @@ impl QueryExpressionValue {
                 Evaluator::Enumerated { serializer, .. } => dest.write_str(&*serializer(value)),
                 _ => unreachable!(),
             },
@@ -38,7 +38,7 @@ index 6e974cd1978cf39d786aff4ad8eb73216cbfac10..0513173afbff77764c8ffeb92688dda5
         }
     }
 
-@@ -754,6 +760,9 @@ impl QueryExpressionValue {
+@@ -755,6 +761,9 @@ impl QueryExpressionValue {
             Evaluator::Resolution(..) => {
                 QueryExpressionValue::Resolution(Resolution::parse(context, input)?)
             },
--- a/src/testing/mochitest/browser-test-js.patch
+++ b/src/testing/mochitest/browser-test-js.patch
@@ -1,5 +1,5 @@
 diff --git a/testing/mochitest/browser-test.js b/testing/mochitest/browser-test.js
-index a0f777967e2b71ee7edd5cdaa26cb79744f8fbe0..f09ede2424bf4903d628ba79a7c23bf123b0e3ec 100644
+index 2377812af77563d6e80178e3da47a537aa0576e2..e9e5c4a2f3b2ebb503605595f552f35eea4f9814 100644
 --- a/testing/mochitest/browser-test.js
 +++ b/testing/mochitest/browser-test.js
@@ -497,10 +497,10 @@ Tester.prototype = {
@@ -15,7 +15,7 @@ index a0f777967e2b71ee7edd5cdaa26cb79744f8fbe0..f09ede2424bf4903d628ba79a7c23bf1
           let lastTab = gBrowser.tabs[gBrowser.tabs.length - 1];
           if (!lastTab.closing) {
             // Report the stale tab as an error only when they're not closing.
-@@ -1244,12 +1244,6 @@ Tester.prototype = {
+@@ -1248,12 +1248,6 @@ Tester.prototype = {
     // test_end is logged, otherwise the new windows created by addTab will be
     // tracked by ShutdownLeaks as belonging to the test and cause false leak reports.
     if (window.gBrowser) {
--- a/src/toolkit/actors/PictureInPictureChild-sys-mjs.patch
+++ b/src/toolkit/actors/PictureInPictureChild-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/toolkit/actors/PictureInPictureChild.sys.mjs b/toolkit/actors/PictureInPictureChild.sys.mjs
-index 0ec4b9f736994b47f836ce749f9ddaf128b0fb87..a86e2e7181a47023dc2a93a0ba4c582c350e0398 100644
+index 4b42c43958989e9f67289537076a5683bdd08d55..a33a544647562c79af33ec9705fd60e36ec33488 100644
 --- a/toolkit/actors/PictureInPictureChild.sys.mjs
 +++ b/toolkit/actors/PictureInPictureChild.sys.mjs
-@@ -295,6 +295,7 @@ export class PictureInPictureLauncherChild extends JSWindowActorChild {
+@@ -297,6 +297,7 @@ export class PictureInPictureLauncherChild extends JSWindowActorChild {
       if (
         video &&
         PictureInPictureChild.videoIsPlaying(video) &&
--- a/src/toolkit/components/extensions/parent/ext-tabs-base-js.patch
+++ b/src/toolkit/components/extensions/parent/ext-tabs-base-js.patch
@@ -1,8 +1,8 @@
 diff --git a/toolkit/components/extensions/parent/ext-tabs-base.js b/toolkit/components/extensions/parent/ext-tabs-base.js
-index b915a9bed9a08afc4cabcc9c7268ecfddeb5a9f6..f318a20a17caf3d4c9ebaa67715ad3835bf89970 100644
+index e617b47c547f633c95fe05023d2e748192c0b1b9..e12466e45d71376e975a127086a1ac5a57a38dd0 100644
 --- a/toolkit/components/extensions/parent/ext-tabs-base.js
 +++ b/toolkit/components/extensions/parent/ext-tabs-base.js
-@@ -1964,6 +1964,7 @@ class TabManagerBase {
+@@ -1966,6 +1966,7 @@ class TabManagerBase {
    */
   addActiveTabPermission(nativeTab) {
     let tab = this.getWrapper(nativeTab);
@@ -10,7 +10,7 @@ index b915a9bed9a08afc4cabcc9c7268ecfddeb5a9f6..f318a20a17caf3d4c9ebaa67715ad383
     if (
       this.extension.hasPermission("activeTab") ||
       (this.extension.originControls &&
-@@ -1985,7 +1986,9 @@ class TabManagerBase {
+@@ -1987,7 +1988,9 @@ class TabManagerBase {
    *        The native tab for which to revoke permissions.
    */
   revokeActiveTabPermission(nativeTab) {
@@ -21,7 +21,7 @@ index b915a9bed9a08afc4cabcc9c7268ecfddeb5a9f6..f318a20a17caf3d4c9ebaa67715ad383
   }
 
   /**
-@@ -1998,7 +2001,9 @@ class TabManagerBase {
+@@ -2000,7 +2003,9 @@ class TabManagerBase {
    *        True if the extension has activeTab permissions for this tab.
    */
   hasActiveTabPermission(nativeTab) {
@@ -32,7 +32,7 @@ index b915a9bed9a08afc4cabcc9c7268ecfddeb5a9f6..f318a20a17caf3d4c9ebaa67715ad383
   }
 
   /**
-@@ -2009,6 +2014,7 @@ class TabManagerBase {
+@@ -2011,6 +2016,7 @@ class TabManagerBase {
    */
   activateScripts(nativeTab) {
     let tab = this.getWrapper(nativeTab);
@@ -40,7 +40,7 @@ index b915a9bed9a08afc4cabcc9c7268ecfddeb5a9f6..f318a20a17caf3d4c9ebaa67715ad383
     if (
       this.extension.originControls &&
       !tab.matchesHostPermission &&
-@@ -2041,7 +2047,9 @@ class TabManagerBase {
+@@ -2043,7 +2049,9 @@ class TabManagerBase {
    *        True if the extension has permissions for this tab.
    */
   hasTabPermission(nativeTab) {
@@ -51,7 +51,7 @@ index b915a9bed9a08afc4cabcc9c7268ecfddeb5a9f6..f318a20a17caf3d4c9ebaa67715ad383
   }
 
   /**
-@@ -2088,7 +2096,9 @@ class TabManagerBase {
+@@ -2090,7 +2098,9 @@ class TabManagerBase {
    * @returns {object}
    */
   convert(nativeTab, fallbackTabSize = null) {
--- a/src/toolkit/content/widgets/infobar-css.patch
+++ b/src/toolkit/content/widgets/infobar-css.patch
@@ -1,5 +1,5 @@
 diff --git a/toolkit/content/widgets/infobar.css b/toolkit/content/widgets/infobar.css
-index 4c224f90b747aa674743ac2182066f5da5e730e0..0ef2c8691459a5c3ace5b3530bfaf245b440678b 100644
+index fa0bb5fca4a669981d5c22fcba137c874dea8241..97fecbb9957dd733107e1bfe2aac90c7dc0a7f78 100644
 --- a/toolkit/content/widgets/infobar.css
 +++ b/toolkit/content/widgets/infobar.css
@@ -102,3 +102,18 @@ strong {
--- a/src/toolkit/content/widgets/moz-toggle/moz-toggle-css.patch
+++ b/src/toolkit/content/widgets/moz-toggle/moz-toggle-css.patch
@@ -1,15 +0,0 @@
-diff --git a/toolkit/content/widgets/moz-toggle/moz-toggle.css b/toolkit/content/widgets/moz-toggle/moz-toggle.css
-index c1a73d46725d30b8f2a635dba1d32617b3295ddd..4fee9fc0deb702b955c07c2af9eefa932fb8f41f 100644
--- a/toolkit/content/widgets/moz-toggle/moz-toggle.css
-+++ b/toolkit/content/widgets/moz-toggle/moz-toggle.css
-@@ -6,8 +6,8 @@
-   --toggle-background-color: var(--button-background-color);
-   --toggle-background-color-hover: var(--button-background-color-hover);
-   --toggle-background-color-active: var(--button-background-color-active);
-  --toggle-background-color-pressed: var(--color-accent-primary);
-  --toggle-background-color-pressed-hover: var(--color-accent-primary-hover);
-+  --toggle-background-color-pressed: var(--zen-primary-color);
-+  --toggle-background-color-pressed-hover: var(--zen-colors-hover-bg);
-   --toggle-background-color-pressed-active: var(--color-accent-primary-active);
-   --toggle-border-color: var(--border-color-interactive);
-   --toggle-border-color-hover: var(--toggle-border-color);
--- a/Show More
+++ b/Show More