diff --git a/patches/block-cookie-banners.patch b/patches/block-cookie-banners.patch
index 1046050..4a7e8a4 100644
--- a/patches/block-cookie-banners.patch
+++ b/patches/block-cookie-banners.patch
@@ -1,8 +1,8 @@
 diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-index 7f19ba4304..c317bf132c 100644
+index 9197b274db..f82430aae7 100644
 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
 +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-@@ -740,20 +740,20 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -745,20 +745,20 @@ class Settings(private val appContext: Context) : PreferencesHolder {
          false,
      )
  
diff --git a/patches/branding.patch b/patches/branding.patch
index 0c3082f..be95563 100644
--- a/patches/branding.patch
+++ b/patches/branding.patch
@@ -244,10 +244,10 @@ index 0e2a6efdc9..3d7ff4a88f 100644
 +
 +include("ironfox.configure")
 diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-index 7f19ba4304..fbdf603c9b 100644
+index 9197b274db..2d791fa7b7 100644
 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
 +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-@@ -390,10 +390,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -395,10 +395,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
          default = false,
      )
  
@@ -262,7 +262,7 @@ index 7f19ba4304..fbdf603c9b 100644
  
      /**
       * The daily usage ping is not normally tied to normal telemetry.  We set the default value to
-@@ -431,10 +431,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -436,10 +436,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
      val shouldShowSecurityPinWarning: Boolean
          get() = secureWarningCount.underMaxCount()
  
diff --git a/patches/configure-doh.patch b/patches/configure-doh.patch
index 3bc6dd4..6e575f0 100644
--- a/patches/configure-doh.patch
+++ b/patches/configure-doh.patch
@@ -213,10 +213,10 @@ index f290b21561..506412b351 100644
          )
          DohSettingsScreen(
 diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-index 7f19ba4304..3e7d8721d1 100644
+index 9197b274db..68bba5f520 100644
 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
 +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-@@ -2358,10 +2358,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -2362,10 +2362,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
      /**
       * Indicates whether or not to show the entry point for the DNS over HTTPS settings
       */
@@ -230,7 +230,7 @@ index 7f19ba4304..3e7d8721d1 100644
      )
  
      /**
-@@ -2373,7 +2373,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -2377,7 +2377,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
       */
      private var trrMode by intPreference(
          key = appContext.getPreferenceKey(R.string.pref_key_doh_settings_mode),
@@ -239,7 +239,7 @@ index 7f19ba4304..3e7d8721d1 100644
      )
  
      /**
-@@ -2391,7 +2391,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -2395,7 +2395,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
       */
      val dohDefaultProviderUrl by stringPreference(
          key = appContext.getPreferenceKey(R.string.pref_key_doh_default_provider_uri),
diff --git a/patches/default-site-permissions.patch b/patches/default-site-permissions.patch
index d692ac3..df4cc0a 100644
--- a/patches/default-site-permissions.patch
+++ b/patches/default-site-permissions.patch
@@ -14,10 +14,10 @@ index a24ff6e34e..e3c15525eb 100644
          }
      }
 diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-index 7f19ba4304..aaa11d17e9 100644
+index 9197b274db..b83b3b3565 100644
 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
 +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-@@ -1294,7 +1294,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -1298,7 +1298,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
       * either [AUTOPLAY_ALLOW_ALL] or [AUTOPLAY_BLOCK_ALL]. Because of this, we are forced to save
       * the user selected setting as well.
       */
