diff --git a/src/browser/components/customizableui/CustomizeMode-sys-mjs.patch b/src/browser/components/customizableui/CustomizeMode-sys-mjs.patch
index 6affb2d5a..38a9fad2d 100644
--- a/src/browser/components/customizableui/CustomizeMode-sys-mjs.patch
+++ b/src/browser/components/customizableui/CustomizeMode-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/customizableui/CustomizeMode.sys.mjs b/browser/components/customizableui/CustomizeMode.sys.mjs
-index 41f347130e754ad0ee3416c1a3881211c4d2f777..9f906fd5f11731025abdf55eb5e60a824f8dd81f 100644
+index f303b9fe6b9c046f87be1d3614402563d01a579b..f66501cedc8b2087af5dbbdde73f0c6f77ad133a 100644
 --- a/browser/components/customizableui/CustomizeMode.sys.mjs
 +++ b/browser/components/customizableui/CustomizeMode.sys.mjs
 @@ -354,7 +354,7 @@ CustomizeMode.prototype = {
@@ -11,7 +11,15 @@ index 41f347130e754ad0ee3416c1a3881211c4d2f777..9f906fd5f11731025abdf55eb5e60a82
        browser.hidden = true;
        customizer.hidden = false;
  
-@@ -485,7 +485,7 @@ CustomizeMode.prototype = {
+@@ -384,7 +384,6 @@ CustomizeMode.prototype = {
+       this._updateResetButton();
+       this._updateUndoResetButton();
+       this._updateTouchBarButton();
+-      this._updateDensityMenu();
+ 
+       this._skipSourceNodeCheck =
+         Services.prefs.getPrefType(kSkipSourceNodePref) ==
+@@ -485,7 +484,7 @@ CustomizeMode.prototype = {
      }
  
      let customizer = document.getElementById("customization-container");
@@ -20,7 +28,28 @@ index 41f347130e754ad0ee3416c1a3881211c4d2f777..9f906fd5f11731025abdf55eb5e60a82
      customizer.hidden = true;
      browser.hidden = false;
  
-@@ -2276,6 +2276,20 @@ CustomizeMode.prototype = {
+@@ -1546,20 +1545,6 @@ CustomizeMode.prototype = {
+     touchBarSpacer.hidden = !isTouchBarInitialized;
+   },
+ 
+-  _updateDensityMenu() {
+-    // If we're entering Customize Mode, and we're using compact mode,
+-    // then show the button after that.
+-    let gUIDensity = this.window.gUIDensity;
+-    if (gUIDensity.getCurrentDensity().mode == gUIDensity.MODE_COMPACT) {
+-      Services.prefs.setBoolPref(kCompactModeShowPref, true);
+-    }
+-
+-    let button = this.document.getElementById("customization-uidensity-button");
+-    button.hidden =
+-      !Services.prefs.getBoolPref(kCompactModeShowPref) &&
+-      !button.querySelector("#customization-uidensity-menuitem-touch");
+-  },
+-
+   handleEvent(aEvent) {
+     switch (aEvent.type) {
+       case "toolbarvisibilitychange":
+@@ -2272,6 +2257,20 @@ CustomizeMode.prototype = {
          if (makeSpaceImmediately) {
            aItem.setAttribute("notransition", "true");
          }
diff --git a/src/browser/components/customizableui/content/customizeMode-inc-xhtml.patch b/src/browser/components/customizableui/content/customizeMode-inc-xhtml.patch
new file mode 100644
index 000000000..4eb8e68b0
--- /dev/null
+++ b/src/browser/components/customizableui/content/customizeMode-inc-xhtml.patch
@@ -0,0 +1,62 @@
+diff --git a/browser/components/customizableui/content/customizeMode.inc.xhtml b/browser/components/customizableui/content/customizeMode.inc.xhtml
+index 38c9dbe15f9e89a63471c5ea4439b2f468f31073..d0f7998e158c9b391acea726231c79f188f20163 100644
+--- a/browser/components/customizableui/content/customizeMode.inc.xhtml
++++ b/browser/components/customizableui/content/customizeMode.inc.xhtml
+@@ -32,57 +32,6 @@
+ <button id="customization-toolbar-visibility-button" class="footer-button" type="menu" data-l10n-id="customize-mode-toolbars">
+   <menupopup id="customization-toolbar-menu" onpopupshowing="if (event.target == this) ToolbarContextMenu.onViewToolbarsPopupShowing(event)"/>
+ </button>
+-<button id="customization-uidensity-button"
+-        data-l10n-id="customize-mode-uidensity"
+-        class="footer-button"
+-        type="menu"
+-        hidden="true">
+-  <panel type="arrow" id="customization-uidensity-menu"
+-         orient="vertical"
+-         onpopupshowing="gCustomizeMode.onUIDensityMenuShowing();"
+-         position="topleft bottomleft"
+-         flip="none"
+-         role="menu">
+-    <menuitem id="customization-uidensity-menuitem-compact"
+-              class="menuitem-iconic customization-uidensity-menuitem"
+-              role="menuitemradio"
+-              data-l10n-id="customize-mode-uidensity-menu-compact-unsupported"
+-              tabindex="0"
+-              onfocus="gCustomizeMode.updateUIDensity(this.mode);"
+-              onmouseover="gCustomizeMode.updateUIDensity(this.mode);"
+-              onblur="gCustomizeMode.resetUIDensity();"
+-              onmouseout="gCustomizeMode.resetUIDensity();"
+-              oncommand="gCustomizeMode.setUIDensity(this.mode);"/>
+-    <menuitem id="customization-uidensity-menuitem-normal"
+-              class="menuitem-iconic customization-uidensity-menuitem"
+-              role="menuitemradio"
+-              data-l10n-id="customize-mode-uidensity-menu-normal"
+-              tabindex="0"
+-              onfocus="gCustomizeMode.updateUIDensity(this.mode);"
+-              onmouseover="gCustomizeMode.updateUIDensity(this.mode);"
+-              onblur="gCustomizeMode.resetUIDensity();"
+-              onmouseout="gCustomizeMode.resetUIDensity();"
+-              oncommand="gCustomizeMode.setUIDensity(this.mode);"/>
+-#ifndef XP_MACOSX
+-    <menuitem id="customization-uidensity-menuitem-touch"
+-              class="menuitem-iconic customization-uidensity-menuitem"
+-              role="menuitemradio"
+-              data-l10n-id="customize-mode-uidensity-menu-touch"
+-              tabindex="0"
+-              onfocus="gCustomizeMode.updateUIDensity(this.mode);"
+-              onmouseover="gCustomizeMode.updateUIDensity(this.mode);"
+-              onblur="gCustomizeMode.resetUIDensity();"
+-              onmouseout="gCustomizeMode.resetUIDensity();"
+-              oncommand="gCustomizeMode.setUIDensity(this.mode);">
+-    </menuitem>
+-    <spacer hidden="true" id="customization-uidensity-touch-spacer"/>
+-    <checkbox id="customization-uidensity-autotouchmode-checkbox"
+-              hidden="true"
+-              data-l10n-id="customize-mode-uidensity-auto-touch-mode-checkbox"
+-              oncommand="gCustomizeMode.updateAutoTouchMode(this.checked)"/>
+-#endif
+-  </panel>
+-</button>
+ <label is="text-link"
+        id="customization-lwtheme-link"
+        class="customization-link"
diff --git a/src/browser/components/customizableui/test/browser_970511_undo_restore_default-js.patch b/src/browser/components/customizableui/test/browser_970511_undo_restore_default-js.patch
new file mode 100644
index 000000000..1667453b7
--- /dev/null
+++ b/src/browser/components/customizableui/test/browser_970511_undo_restore_default-js.patch
@@ -0,0 +1,56 @@
+diff --git a/browser/components/customizableui/test/browser_970511_undo_restore_default.js b/browser/components/customizableui/test/browser_970511_undo_restore_default.js
+index 5477b41b803eca4aa2e6e7d8c00811502908c286..363de1f00896e1630ae66af5159dcd24243568ea 100644
+--- a/browser/components/customizableui/test/browser_970511_undo_restore_default.js
++++ b/browser/components/customizableui/test/browser_970511_undo_restore_default.js
+@@ -26,51 +26,14 @@ add_task(async function () {
+   );
+   is(undoResetButton.hidden, true, "The undo button is hidden before reset");
+ 
+-  let densityButton = document.getElementById("customization-uidensity-button");
+-  let popup = document.getElementById("customization-uidensity-menu");
+-  let popupShownPromise = popupShown(popup);
+-  EventUtils.synthesizeMouseAtCenter(densityButton, {});
+-  info("Clicked on density button");
+-  await popupShownPromise;
+-
+-  let compactModeItem = document.getElementById(
+-    "customization-uidensity-menuitem-compact"
+-  );
+-  let win = document.getElementById("main-window");
+-  let densityChangedPromise = new Promise(resolve => {
+-    let observer = new MutationObserver(() => {
+-      if (win.getAttribute("uidensity") == "compact") {
+-        resolve();
+-        observer.disconnect();
+-      }
+-    });
+-    observer.observe(win, {
+-      attributes: true,
+-      attributeFilter: ["uidensity"],
+-    });
+-  });
+-
+-  compactModeItem.doCommand();
+-  info("Clicked on compact density");
+-  await densityChangedPromise;
+ 
+   await gCustomizeMode.reset();
+ 
+   ok(CustomizableUI.inDefaultState, "In default state after reset");
+   is(undoResetButton.hidden, false, "The undo button is visible after reset");
+-  is(
+-    win.hasAttribute("uidensity"),
+-    false,
+-    "The window has been restored to normal density."
+-  );
+ 
+   await gCustomizeMode.undoReset();
+ 
+-  is(
+-    win.getAttribute("uidensity"),
+-    "compact",
+-    "Density has been reset to compact."
+-  );
+   ok(!CustomizableUI.inDefaultState, "Not in default state after undo-reset");
+   is(
+     undoResetButton.hidden,
diff --git a/src/browser/components/customizableui/test/browser_customizemode_uidensity-js.patch b/src/browser/components/customizableui/test/browser_customizemode_uidensity-js.patch
new file mode 100644
index 000000000..644b56a6a
--- /dev/null
+++ b/src/browser/components/customizableui/test/browser_customizemode_uidensity-js.patch
@@ -0,0 +1,465 @@
+diff --git a/browser/components/customizableui/test/browser_customizemode_uidensity.js b/browser/components/customizableui/test/browser_customizemode_uidensity.js
+index 9f22341f5661edf24b731eb2cdc1371e3d44e08b..4563d346100404b902a59cac45243223deceaaa8 100644
+--- a/browser/components/customizableui/test/browser_customizemode_uidensity.js
++++ b/browser/components/customizableui/test/browser_customizemode_uidensity.js
+@@ -1,230 +1,230 @@
+-/* This Source Code Form is subject to the terms of the Mozilla Public
+- * License, v. 2.0. If a copy of the MPL was not distributed with this
+- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+-
+-"use strict";
+-
+-const PREF_UI_DENSITY = "browser.uidensity";
+-const PREF_AUTO_TOUCH_MODE = "browser.touchmode.auto";
+-
+-async function testModeMenuitem(mode, modePref) {
+-  await startCustomizing();
+-
+-  let win = document.getElementById("main-window");
+-  let popupButton = document.getElementById("customization-uidensity-button");
+-  let popup = document.getElementById("customization-uidensity-menu");
+-
+-  // Show the popup.
+-  let popupShownPromise = popupShown(popup);
+-  EventUtils.synthesizeMouseAtCenter(popupButton, {});
+-  await popupShownPromise;
+-
+-  let item = document.getElementById(
+-    "customization-uidensity-menuitem-" + mode
+-  );
+-  let normalItem = document.getElementById(
+-    "customization-uidensity-menuitem-normal"
+-  );
+-
+-  is(
+-    normalItem.getAttribute("active"),
+-    "true",
+-    "Normal mode menuitem should be active by default"
+-  );
+-
+-  // Hover over the mode menuitem and wait for the event that updates the UI
+-  // density.
+-  let mouseoverPromise = BrowserTestUtils.waitForEvent(item, "mouseover");
+-  EventUtils.synthesizeMouseAtCenter(item, { type: "mouseover" });
+-  await mouseoverPromise;
+-
+-  is(
+-    win.getAttribute("uidensity"),
+-    mode,
+-    `UI Density should be set to ${mode} on ${mode} menuitem hover`
+-  );
+-
+-  is(
+-    Services.prefs.getIntPref(PREF_UI_DENSITY),
+-    window.gUIDensity.MODE_NORMAL,
+-    `UI Density pref should still be set to normal on ${mode} menuitem hover`
+-  );
+-
+-  // Hover the normal menuitem again and check that the UI density reset to normal.
+-  EventUtils.synthesizeMouseAtCenter(normalItem, { type: "mouseover" });
+-  await BrowserTestUtils.waitForCondition(() => !win.hasAttribute("uidensity"));
+-
+-  ok(
+-    !win.hasAttribute("uidensity"),
+-    `UI Density should be reset when no longer hovering the ${mode} menuitem`
+-  );
+-
+-  // Select the custom UI density and wait for the popup to be hidden.
+-  let popupHiddenPromise = popupHidden(popup);
+-  EventUtils.synthesizeMouseAtCenter(item, {});
+-  await popupHiddenPromise;
+-
+-  // Check that the click permanently changed the UI density.
+-  is(
+-    win.getAttribute("uidensity"),
+-    mode,
+-    `UI Density should be set to ${mode} on ${mode} menuitem click`
+-  );
+-  is(
+-    Services.prefs.getIntPref(PREF_UI_DENSITY),
+-    modePref,
+-    `UI Density pref should be set to ${mode} when clicking the ${mode} menuitem`
+-  );
+-
+-  // Open the popup again.
+-  popupShownPromise = popupShown(popup);
+-  EventUtils.synthesizeMouseAtCenter(popupButton, {});
+-  await popupShownPromise;
+-
+-  // Check that the menuitem is still active after opening and closing the popup.
+-  is(
+-    item.getAttribute("active"),
+-    "true",
+-    `${mode} mode menuitem should be active`
+-  );
+-
+-  // Hide the popup again.
+-  popupHiddenPromise = popupHidden(popup);
+-  EventUtils.synthesizeMouseAtCenter(popupButton, {});
+-  await popupHiddenPromise;
+-
+-  // Check that the menuitem is still active after re-opening customize mode.
+-  await endCustomizing();
+-  await startCustomizing();
+-
+-  popupShownPromise = popupShown(popup);
+-  EventUtils.synthesizeMouseAtCenter(popupButton, {});
+-  await popupShownPromise;
+-
+-  is(
+-    item.getAttribute("active"),
+-    "true",
+-    `${mode} mode menuitem should be active after entering and exiting customize mode`
+-  );
+-
+-  // Click the normal menuitem and check that the density is reset.
+-  popupHiddenPromise = popupHidden(popup);
+-  EventUtils.synthesizeMouseAtCenter(normalItem, {});
+-  await popupHiddenPromise;
+-
+-  ok(
+-    !win.hasAttribute("uidensity"),
+-    "UI Density should be reset when clicking the normal menuitem"
+-  );
+-
+-  is(
+-    Services.prefs.getIntPref(PREF_UI_DENSITY),
+-    window.gUIDensity.MODE_NORMAL,
+-    "UI Density pref should be set to normal."
+-  );
+-
+-  // Show the popup and click on the mode menuitem again to test the
+-  // reset default feature.
+-  popupShownPromise = popupShown(popup);
+-  EventUtils.synthesizeMouseAtCenter(popupButton, {});
+-  await popupShownPromise;
+-
+-  popupHiddenPromise = popupHidden(popup);
+-  EventUtils.synthesizeMouseAtCenter(item, {});
+-  await popupHiddenPromise;
+-
+-  is(
+-    win.getAttribute("uidensity"),
+-    mode,
+-    `UI Density should be set to ${mode} on ${mode} menuitem click`
+-  );
+-
+-  is(
+-    Services.prefs.getIntPref(PREF_UI_DENSITY),
+-    modePref,
+-    `UI Density pref should be set to ${mode} when clicking the ${mode} menuitem`
+-  );
+-
+-  await gCustomizeMode.reset();
+-
+-  ok(
+-    !win.hasAttribute("uidensity"),
+-    "UI Density should be reset when clicking the normal menuitem"
+-  );
+-
+-  is(
+-    Services.prefs.getIntPref(PREF_UI_DENSITY),
+-    window.gUIDensity.MODE_NORMAL,
+-    "UI Density pref should be set to normal."
+-  );
+-
+-  await endCustomizing();
+-}
+-
+-add_task(async function test_touch_mode_menuitem() {
+-  // OSX doesn't get touch mode for now.
+-  if (AppConstants.platform == "macosx") {
+-    is(
+-      document.getElementById("customization-uidensity-menuitem-touch"),
+-      null,
+-      "There's no touch option on Mac OSX"
+-    );
+-    return;
+-  }
+-
+-  await testModeMenuitem("touch", window.gUIDensity.MODE_TOUCH);
+-
+-  // Test the checkbox for automatic Touch Mode transition
+-  // in Windows Tablet Mode.
+-  if (AppConstants.platform == "win") {
+-    await startCustomizing();
+-
+-    let popupButton = document.getElementById("customization-uidensity-button");
+-    let popup = document.getElementById("customization-uidensity-menu");
+-    let popupShownPromise = popupShown(popup);
+-    EventUtils.synthesizeMouseAtCenter(popupButton, {});
+-    await popupShownPromise;
+-
+-    let checkbox = document.getElementById(
+-      "customization-uidensity-autotouchmode-checkbox"
+-    );
+-    ok(checkbox.checked, "Checkbox should be checked by default");
+-
+-    // Test toggling the checkbox.
+-    EventUtils.synthesizeMouseAtCenter(checkbox, {});
+-    is(
+-      Services.prefs.getBoolPref(PREF_AUTO_TOUCH_MODE),
+-      false,
+-      "Automatic Touch Mode is off when the checkbox is unchecked."
+-    );
+-
+-    EventUtils.synthesizeMouseAtCenter(checkbox, {});
+-    is(
+-      Services.prefs.getBoolPref(PREF_AUTO_TOUCH_MODE),
+-      true,
+-      "Automatic Touch Mode is on when the checkbox is checked."
+-    );
+-
+-    // Test reset to defaults.
+-    EventUtils.synthesizeMouseAtCenter(checkbox, {});
+-    is(
+-      Services.prefs.getBoolPref(PREF_AUTO_TOUCH_MODE),
+-      false,
+-      "Automatic Touch Mode is off when the checkbox is unchecked."
+-    );
+-
+-    await gCustomizeMode.reset();
+-    is(
+-      Services.prefs.getBoolPref(PREF_AUTO_TOUCH_MODE),
+-      true,
+-      "Automatic Touch Mode is on when the checkbox is checked."
+-    );
+-  }
+-});
+-
+-add_task(async function cleanup() {
+-  await endCustomizing();
+-
+-  Services.prefs.clearUserPref(PREF_UI_DENSITY);
+-  Services.prefs.clearUserPref(PREF_AUTO_TOUCH_MODE);
+-});
++// /* This Source Code Form is subject to the terms of the Mozilla Public
++//  * License, v. 2.0. If a copy of the MPL was not distributed with this
++//  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
++
++// "use strict";
++
++// const PREF_UI_DENSITY = "browser.uidensity";
++// const PREF_AUTO_TOUCH_MODE = "browser.touchmode.auto";
++
++// async function testModeMenuitem(mode, modePref) {
++//   await startCustomizing();
++
++//   let win = document.getElementById("main-window");
++//   let popupButton = document.getElementById("customization-uidensity-button");
++//   let popup = document.getElementById("customization-uidensity-menu");
++
++//   // Show the popup.
++//   let popupShownPromise = popupShown(popup);
++//   EventUtils.synthesizeMouseAtCenter(popupButton, {});
++//   await popupShownPromise;
++
++//   let item = document.getElementById(
++//     "customization-uidensity-menuitem-" + mode
++//   );
++//   let normalItem = document.getElementById(
++//     "customization-uidensity-menuitem-normal"
++//   );
++
++//   is(
++//     normalItem.getAttribute("active"),
++//     "true",
++//     "Normal mode menuitem should be active by default"
++//   );
++
++//   // Hover over the mode menuitem and wait for the event that updates the UI
++//   // density.
++//   let mouseoverPromise = BrowserTestUtils.waitForEvent(item, "mouseover");
++//   EventUtils.synthesizeMouseAtCenter(item, { type: "mouseover" });
++//   await mouseoverPromise;
++
++//   is(
++//     win.getAttribute("uidensity"),
++//     mode,
++//     `UI Density should be set to ${mode} on ${mode} menuitem hover`
++//   );
++
++//   is(
++//     Services.prefs.getIntPref(PREF_UI_DENSITY),
++//     window.gUIDensity.MODE_NORMAL,
++//     `UI Density pref should still be set to normal on ${mode} menuitem hover`
++//   );
++
++//   // Hover the normal menuitem again and check that the UI density reset to normal.
++//   EventUtils.synthesizeMouseAtCenter(normalItem, { type: "mouseover" });
++//   await BrowserTestUtils.waitForCondition(() => !win.hasAttribute("uidensity"));
++
++//   ok(
++//     !win.hasAttribute("uidensity"),
++//     `UI Density should be reset when no longer hovering the ${mode} menuitem`
++//   );
++
++//   // Select the custom UI density and wait for the popup to be hidden.
++//   let popupHiddenPromise = popupHidden(popup);
++//   EventUtils.synthesizeMouseAtCenter(item, {});
++//   await popupHiddenPromise;
++
++//   // Check that the click permanently changed the UI density.
++//   is(
++//     win.getAttribute("uidensity"),
++//     mode,
++//     `UI Density should be set to ${mode} on ${mode} menuitem click`
++//   );
++//   is(
++//     Services.prefs.getIntPref(PREF_UI_DENSITY),
++//     modePref,
++//     `UI Density pref should be set to ${mode} when clicking the ${mode} menuitem`
++//   );
++
++//   // Open the popup again.
++//   popupShownPromise = popupShown(popup);
++//   EventUtils.synthesizeMouseAtCenter(popupButton, {});
++//   await popupShownPromise;
++
++//   // Check that the menuitem is still active after opening and closing the popup.
++//   is(
++//     item.getAttribute("active"),
++//     "true",
++//     `${mode} mode menuitem should be active`
++//   );
++
++//   // Hide the popup again.
++//   popupHiddenPromise = popupHidden(popup);
++//   EventUtils.synthesizeMouseAtCenter(popupButton, {});
++//   await popupHiddenPromise;
++
++//   // Check that the menuitem is still active after re-opening customize mode.
++//   await endCustomizing();
++//   await startCustomizing();
++
++//   popupShownPromise = popupShown(popup);
++//   EventUtils.synthesizeMouseAtCenter(popupButton, {});
++//   await popupShownPromise;
++
++//   is(
++//     item.getAttribute("active"),
++//     "true",
++//     `${mode} mode menuitem should be active after entering and exiting customize mode`
++//   );
++
++//   // Click the normal menuitem and check that the density is reset.
++//   popupHiddenPromise = popupHidden(popup);
++//   EventUtils.synthesizeMouseAtCenter(normalItem, {});
++//   await popupHiddenPromise;
++
++//   ok(
++//     !win.hasAttribute("uidensity"),
++//     "UI Density should be reset when clicking the normal menuitem"
++//   );
++
++//   is(
++//     Services.prefs.getIntPref(PREF_UI_DENSITY),
++//     window.gUIDensity.MODE_NORMAL,
++//     "UI Density pref should be set to normal."
++//   );
++
++//   // Show the popup and click on the mode menuitem again to test the
++//   // reset default feature.
++//   popupShownPromise = popupShown(popup);
++//   EventUtils.synthesizeMouseAtCenter(popupButton, {});
++//   await popupShownPromise;
++
++//   popupHiddenPromise = popupHidden(popup);
++//   EventUtils.synthesizeMouseAtCenter(item, {});
++//   await popupHiddenPromise;
++
++//   is(
++//     win.getAttribute("uidensity"),
++//     mode,
++//     `UI Density should be set to ${mode} on ${mode} menuitem click`
++//   );
++
++//   is(
++//     Services.prefs.getIntPref(PREF_UI_DENSITY),
++//     modePref,
++//     `UI Density pref should be set to ${mode} when clicking the ${mode} menuitem`
++//   );
++
++//   await gCustomizeMode.reset();
++
++//   ok(
++//     !win.hasAttribute("uidensity"),
++//     "UI Density should be reset when clicking the normal menuitem"
++//   );
++
++//   is(
++//     Services.prefs.getIntPref(PREF_UI_DENSITY),
++//     window.gUIDensity.MODE_NORMAL,
++//     "UI Density pref should be set to normal."
++//   );
++
++//   await endCustomizing();
++// }
++
++// add_task(async function test_touch_mode_menuitem() {
++//   // OSX doesn't get touch mode for now.
++//   if (AppConstants.platform == "macosx") {
++//     is(
++//       document.getElementById("customization-uidensity-menuitem-touch"),
++//       null,
++//       "There's no touch option on Mac OSX"
++//     );
++//     return;
++//   }
++
++//   await testModeMenuitem("touch", window.gUIDensity.MODE_TOUCH);
++
++//   // Test the checkbox for automatic Touch Mode transition
++//   // in Windows Tablet Mode.
++//   if (AppConstants.platform == "win") {
++//     await startCustomizing();
++
++//     let popupButton = document.getElementById("customization-uidensity-button");
++//     let popup = document.getElementById("customization-uidensity-menu");
++//     let popupShownPromise = popupShown(popup);
++//     EventUtils.synthesizeMouseAtCenter(popupButton, {});
++//     await popupShownPromise;
++
++//     let checkbox = document.getElementById(
++//       "customization-uidensity-autotouchmode-checkbox"
++//     );
++//     ok(checkbox.checked, "Checkbox should be checked by default");
++
++//     // Test toggling the checkbox.
++//     EventUtils.synthesizeMouseAtCenter(checkbox, {});
++//     is(
++//       Services.prefs.getBoolPref(PREF_AUTO_TOUCH_MODE),
++//       false,
++//       "Automatic Touch Mode is off when the checkbox is unchecked."
++//     );
++
++//     EventUtils.synthesizeMouseAtCenter(checkbox, {});
++//     is(
++//       Services.prefs.getBoolPref(PREF_AUTO_TOUCH_MODE),
++//       true,
++//       "Automatic Touch Mode is on when the checkbox is checked."
++//     );
++
++//     // Test reset to defaults.
++//     EventUtils.synthesizeMouseAtCenter(checkbox, {});
++//     is(
++//       Services.prefs.getBoolPref(PREF_AUTO_TOUCH_MODE),
++//       false,
++//       "Automatic Touch Mode is off when the checkbox is unchecked."
++//     );
++
++//     await gCustomizeMode.reset();
++//     is(
++//       Services.prefs.getBoolPref(PREF_AUTO_TOUCH_MODE),
++//       true,
++//       "Automatic Touch Mode is on when the checkbox is checked."
++//     );
++//   }
++// });
++
++// add_task(async function cleanup() {
++//   await endCustomizing();
++
++//   Services.prefs.clearUserPref(PREF_UI_DENSITY);
++//   Services.prefs.clearUserPref(PREF_AUTO_TOUCH_MODE);
++// });