diff --git a/patches/block-autoplay-by-default.patch b/patches/block-autoplay-by-default.patch
index 9232a7b..e0436f9 100644
--- a/patches/block-autoplay-by-default.patch
+++ b/patches/block-autoplay-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 df8ac39bb3..27308c8f49 100644
+index b800c22431..09b5d24039 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
-@@ -1166,7 +1166,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -1216,7 +1216,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.
       */
@@ -11,7 +11,7 @@ index df8ac39bb3..27308c8f49 100644
  
      private fun getSitePermissionsPhoneFeatureAutoplayAction(
          feature: PhoneFeature,
-@@ -1195,7 +1195,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -1245,7 +1245,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
              ),
              autoplayInaudible = getSitePermissionsPhoneFeatureAutoplayAction(
                  feature = PhoneFeature.AUTOPLAY_INAUDIBLE,
diff --git a/patches/block-cookie-banners.patch b/patches/block-cookie-banners.patch
index a45a9a1..94fa136 100644
--- a/patches/block-cookie-banners.patch
+++ b/patches/block-cookie-banners.patch
@@ -1,9 +1,9 @@
 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 2842a8204c..5a81d93037 100644
+index b800c22431..ee55f25475 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
-@@ -654,20 +654,17 @@ class Settings(private val appContext: Context) : PreferencesHolder {
-         true,
+@@ -682,20 +682,17 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+         false,
      )
  
 -    var shouldUseCookieBannerPrivateMode by lazyFeatureFlagPreference(
@@ -28,10 +28,10 @@ index 2842a8204c..5a81d93037 100644
      val shouldEnableCookieBannerDetectOnly: Boolean
          get() = cookieBannersSection[CookieBannersSection.FEATURE_SETTING_DETECT_ONLY] == 1
 diff --git a/mobile/android/fenix/app/src/main/res/xml/preferences.xml b/mobile/android/fenix/app/src/main/res/xml/preferences.xml
-index c03abd3..2abf25c 100644
+index 3b85a2a548..cad50ee74a 100644
 --- a/mobile/android/fenix/app/src/main/res/xml/preferences.xml
 +++ b/mobile/android/fenix/app/src/main/res/xml/preferences.xml
-@@ -111,7 +111,7 @@
+@@ -118,7 +118,7 @@
          <org.mozilla.fenix.settings.cookiebannerhandling.CustomCBHSwitchPreference
              android:key="@string/pref_key_cookie_banner_private_mode"
              app:iconSpaceReserved="false"
diff --git a/patches/branding.patch b/patches/branding.patch
index 1045c80..d8c4e85 100644
--- a/patches/branding.patch
+++ b/patches/branding.patch
@@ -26,10 +26,19 @@ index dad9a16c7a..386de41582 100644
  
 
 diff --git a/toolkit/moz.configure b/toolkit/moz.configure
-index 5873dbec0a..e9bbecfc37 100644
+index e5e517635d..d5398ccbf1 100644
 --- a/toolkit/moz.configure
 +++ b/toolkit/moz.configure
-@@ -3177,7 +3177,7 @@ def android_package_name(value, moz_app_name):
+@@ -90,7 +90,7 @@ set_config("MOZ_INCLUDE_SOURCE_INFO", True, when="MOZ_INCLUDE_SOURCE_INFO")
+ option(
+     "--with-distribution-id",
+     nargs=1,
+-    default="org.mozilla",
++    default="org.ironfoxoss",
+     help="Set distribution-specific id",
+ )
+ set_config("MOZ_DISTRIBUTION_ID", depends("--with-distribution-id")(lambda v: v[0]))
+@@ -3262,7 +3262,7 @@ def android_package_name(value, moz_app_name):
          return value[0]
      if moz_app_name == "fennec":
          return "org.mozilla.fennec_aurora"
diff --git a/patches/disable-autocomplete.patch b/patches/disable-autocomplete.patch
index 57325bd..7a0eb27 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 807c5c2..4e96345 100644
+index b800c22431..6a3049e569 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
-@@ -1032,7 +1032,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -1077,7 +1077,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
  
      val shouldAutocompleteInAwesomebar by booleanPreference(
          appContext.getPreferenceKey(R.string.pref_key_enable_autocomplete_urls),
@@ -12,10 +12,10 @@ index 807c5c2..4e96345 100644
  
      var defaultTopSitesAdded by booleanPreference(
 diff --git a/mobile/android/fenix/app/src/main/res/xml/search_settings_preferences.xml b/mobile/android/fenix/app/src/main/res/xml/search_settings_preferences.xml
-index a4de5c1..700b52e 100644
+index da8132091b..829702f2c9 100644
 --- a/mobile/android/fenix/app/src/main/res/xml/search_settings_preferences.xml
 +++ b/mobile/android/fenix/app/src/main/res/xml/search_settings_preferences.xml
-@@ -92,7 +92,7 @@
+@@ -99,7 +99,7 @@
              android:title="@string/preferences_show_voice_search" />
          <SwitchPreference
              app:iconSpaceReserved="false"
diff --git a/patches/disable-autofill.patch b/patches/disable-autofill.patch
index 38fe86d..08ce642 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 777a555948..eef6aa478b 100644
+index b800c22431..87d9e7d3e6 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
-@@ -1272,12 +1272,12 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -1296,12 +1296,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 777a555948..eef6aa478b 100644
      )
  
      /**
-@@ -1642,7 +1642,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -1641,7 +1641,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 777a555948..eef6aa478b 100644
      )
  
      /**
-@@ -1653,7 +1653,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -1652,7 +1652,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-microsurveys.patch b/patches/disable-microsurveys.patch
index 2463128..e423f20 100644
--- a/patches/disable-microsurveys.patch
+++ b/patches/disable-microsurveys.patch
@@ -1,21 +1,8 @@
-diff --git a/mobile/android/fenix/app/nimbus.fml.yaml b/mobile/android/fenix/app/nimbus.fml.yaml
-index 8f6c6df..7a8db7e 100644
---- a/mobile/android/fenix/app/nimbus.fml.yaml
-+++ b/mobile/android/fenix/app/nimbus.fml.yaml
-@@ -549,7 +549,7 @@ features:
-         description: >
-           When the feature is enabled then microsurveys can be used.
-         type: Boolean
--        default: true
-+        default: false
- 
-   set-as-default-prompt:
-     description: >
 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 777a555948..e90227f9e3 100644
+index b800c22431..020c7d59cc 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
-@@ -2137,19 +2137,12 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -2155,19 +2155,12 @@ class Settings(private val appContext: Context) : PreferencesHolder {
      /**
       * Indicates if the microsurvey feature is enabled.
       */
diff --git a/patches/disable-search-suggestions.patch b/patches/disable-search-suggestions.patch
index 42291ce..c355f71 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 777a555948..c4d74f0de2 100644
+index b800c22431..9638c9e04a 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
-@@ -1064,7 +1064,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+@@ -1072,7 +1072,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
  
      val shouldShowSearchSuggestions by booleanPreference(
          appContext.getPreferenceKey(R.string.pref_key_show_search_suggestions),
@@ -11,9 +11,9 @@ index 777a555948..c4d74f0de2 100644
      )
  
      val shouldAutocompleteInAwesomebar by booleanPreference(
-@@ -1082,10 +1082,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
-         default = false,
-     )
+@@ -1106,10 +1106,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
+         trendingSearchSuggestionsEnabled && isTrendingSearchesVisible &&
+             searchEngine?.trendingUrl != null && (!isPrivate || shouldShowSearchSuggestionsInPrivate)
  
 -    var showSearchSuggestionsInPrivateOnboardingFinished by booleanPreference(
 -        appContext.getPreferenceKey(R.string.pref_key_show_search_suggestions_in_private_onboarding),
@@ -22,7 +22,7 @@ index 777a555948..c4d74f0de2 100644
 +    var showSearchSuggestionsInPrivateOnboardingFinished = true
  
      fun incrementVisitedInstallableCount() = pwaInstallableVisitCount.increment()
-     
+ 
 diff --git a/mobile/android/fenix/app/src/main/res/xml/search_settings_preferences.xml b/mobile/android/fenix/app/src/main/res/xml/search_settings_preferences.xml
 index a4de5c1..e15e096 100644
 --- a/mobile/android/fenix/app/src/main/res/xml/search_settings_preferences.xml