@@ -26,7 +26,7 @@ index 7f19ba4304..aaa11d17e9 100644
  
      private fun getSitePermissionsPhoneFeatureAutoplayAction(
          feature: PhoneFeature,
-@@ -1313,9 +1313,9 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -1317,9 +1317,9 @@ class Settings(private val appContext: Context) : PreferencesHolder {
  
      fun getSitePermissionsCustomSettingsRules(): SitePermissionsRules {
          return SitePermissionsRules(
@@ -38,7 +38,7 @@ index 7f19ba4304..aaa11d17e9 100644
              camera = getSitePermissionsPhoneFeatureAction(PhoneFeature.CAMERA),
              autoplayAudible = getSitePermissionsPhoneFeatureAutoplayAction(
                  feature = PhoneFeature.AUTOPLAY_AUDIBLE,
-@@ -1323,7 +1323,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -1327,7 +1327,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
              ),
              autoplayInaudible = getSitePermissionsPhoneFeatureAutoplayAction(
                  feature = PhoneFeature.AUTOPLAY_INAUDIBLE,
diff --git a/patches/disable-accessibility-services-by-default.patch b/patches/disable-accessibility-services-by-default.patch
index 92f1371..1614b32 100644
--- a/patches/disable-accessibility-services-by-default.patch
+++ b/patches/disable-accessibility-services-by-default.patch
@@ -87,22 +87,21 @@ index 1122dc0b0f..456f387812 100644
              R.string.pref_key_accessibility_force_enable_zoom,
          )
 diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-index 7f19ba4304..a4290f239d 100644
+index 9197b274db..6905b5f7d9 100644
 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
 +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-@@ -1063,6 +1063,11 @@ class Settings(private val appContext: Context) : PreferencesHolder {
-         } else {
+@@ -1069,12 +1069,20 @@ class Settings(private val appContext: Context) : PreferencesHolder {
              ToolbarPosition.TOP
          }
-+    
+ 
 +    var accessibilityEnabled by booleanPreference(
 +        appContext.getPreferenceKey(R.string.pref_key_accessibility_enabled),
 +        default = false,
 +    )
- 
++
      /**
       * Check each active accessibility service to see if it can perform gestures, if any can,
-@@ -1070,6 +1075,9 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+      * then it is *likely* a switch service is enabled. We are assuming this to be the case based on #7486
       */
      val switchServiceIsEnabled: Boolean
          get() {
@@ -112,7 +111,7 @@ index 7f19ba4304..a4290f239d 100644
              val accessibilityManager =
                  appContext.getSystemService(Context.ACCESSIBILITY_SERVICE) as? AccessibilityManager
  
-@@ -1086,6 +1094,9 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -1091,6 +1099,9 @@ class Settings(private val appContext: Context) : PreferencesHolder {
  
      val touchExplorationIsEnabled: Boolean
          get() {
@@ -122,7 +121,7 @@ index 7f19ba4304..a4290f239d 100644
              val accessibilityManager =
                  appContext.getSystemService(Context.ACCESSIBILITY_SERVICE) as? AccessibilityManager
              return accessibilityManager?.isTouchExplorationEnabled ?: false
-@@ -1093,7 +1104,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -1098,7 +1109,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
  
      val accessibilityServicesEnabled: Boolean
          get() {
diff --git a/patches/disable-autocomplete.patch b/patches/disable-autocomplete.patch
index cb7e0bb..34eafa7 100644
--- a/patches/disable-autocomplete.patch
+++ b/patches/disable-autocomplete.patch
@@ -1,8 +1,8 @@
 diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-index 7f19ba4304..aee48f054b 100644
+index 9197b274db..0c86d51321 100644
 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
 +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-@@ -1141,7 +1141,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -1146,7 +1146,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
  
      val shouldAutocompleteInAwesomebar by booleanPreference(
          appContext.getPreferenceKey(R.string.pref_key_enable_autocomplete_urls),
diff --git a/patches/disable-autofill.patch b/patches/disable-autofill.patch
index bbf592c..ece2cc7 100644
--- a/patches/disable-autofill.patch
+++ b/patches/disable-autofill.patch
@@ -1,8 +1,8 @@
 diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-index 7f19ba4304..1a46df3cdc 100644
+index 9197b274db..c3f610f0c6 100644
 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
 +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-@@ -1374,12 +1374,12 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -1378,12 +1378,12 @@ class Settings(private val appContext: Context) : PreferencesHolder {
  
      var shouldPromptToSaveLogins by booleanPreference(
          appContext.getPreferenceKey(R.string.pref_key_save_logins),
@@ -17,7 +17,7 @@ index 7f19ba4304..1a46df3cdc 100644
      )
  
      /**
-@@ -1711,7 +1711,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -1715,7 +1715,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
       */
      var shouldAutofillCreditCardDetails by booleanPreference(
          appContext.getPreferenceKey(R.string.pref_key_credit_cards_save_and_autofill_cards),
@@ -26,7 +26,7 @@ index 7f19ba4304..1a46df3cdc 100644
      )
  
      /**
-@@ -1722,7 +1722,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -1726,7 +1726,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
       */
      var shouldAutofillAddressDetails by booleanPreference(
          appContext.getPreferenceKey(R.string.pref_key_addresses_save_and_autofill_addresses),
diff --git a/patches/disable-contile.patch b/patches/disable-contile.patch
index b332b35..58eba2b 100644
--- a/patches/disable-contile.patch
+++ b/patches/disable-contile.patch
@@ -14,10 +14,10 @@ index 89230fb4c1..4faeb9ee77 100644
  internal const val CACHE_TOP_SITES_KEY = "tiles"
  
 diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-index 7f19ba4304..4eb23ab573 100644
+index 9197b274db..880c97957d 100644
 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
 +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-@@ -1814,10 +1814,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -1818,10 +1818,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
      /**
       * Indicates if the Contile functionality should be visible.
       */
diff --git a/patches/disable-firefox-suggest.patch b/patches/disable-firefox-suggest.patch
index af6ab17..26cfc54 100644
--- a/patches/disable-firefox-suggest.patch
+++ b/patches/disable-firefox-suggest.patch
@@ -25,10 +25,10 @@ index 43bea16286..499ee28bce 100644
              onPreferenceChangeListener = object : Preference.OnPreferenceChangeListener {
                  override fun onPreferenceChange(preference: Preference, newValue: Any?): Boolean {
 diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-index 7f19ba4304..12d254c8e3 100644
+index 9197b274db..c704357d27 100644
 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
 +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-@@ -2099,17 +2099,17 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -2103,17 +2103,17 @@ class Settings(private val appContext: Context) : PreferencesHolder {
      /**
       * Indicates if Firefox Suggest is enabled.
       */
@@ -50,7 +50,7 @@ index 7f19ba4304..12d254c8e3 100644
  
      /**
       * Indicates first time engaging with signup
-@@ -2123,21 +2123,21 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -2127,21 +2127,21 @@ class Settings(private val appContext: Context) : PreferencesHolder {
       * Indicates if the user has chosen to show sponsored search suggestions in the awesomebar.
       * The default value is computed lazily, and based on whether Firefox Suggest is enabled.
       */
diff --git a/patches/disable-link-sharing.patch b/patches/disable-link-sharing.patch
index a12ccb1..ff13f8d 100644
--- a/patches/disable-link-sharing.patch
+++ b/patches/disable-link-sharing.patch
@@ -12,10 +12,10 @@ index 325e5d2141..90833e35cd 100644
      }
  
 diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-index 7f19ba4304..b6ae44b19a 100644
+index 9197b274db..af31c06f8b 100644
 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
 +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-@@ -674,16 +674,16 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -679,16 +679,16 @@ class Settings(private val appContext: Context) : PreferencesHolder {
          }
      }
  
diff --git a/patches/disable-mars.patch b/patches/disable-mars.patch
index a0545d3..dd288b6 100644
--- a/patches/disable-mars.patch
+++ b/patches/disable-mars.patch
@@ -32,10 +32,10 @@ index 43bea16286..0245a82e17 100644
              onPreferenceChangeListener = object : SharedPreferenceUpdater() {
                  override fun onPreferenceChange(preference: Preference, newValue: Any?): Boolean {
 diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-index 7f19ba4304..213e392444 100644
+index 9197b274db..5ccaabf138 100644
 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
 +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-@@ -1805,11 +1805,11 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -1809,11 +1809,11 @@ class Settings(private val appContext: Context) : PreferencesHolder {
      /**
       * Indicates if the MARS API integration is used for sponsored content.
       */
diff --git a/patches/disable-microsurveys.patch b/patches/disable-microsurveys.patch
index 4b21454..3f9b632 100644
--- a/patches/disable-microsurveys.patch
+++ b/patches/disable-microsurveys.patch
@@ -12,10 +12,10 @@ index 43bea16286..7b4a264b5a 100644
              onPreferenceChangeListener = SharedPreferenceUpdater()
          }
 diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-index 7f19ba4304..dacddb4573 100644
+index 9197b274db..0c167a77fc 100644
 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
 +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-@@ -2218,19 +2218,19 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -2222,19 +2222,19 @@ class Settings(private val appContext: Context) : PreferencesHolder {
      /**
       * Indicates if the microsurvey feature is enabled.
       */
diff --git a/patches/disable-nags.patch b/patches/disable-nags.patch
index 366ef57..5f0197d 100644
--- a/patches/disable-nags.patch
+++ b/patches/disable-nags.patch
@@ -12,7 +12,7 @@ index e5ab956ac3..4d1ef3de39 100644
  
      private fun isNotDefaultBrowser(context: Context) =
 diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-index 7f19ba4304..0f29d724a6 100644
+index 9197b274db..2b38b6598d 100644
 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
 +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
 @@ -198,7 +198,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
@@ -24,7 +24,7 @@ index 7f19ba4304..0f29d724a6 100644
  
      var forceEnableZoom by booleanPreference(
          appContext.getPreferenceKey(R.string.pref_key_accessibility_force_enable_zoom),
-@@ -611,10 +611,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -616,10 +616,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
      /**
       * Indicates if the user has completed successfully first translation.
       */
@@ -39,7 +39,7 @@ index 7f19ba4304..0f29d724a6 100644
  
      /**
       * Indicates if the user wants translations to automatically be offered as a popup of the dialog.
-@@ -783,12 +783,12 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -788,12 +788,12 @@ class Settings(private val appContext: Context) : PreferencesHolder {
       * This will lead to a performance regression since that function can be expensive to call.
       */
      fun checkIfFenixIsDefaultBrowserOnAppResume(): Boolean {
@@ -58,7 +58,7 @@ index 7f19ba4304..0f29d724a6 100644
      }
  
      /**
-@@ -800,40 +800,40 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -805,40 +805,40 @@ class Settings(private val appContext: Context) : PreferencesHolder {
          return browsers.isDefaultBrowser
      }
  
@@ -111,7 +111,7 @@ index 7f19ba4304..0f29d724a6 100644
  
      val shouldUseAutoBatteryTheme by booleanPreference(
          appContext.getPreferenceKey(R.string.pref_key_auto_battery_theme),
-@@ -893,30 +893,30 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -898,30 +898,30 @@ class Settings(private val appContext: Context) : PreferencesHolder {
      /**
       * Indicates if the total cookie protection CRF should be shown.
       */
@@ -160,7 +160,7 @@ index 7f19ba4304..0f29d724a6 100644
  
      val blockCookiesSelectionInCustomTrackingProtection by stringPreference(
          key = appContext.getPreferenceKey(R.string.pref_key_tracking_protection_custom_cookies_select),
-@@ -1192,11 +1192,11 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -1197,11 +1197,11 @@ class Settings(private val appContext: Context) : PreferencesHolder {
      )
  
      private val userNeedsToVisitInstallableSites: Boolean
@@ -174,7 +174,7 @@ index 7f19ba4304..0f29d724a6 100644
              // We only want to show this on the 3rd time a user visits a site
              if (userNeedsToVisitInstallableSites) return false
  
-@@ -1212,42 +1212,42 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -1217,41 +1217,41 @@ class Settings(private val appContext: Context) : PreferencesHolder {
              return !userKnowsAboutPwas
          }
  
@@ -209,15 +209,13 @@ index 7f19ba4304..0f29d724a6 100644
 +//        default = true,
 +//    )
  
--    var shouldShowLockPbmBanner by lazyFeatureFlagPreference(
+-    var shouldShowLockPbmBanner by booleanPreference(
 -        appContext.getPreferenceKey(R.string.pref_key_should_show_lock_pbm_banner),
--        featureFlag = FxNimbus.features.privateBrowsingLock.value().enabled,
--        default = { true },
+-        true,
 -    )
 +    var shouldShowLockPbmBanner = false
 +//        appContext.getPreferenceKey(R.string.pref_key_should_show_lock_pbm_banner),
-+//        featureFlag = FxNimbus.features.privateBrowsingLock.value().enabled,
-+//        default = { true },
++//        true,
 +//    )
  
 -    var shouldShowInactiveTabsOnboardingPopup by booleanPreference(
@@ -243,7 +241,7 @@ index 7f19ba4304..0f29d724a6 100644
  
      /**
       * Indicates if the auto-close dialog should be visible based on
-@@ -1256,7 +1256,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -1260,7 +1260,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
       * and if the auto-close setting is already set to [closeTabsAfterOneMonth].
       */
      fun shouldShowInactiveTabsAutoCloseDialog(numbersOfTabs: Int): Boolean {
@@ -252,7 +250,7 @@ index 7f19ba4304..0f29d724a6 100644
              numbersOfTabs >= INACTIVE_TAB_MINIMUM_TO_SHOW_AUTO_CLOSE_DIALOG &&
              !closeTabsAfterOneMonth
      }
-@@ -1665,11 +1665,11 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -1669,11 +1669,11 @@ class Settings(private val appContext: Context) : PreferencesHolder {
      /**
       * Indicates if sync onboarding CFR should be shown.
       */
@@ -269,7 +267,7 @@ index 7f19ba4304..0f29d724a6 100644
  
      /**
       * Indicates if home onboarding dialog should be shown.
-@@ -1883,10 +1883,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -1887,10 +1887,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
      /**
       * Indicates if the search bar CFR should be displayed to the user.
       */
@@ -284,7 +282,7 @@ index 7f19ba4304..0f29d724a6 100644
  
      /**
       * Indicates whether or not to use remote server search configuration.
-@@ -1900,10 +1900,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -1904,10 +1904,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
      /**
       * Indicates if the menu CFR should be displayed to the user.
       */
@@ -299,7 +297,7 @@ index 7f19ba4304..0f29d724a6 100644
  
      /**
       * Get the current mode for how https-only is enabled.
-@@ -2114,10 +2114,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -2118,10 +2118,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
      /**
       * Indicates first time engaging with signup
       */
@@ -314,7 +312,7 @@ index 7f19ba4304..0f29d724a6 100644
  
      /**
       * Indicates if the user has chosen to show sponsored search suggestions in the awesomebar.
-@@ -2269,7 +2269,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -2273,7 +2273,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
       */
      val shouldShowSetAsDefaultPrompt: Boolean
          get() =
@@ -323,7 +321,7 @@ index 7f19ba4304..0f29d724a6 100644
                  DAYS_BETWEEN_DEFAULT_BROWSER_PROMPTS * ONE_DAY_MS &&
                  numberOfSetAsDefaultPromptShownTimes < MAX_NUMBER_OF_DEFAULT_BROWSER_PROMPTS &&
                  coldStartsBetweenSetAsDefaultPrompts >= APP_COLD_STARTS_TO_SHOW_DEFAULT_PROMPT
-@@ -2430,44 +2430,44 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -2434,44 +2434,44 @@ class Settings(private val appContext: Context) : PreferencesHolder {
      /**
       * Indicates if the user has completed the setup step for choosing the toolbar location
       */
diff --git a/patches/disable-pocket.patch b/patches/disable-pocket.patch
index f3e668c..a884b59 100644
--- a/patches/disable-pocket.patch
+++ b/patches/disable-pocket.patch
@@ -64,10 +64,10 @@ index 43bea16286..84ac3c7d2b 100644
  
          requirePreference<SwitchPreference>(R.string.pref_key_remote_server_prod).apply {
 diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-index 7f19ba4304..b8b9c0de7c 100644
+index 9197b274db..88ab712f7d 100644
 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
 +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-@@ -1728,20 +1728,20 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -1732,20 +1732,20 @@ class Settings(private val appContext: Context) : PreferencesHolder {
      /**
       * Indicates if the Pocket recommended stories homescreen section should be shown.
       */
@@ -98,7 +98,7 @@ index 7f19ba4304..b8b9c0de7c 100644
  
      /**
       * Get the profile id to use in the sponsored stories communications with the Pocket endpoint.
-@@ -1764,11 +1764,11 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -1768,11 +1768,11 @@ class Settings(private val appContext: Context) : PreferencesHolder {
      /**
       * Indicates if Merino content recommendations should be shown.
       */
diff --git a/patches/disable-recent-search-suggestions.patch b/patches/disable-recent-search-suggestions.patch
index 3944f5e..f1e0440 100644
--- a/patches/disable-recent-search-suggestions.patch
+++ b/patches/disable-recent-search-suggestions.patch
@@ -1,8 +1,8 @@
 diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-index 7f19ba4304..c2cff4ee23 100644
+index 9197b274db..2a82317df7 100644
 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
 +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-@@ -453,7 +453,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -458,7 +458,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
  
      val shouldShowHistorySuggestions by booleanPreference(
          appContext.getPreferenceKey(R.string.pref_key_search_browsing_history),
@@ -11,7 +11,7 @@ index 7f19ba4304..c2cff4ee23 100644
      )
  
      val shouldShowBookmarkSuggestions by booleanPreference(
-@@ -1169,7 +1169,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -1174,7 +1174,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
      @VisibleForTesting
      internal var recentSearchSuggestionsEnabled by booleanPreference(
          appContext.getPreferenceKey(R.string.pref_key_show_recent_search_suggestions),
@@ -20,7 +20,7 @@ index 7f19ba4304..c2cff4ee23 100644
      )
  
      /**
-@@ -2038,10 +2038,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -2042,10 +2042,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
      /**
       * Indicates if Recent Search Suggestions are enabled.
       */
diff --git a/patches/disable-remote-search-configuration.patch b/patches/disable-remote-search-configuration.patch
index 3960fa5..9fe5230 100644
--- a/patches/disable-remote-search-configuration.patch
+++ b/patches/disable-remote-search-configuration.patch
@@ -12,10 +12,10 @@ index 43bea16286..550de3f6ec 100644
              onPreferenceChangeListener = object : SharedPreferenceUpdater() {
                  override fun onPreferenceChange(preference: Preference, newValue: Any?): Boolean {
 diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-index 7f19ba4304..47851006a1 100644
+index 9197b274db..2c274d4ddf 100644
 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
 +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-@@ -1891,11 +1891,11 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -1895,11 +1895,11 @@ class Settings(private val appContext: Context) : PreferencesHolder {
      /**
       * Indicates whether or not to use remote server search configuration.
       */
diff --git a/patches/disable-search-suggestions.patch b/patches/disable-search-suggestions.patch
index b43367d..06dc84b 100644
--- a/patches/disable-search-suggestions.patch
+++ b/patches/disable-search-suggestions.patch
@@ -1,8 +1,8 @@
 diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-index 7f19ba4304..f7aee560b2 100644
+index 9197b274db..493fb9d2ff 100644
 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
 +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-@@ -1136,7 +1136,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -1141,7 +1141,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
  
      val shouldShowSearchSuggestions by booleanPreference(
          appContext.getPreferenceKey(R.string.pref_key_show_search_suggestions),
@@ -11,7 +11,7 @@ index 7f19ba4304..f7aee560b2 100644
      )
  
      val shouldAutocompleteInAwesomebar by booleanPreference(
-@@ -1178,10 +1178,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -1183,10 +1183,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
      val shouldShowRecentSearchSuggestions: Boolean
          get() = recentSearchSuggestionsEnabled && isRecentSearchesVisible
  
diff --git a/patches/disable-trending-search-suggestions.patch b/patches/disable-trending-search-suggestions.patch
index 2b18df1..83f1d9d 100644
--- a/patches/disable-trending-search-suggestions.patch
+++ b/patches/disable-trending-search-suggestions.patch
@@ -1,8 +1,8 @@
 diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-index 7f19ba4304..e3b088c465 100644
+index 9197b274db..2d4bd39e68 100644
 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
 +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-@@ -1160,7 +1160,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -1165,7 +1165,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
      @VisibleForTesting
      internal var trendingSearchSuggestionsEnabled by booleanPreference(
          appContext.getPreferenceKey(R.string.pref_key_show_trending_search_suggestions),
@@ -11,7 +11,7 @@ index 7f19ba4304..e3b088c465 100644
      )
  
      /**
-@@ -2029,10 +2029,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -2033,10 +2033,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
      /**
       * Indicates if Trending Search Suggestions are enabled.
       */
diff --git a/patches/enable-light-mode-by-default.patch b/patches/enable-light-mode-by-default.patch
index a679d2e..a173f1d 100644
--- a/patches/enable-light-mode-by-default.patch
+++ b/patches/enable-light-mode-by-default.patch
@@ -1,8 +1,8 @@
 diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-index 7f19ba4304..f1b92b57eb 100644
+index 9197b274db..2272dd372c 100644
 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
 +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-@@ -438,7 +438,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -443,7 +443,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
  
      var shouldUseLightTheme by booleanPreference(
          appContext.getPreferenceKey(R.string.pref_key_light_theme),
diff --git a/patches/enable-secret-settings.patch b/patches/enable-secret-settings.patch
index 7df1ef8..04519dc 100644
--- a/patches/enable-secret-settings.patch
+++ b/patches/enable-secret-settings.patch
@@ -56,10 +56,10 @@ index 43bea16286..269d107b01 100644
              onPreferenceChangeListener = SharedPreferenceUpdater()
          }
 diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-index 7f19ba4304..7cbbc5b263 100644
+index 9197b274db..dcd1cc146d 100644
 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
 +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-@@ -472,10 +472,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -477,10 +477,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
      /**
       * Returns true if shortcut suggestions feature should be shown to the user.
       */
@@ -73,7 +73,7 @@ index 7f19ba4304..7cbbc5b263 100644
      )
  
      /**
-@@ -1866,18 +1866,18 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -1870,18 +1870,18 @@ class Settings(private val appContext: Context) : PreferencesHolder {
          default = true,
      )
  
@@ -100,7 +100,7 @@ index 7f19ba4304..7cbbc5b263 100644
      )
  
      /**
-@@ -1985,37 +1985,37 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -1989,37 +1989,37 @@ class Settings(private val appContext: Context) : PreferencesHolder {
      /**
       * Indicates if the Compose Homepage is enabled.
       */
@@ -150,7 +150,7 @@ index 7f19ba4304..7cbbc5b263 100644
      )
  
      /**
-@@ -2023,7 +2023,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -2027,7 +2027,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
       */
      var enableUnifiedTrustPanel by booleanPreference(
          key = appContext.getPreferenceKey(R.string.pref_key_enable_unified_trust_panel),
diff --git a/patches/fenix-disable-crash-reporting.patch b/patches/fenix-disable-crash-reporting.patch
index 4774297..a8bed25 100644
--- a/patches/fenix-disable-crash-reporting.patch
+++ b/patches/fenix-disable-crash-reporting.patch
@@ -421,7 +421,7 @@ index 6725aa64a0..724b1674cf 100644
                  val directions =
                      SearchDialogFragmentDirections.actionGlobalAddonsManagementFragment()
 diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-index 7f19ba4304..5e64718c0f 100644
+index 9197b274db..8e72f5bbf0 100644
 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
 +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
 @@ -168,7 +168,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
@@ -433,7 +433,7 @@ index 7f19ba4304..5e64718c0f 100644
  
      override val preferences: SharedPreferences =
          appContext.getSharedPreferences(FENIX_PREFERENCES, MODE_PRIVATE)
-@@ -364,10 +364,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -369,10 +369,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
      )
  
      val isCrashReportingEnabled: Boolean
@@ -446,7 +446,7 @@ index 7f19ba4304..5e64718c0f 100644
              )
  
      val isRemoteDebuggingEnabled by booleanPreference(
-@@ -2310,10 +2310,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -2314,10 +2314,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
       * A user preference indicating that crash reports should always be automatically sent. This can be updated
       * through the unsubmitted crash dialog or through data choice preferences.
       */
diff --git a/patches/fenix-disable-nimbus.patch b/patches/fenix-disable-nimbus.patch
index f99d2e8..e8cd08b 100644
--- a/patches/fenix-disable-nimbus.patch
+++ b/patches/fenix-disable-nimbus.patch
@@ -192,7 +192,7 @@ index 472e3bf5a8..b2a4842c16 100644
                                      initialFrom = translationsDialogState?.initialFrom,
                                      onBackClicked = { translationsVisibility = true },
 diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-index 7f19ba4304..f35f7d2bab 100644
+index 9197b274db..326d068e94 100644
 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
 +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
 @@ -225,10 +225,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
@@ -228,17 +228,17 @@ index 7f19ba4304..f35f7d2bab 100644
          default = false,
      )
  
--    var privateBrowsingLockedEnabled by lazyFeatureFlagPreference(
-+    var privateBrowsingLockedEnabled by booleanPreference(
-         appContext.getPreferenceKey(R.string.pref_key_private_browsing_locked_enabled),
--        featureFlag = FxNimbus.features.privateBrowsingLock.value().enabled,
--        default = { false },
-+//        featureFlag = FxNimbus.features.privateBrowsingLock.value().enabled,
-+        default = false ,
+-    var privateBrowsingLockedFeatureEnabled by lazyFeatureFlagPreference(
++    var privateBrowsingLockedFeatureEnabled by booleanPreference(
+         key = appContext.getPreferenceKey(R.string.pref_key_private_browsing_locked_enabled),
+-        featureFlag = true,
+-        default = { FxNimbus.features.privateBrowsingLock.value().enabled },
++//        featureFlag = true,
++        default = false,
      )
  
-     var shouldReturnToBrowser by booleanPreference(
-@@ -407,10 +407,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+     var privateBrowsingModeLocked by booleanPreference(
+@@ -412,10 +412,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
          persistDefaultIfNotExists = true,
      )
  
@@ -253,7 +253,7 @@ index 7f19ba4304..f35f7d2bab 100644
  
      var isOverrideTPPopupsForPerformanceTest = false
  
-@@ -529,10 +529,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -534,10 +534,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
          default = false,
      )
  
@@ -268,7 +268,7 @@ index 7f19ba4304..f35f7d2bab 100644
  
      var isFirstNimbusRun: Boolean by booleanPreference(
          appContext.getPreferenceKey(R.string.pref_key_is_first_run),
-@@ -1674,10 +1674,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -1678,10 +1678,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
      /**
       * Indicates if home onboarding dialog should be shown.
       */
@@ -282,7 +282,7 @@ index 7f19ba4304..f35f7d2bab 100644
      )
  
      /**
-@@ -2153,7 +2153,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -2157,7 +2157,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
       * Indicates if the feature to close synced tabs is enabled.
       */
      val enableCloseSyncedTabs: Boolean
diff --git a/patches/fenix-disable-telemetry.patch b/patches/fenix-disable-telemetry.patch
index 7f2ea9b..2660efc 100644
--- a/patches/fenix-disable-telemetry.patch
+++ b/patches/fenix-disable-telemetry.patch
@@ -513,10 +513,10 @@ index 43bea16286..8f460115af 100644
                  onPreferenceChangeListener =
                      Preference.OnPreferenceChangeListener { _, newValue ->
 diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-index 7f19ba4304..73dce8c20f 100644
+index 9197b274db..5cd8fcfa66 100644
 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
 +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-@@ -375,20 +375,20 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -380,20 +380,20 @@ class Settings(private val appContext: Context) : PreferencesHolder {
          default = false,
      )
  
@@ -549,7 +549,7 @@ index 7f19ba4304..73dce8c20f 100644
  
      var hasAcceptedTermsOfService by booleanPreference(
          appContext.getPreferenceKey(R.string.pref_key_terms_accepted),
-@@ -401,11 +401,11 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -406,11 +406,11 @@ class Settings(private val appContext: Context) : PreferencesHolder {
       * sure that users who upgrade and had telemetry disabled don't start sending the
       * daily usage ping telemetry.
       */
diff --git a/patches/fenix-liberate.patch b/patches/fenix-liberate.patch
index 972748c..309f97e 100644
--- a/patches/fenix-liberate.patch
+++ b/patches/fenix-liberate.patch
@@ -1000,10 +1000,10 @@ index e13ebe821f..05b8d2c5ff 100644
  
      /**
 diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-index 7f19ba4304..0e7c2d118b 100644
+index 9197b274db..c3728d2f69 100644
 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
 +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-@@ -1861,10 +1861,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -1865,10 +1865,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
      /**
       * Indicates if the marketing onboarding card should be shown to the user.
       */
@@ -1012,6 +1012,9 @@ index 7f19ba4304..0e7c2d118b 100644
 -        default = true,
 -    )
 +    var shouldShowMarketingOnboarding = false
++//        appContext.getPreferenceKey(R.string.pref_key_should_show_marketing_onboarding),
++//        default = true,
++//    )
  
      val feltPrivateBrowsingEnabled by lazyFeatureFlagPreference(
          key = appContext.getPreferenceKey(R.string.pref_key_should_enable_felt_privacy),
diff --git a/patches/force-enable-zoom.patch b/patches/force-enable-zoom.patch
index 993b51a..b022380 100644
--- a/patches/force-enable-zoom.patch
+++ b/patches/force-enable-zoom.patch
@@ -1,5 +1,5 @@
 diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-index 7f19ba4304..86cd8f36d5 100644
+index 9197b274db..907a002508 100644
 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
 +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
 @@ -202,7 +202,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
diff --git a/patches/https_only.patch b/patches/https_only.patch
index 31e8a83..b7d1783 100644
--- a/patches/https_only.patch
+++ b/patches/https_only.patch
@@ -1,8 +1,8 @@
 diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-index 7f19ba4304..530b3a737c 100644
+index 9197b274db..7915e64ee8 100644
 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
 +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-@@ -717,7 +717,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -722,7 +722,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
  
      var shouldUseHttpsOnly by booleanPreference(
          appContext.getPreferenceKey(R.string.pref_key_https_only),
diff --git a/patches/ironfox-home.patch b/patches/ironfox-home.patch
index 2a33856..4cd5561 100644
--- a/patches/ironfox-home.patch
+++ b/patches/ironfox-home.patch
@@ -1,5 +1,5 @@
 diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-index 7f19ba4304..1425289fe4 100644
+index 9197b274db..16ef08e767 100644
 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
 +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
 @@ -176,10 +176,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
@@ -16,7 +16,7 @@ index 7f19ba4304..1425289fe4 100644
      )
  
      var numberOfAppLaunches by intPreference(
-@@ -358,10 +358,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -363,10 +363,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
          default = false,
      )
  
@@ -31,7 +31,7 @@ index 7f19ba4304..1425289fe4 100644
  
      val isCrashReportingEnabled: Boolean
          get() = isCrashReportEnabledInBuild &&
-@@ -1144,10 +1144,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -1149,10 +1149,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
          default = true,
      )
  
@@ -46,7 +46,7 @@ index 7f19ba4304..1425289fe4 100644
  
      var shouldShowSearchSuggestionsInPrivate by booleanPreference(
          appContext.getPreferenceKey(R.string.pref_key_show_search_suggestions_in_private),
-@@ -1656,10 +1656,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -1660,10 +1660,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
          get() =
              FxNimbus.features.homescreen.value().sectionsEnabled
  
@@ -60,7 +60,7 @@ index 7f19ba4304..1425289fe4 100644
      )
  
      /**
-@@ -1683,19 +1683,19 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -1687,19 +1687,19 @@ class Settings(private val appContext: Context) : PreferencesHolder {
      /**
       * Indicates if the recent tabs functionality should be visible.
       */
diff --git a/patches/js-settings.patch b/patches/js-settings.patch
index 4226f2d..99c10f9 100644
--- a/patches/js-settings.patch
+++ b/patches/js-settings.patch
@@ -181,10 +181,10 @@ index cfbdaba62c..931b6d6052 100644
                  Build.VERSION.SDK_INT >= Build.VERSION_CODES.M,
              testingModeEnabled = false,
 diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-index 7f19ba4304..0f370867f9 100644
+index 9197b274db..a2f6d50a3c 100644
 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
 +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-@@ -1349,6 +1349,21 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -1353,6 +1353,21 @@ class Settings(private val appContext: Context) : PreferencesHolder {
          }
      }
  
diff --git a/patches/remote-debugging.patch b/patches/remote-debugging.patch
index ddd8523..fb771fa 100644
--- a/patches/remote-debugging.patch
+++ b/patches/remote-debugging.patch
@@ -1,8 +1,8 @@
 diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-index 7f19ba4304..ad03528ff2 100644
+index 9197b274db..9c4d52f60b 100644
 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
 +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-@@ -370,10 +370,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -375,10 +375,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
                  true,
              )
  
diff --git a/patches/safe-browsing.patch b/patches/safe-browsing.patch
index 08ceee7..1edf772 100644
--- a/patches/safe-browsing.patch
+++ b/patches/safe-browsing.patch
@@ -136,10 +136,10 @@ index 325e5d2141..df435300a3 100644
      internal fun setupInstallAddonFromFilePreference(settings: Settings) {
          with(requirePreference<Preference>(R.string.pref_key_install_local_addon)) {
 diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-index 7f19ba4304..cbfa894b4b 100644
+index 9197b274db..11df72604c 100644
 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
 +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-@@ -776,6 +776,11 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -781,6 +781,11 @@ class Settings(private val appContext: Context) : PreferencesHolder {
      val queryParameterStrippingStripList: String
          get() = queryParameterStrippingSection[QUERY_PARAMETER_STRIPPING_STRIP_LIST].orEmpty()
  
diff --git a/patches/sanitize-on-exit.patch b/patches/sanitize-on-exit.patch
index 61a9662..d55e1a7 100644
--- a/patches/sanitize-on-exit.patch
+++ b/patches/sanitize-on-exit.patch
@@ -1,8 +1,8 @@
 diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-index 7f19ba4304..7631adcb84 100644
+index 9197b274db..44daa442d2 100644
 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
 +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-@@ -1016,7 +1016,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -1021,7 +1021,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
  
      var shouldDeleteBrowsingDataOnQuit by booleanPreference(
          appContext.getPreferenceKey(R.string.pref_key_delete_browsing_data_on_quit),
@@ -11,7 +11,7 @@ index 7f19ba4304..7631adcb84 100644
      )
  
      var deleteOpenTabs by booleanPreference(
-@@ -1096,8 +1096,17 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -1101,8 +1101,17 @@ class Settings(private val appContext: Context) : PreferencesHolder {
              return touchExplorationIsEnabled || switchServiceIsEnabled
          }
  
diff --git a/patches/strict_etp.patch b/patches/strict_etp.patch
index ab0b062..53c2c87 100644
--- a/patches/strict_etp.patch
+++ b/patches/strict_etp.patch
@@ -1,8 +1,8 @@
 diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-index 7f19ba4304..77de5dd6be 100644
+index 9197b274db..9ede7fe3f4 100644
 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
 +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-@@ -730,10 +730,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -735,10 +735,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
          default = false,
      )
  
@@ -17,7 +17,7 @@ index 7f19ba4304..77de5dd6be 100644
  
      var shouldEnableGlobalPrivacyControl by booleanPreference(
          appContext.getPreferenceKey(R.string.pref_key_privacy_enable_global_privacy_control),
-@@ -840,20 +840,20 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -845,20 +845,20 @@ class Settings(private val appContext: Context) : PreferencesHolder {
          default = false,
      )
  
diff --git a/patches/tor-spoof-english.patch b/patches/tor-spoof-english.patch
index f71ac31..f022e63 100644
--- a/patches/tor-spoof-english.patch
+++ b/patches/tor-spoof-english.patch
@@ -123,10 +123,10 @@ index 91929aab38..a45b807f84 100644
          inflater.inflate(R.menu.languages_list, menu)
          val searchItem = menu.findItem(R.id.search)
 diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-index 7f19ba4304..e02e9052ee 100644
+index 9197b274db..1bff52be02 100644
 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
 +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
-@@ -343,6 +343,11 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -348,6 +348,11 @@ class Settings(private val appContext: Context) : PreferencesHolder {
          false,
      )
  
@@ -134,7 +134,7 @@ index 7f19ba4304..e02e9052ee 100644
 +        appContext.getPreferenceKey(R.string.pref_key_spoof_english),
 +        default = true
 +    )
-+
++    
      var defaultSearchEngineName by stringPreference(
          appContext.getPreferenceKey(R.string.pref_key_search_engine),
          default = "",
diff --git a/scripts/versions.sh b/scripts/versions.sh
index b96cb71..6593371 100644
--- a/scripts/versions.sh
+++ b/scripts/versions.sh
@@ -2,7 +2,7 @@
 # shellcheck disable=SC2034
 
 # Sources
-FIREFOX_VERSION="140.0"
+FIREFOX_VERSION="140.0.3"
 IRONFOX_VERSION="${FIREFOX_VERSION}"
 FIREFOX_RELEASE_TAG="FIREFOX-ANDROID_${FIREFOX_VERSION//./_}_RELEASE"
 FIREFOX_RELEASE_PATH="releases/${FIREFOX_VERSION}"