diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index b11a4c32f..c31179fb4 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -50,11 +50,4 @@
 # Possible regressions throughout the app
 *.pro @mozilla-mobile/Performance
 *proguard* @mozilla-mobile/Performance
-
-# Possible startup regressions
-*Application.kt @mozilla-mobile/Performance
-
-# We want to be aware of new features behind flags as well as features
-# about to be enabled.
-FeatureFlags.kt @mozilla-mobile/Performance
 # --- PERFORMANCE END --- #
diff --git a/.github/workflows/build-contributor-pr.yml b/.github/workflows/build-contributor-pr.yml
index e890fa5bc..4f09120a9 100644
--- a/.github/workflows/build-contributor-pr.yml
+++ b/.github/workflows/build-contributor-pr.yml
@@ -105,3 +105,30 @@ jobs:
           name: lintDebug report
           path: app/build/reports/lint-results-debug.html
 
+  run-ui:
+    runs-on: macos-latest
+    if: github.event.pull_request.head.repo.full_name != github.repository && github.actor != 'MickeyMoz'
+
+    timeout-minutes: 60
+    strategy:
+      matrix:
+        api-level: [28]
+        target: [google_apis]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Run subset of UI Tests
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: ${{ matrix.api-level }}
+          target: ${{ matrix.target }}
+          arch: x86_64
+          profile: pixel_3a
+          script:
+            "./gradlew connectedDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=\
+            org.mozilla.fenix.ui.NavigationToolbarTest#visitURLTest"
+      - name: Upload Test Artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: test-report
+          path: app/build/reports
diff --git a/.github/workflows/sync-strings.yml b/.github/workflows/sync-strings.yml
index 35e1c5544..6578c36a1 100644
--- a/.github/workflows/sync-strings.yml
+++ b/.github/workflows/sync-strings.yml
@@ -6,7 +6,7 @@ name: "Sync Strings"
 
 on:
   schedule:
-    - cron: '0 */4 * * *'
+    - cron: '0 2 * * *'
 
 jobs:
   main:
@@ -15,9 +15,7 @@ jobs:
     steps:
       - name: "Discover Fenix Beta Version"
         id: fenix-beta-version
-        uses: mozilla-mobile/fenix-beta-version@1.0.0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        uses: mozilla-mobile/fenix-beta-version@1.1.0
       - name: "Checkout Master Branch"
         uses: actions/checkout@v2
         with:
diff --git a/app/build.gradle b/app/build.gradle
index 5f5711313..cbc19c830 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -198,18 +198,12 @@ android {
         androidTest {
             resources.srcDirs += ['src/androidTest/resources']
         }
-        debug {
-            java.srcDirs = ['src/geckoNightly/java']
-        }
-        nightly {
-            java.srcDirs = ['src/geckoNightly/java']
-        }
         beta {
-            java.srcDirs = ['src/migration/java', 'src/geckoBeta/java']
+            java.srcDirs = ['src/migration/java']
             manifest.srcFile "src/migration/AndroidManifest.xml"
         }
         release {
-            java.srcDirs = ['src/migration/java', 'src/geckoRelease/java']
+            java.srcDirs = ['src/migration/java']
             manifest.srcFile "src/migration/AndroidManifest.xml"
         }
         forkDebug {
@@ -281,7 +275,7 @@ android.applicationVariants.all { variant ->
 
     def isDebug = variant.buildType.resValues['IS_DEBUG']?.value ?: false
     def useReleaseVersioning = variant.buildType.buildConfigFields['USE_RELEASE_VERSIONING']?.value ?: false
-    def versionName = Config.releaseVersionName(project) == "" ? Config.generateDebugVersionName() : Config.releaseVersionName(project)
+    def versionName = variant.buildType.name == 'nightly' ? Config.nightlyVersionName() : Config.releaseVersionName(project)
 
     println("----------------------------------------------")
     println("Variant name:      " + variant.name)
@@ -295,9 +289,9 @@ android.applicationVariants.all { variant ->
         // The Google Play Store does not allow multiple APKs for the same app that all have the
         // same version code. Therefore we need to have different version codes for our ARM and x86
         // builds.
-        
-        println("Version Name:      " + versionName)
-        
+
+        println("versionName override: $versionName")
+
         variant.outputs.each { output ->
             def abi = output.getFilter(OutputFile.ABI)
             // We use the same version code generator, that we inherited from Fennec, across all channels - even on
@@ -416,9 +410,7 @@ androidExtensions {
     experimental = true
 }
 
-// Generate Kotlin code and markdown docs for the Fenix Glean metrics.
-ext.gleanGenerateMarkdownDocs = true
-ext.gleanDocsDirectory = "$rootDir/docs"
+// Generate Kotlin code for the Fenix Glean metrics.
 apply plugin: "org.mozilla.telemetry.glean-gradle-plugin"
 
 configurations {
@@ -446,13 +438,7 @@ dependencies {
     jnaForTest Deps.jna
     testImplementation files(configurations.jnaForTest.copyRecursive().files)
 
-    debugImplementation Deps.mozilla_browser_engine_gecko_nightly
-    forkDebugImplementation Deps.mozilla_browser_engine_gecko_nightly
-
-    nightlyImplementation Deps.mozilla_browser_engine_gecko_nightly
-    betaImplementation Deps.mozilla_browser_engine_gecko_beta
-    releaseImplementation Deps.mozilla_browser_engine_gecko_release
-    forkReleaseImplementation Deps.mozilla_browser_engine_gecko_release
+    implementation  Deps.mozilla_browser_engine_gecko
 
     implementation Deps.kotlin_stdlib
     implementation Deps.kotlin_coroutines
@@ -479,7 +465,6 @@ dependencies {
     implementation Deps.mozilla_browser_icons
     implementation Deps.mozilla_browser_menu
     implementation Deps.mozilla_browser_menu2
-    implementation Deps.mozilla_browser_search
     implementation Deps.mozilla_browser_session
     implementation Deps.mozilla_browser_session_storage
     implementation Deps.mozilla_browser_state
@@ -548,6 +533,7 @@ dependencies {
     implementation Deps.mozilla_ui_tabcounter
 
     implementation Deps.mozilla_lib_crash
+    implementation Deps.mozilla_lib_state
     implementation Deps.mozilla_lib_dataprotect
     debugImplementation Deps.leakcanary
     forkDebugImplementation Deps.leakcanary
@@ -572,6 +558,8 @@ dependencies {
     androidTestImplementation Deps.uiautomator
 // Removed pending AndroidX fixes
     androidTestImplementation "tools.fastlane:screengrab:2.0.0"
+    // This Falcon version is added to maven central now required for Screengrab
+    implementation 'com.jraska:falcon:2.2.0'
 //    androidTestImplementation "br.com.concretesolutions:kappuccino:1.2.1"
 
     androidTestImplementation Deps.espresso_core, {
diff --git a/app/metrics.yaml b/app/metrics.yaml
index 59f89331d..3e63f22ec 100644
--- a/app/metrics.yaml
+++ b/app/metrics.yaml
@@ -70,17 +70,19 @@ events:
       - https://github.com/mozilla-mobile/fenix/issues/12573
       - https://github.com/mozilla-mobile/fenix/pull/13494
       - https://github.com/mozilla-mobile/fenix/issues/10069
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/12114#pullrequestreview-445245341
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/13494#pullrequestreview-474050499
       - https://github.com/mozilla-mobile/fenix/pull/15605#issuecomment-702365594
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
       - esmyth@mozilla.com
       - perf-android-fe@mozilla.com
-    expires: "2021-06-01"
+    expires: "2021-12-01"
   app_received_intent:
     type: event
     description: |
@@ -101,13 +103,15 @@ events:
           `custom_tab`, `link` or `unknown`
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/11830
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/11940/
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     notification_emails:
       - esmyth@mozilla.com
       - perf-android-fe@mozilla.com
-    expires: "2021-06-01"
+    expires: "2021-12-01"
   app_opened:
     type: event
     description: |
@@ -120,16 +124,18 @@ events:
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/968
       - https://github.com/mozilla-mobile/fenix/issues/10616
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/1067#issuecomment-474598673
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
       - telemetry-client-dev@mozilla.com
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
   search_bar_tapped:
     type: event
     description: |
@@ -141,15 +147,17 @@ events:
           `Home` or `Browser`)
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/959
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/1067#issuecomment-474598673
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
   entered_url:
     type: event
     description: |
@@ -161,15 +169,17 @@ events:
           Autocomplete suggestion
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/959
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/1067#issuecomment-474598673
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
   performed_search:
     type: event
     description: |
@@ -186,16 +196,18 @@ events:
           * shortcut.suggestion
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/959
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/1067#issuecomment-474598673
       - https://github.com/mozilla-mobile/fenix/pull/1677
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
   browser_menu_action:
     type: event
     description: |
@@ -205,24 +217,28 @@ events:
         description: |
           A string containing the name of the item the user tapped. These items
           include:
-
-            Settings, Help, Desktop Site toggle on/off, Find in Page,
-            New Tab, Private Tab, Share, Report Site Issue, Back/Forward button,
-            Reload Button, Quit, Reader Mode On, Reader Mode Off, Open In app,
-            Add To Top Sites, Add-ons Manager, Bookmarks, History
+          add_to_homescreen, add_to_top_sites, addons_manager, back, bookmark,
+          bookmarks, desktop_view_off, desktop_view_on, downloads,
+          find_in_page, forward, help, history, library, new_private_tab,
+          new_tab, open_in_app, open_in_fenix, quit, reader_mode_appearance,
+          reader_mode_off, reader_mode_on, reload, save_to_collection,
+          set_default_browser, settings, share, stop, sync_account, and
+          sync_tabs.
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/1024
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/1214#issue-264756708
       - https://github.com/mozilla-mobile/fenix/pull/5098#issuecomment-529658996
       - https://github.com/mozilla-mobile/fenix/pull/6310
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
   default_browser_changed:
     type: event
     description: |
@@ -231,10 +247,11 @@ events:
       - https://github.com/mozilla-mobile/fenix/issues/18857
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/18895
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-10-01"
   toolbar_menu_visible:
     type: event
@@ -244,10 +261,11 @@ events:
       - https://github.com/mozilla-mobile/fenix/issues/18855
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/18895
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-10-01"
   total_uri_count:
     type: counter
@@ -266,10 +284,11 @@ events:
       - https://github.com/mozilla-mobile/fenix/pull/1785
       - https://github.com/mozilla-mobile/fenix/pull/8314
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   normal_and_private_uri_count:
     type: counter
@@ -285,10 +304,11 @@ events:
       - https://github.com/mozilla-mobile/fenix/issues/17089
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/17935
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2022-08-01"
   preference_toggled:
     type: event
@@ -317,6 +337,7 @@ events:
       - https://github.com/mozilla-mobile/fenix/issues/5586
       - https://github.com/mozilla-mobile/fenix/issues/6396
       - https://github.com/mozilla-mobile/fenix/issues/6070
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/1896
       - https://github.com/mozilla-mobile/fenix/pull/5704
@@ -326,27 +347,30 @@ events:
       - https://github.com/mozilla-mobile/fenix/pull/6601
       - https://github.com/mozilla-mobile/fenix/pull/6746
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-06-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
   whats_new_tapped:
     type: event
     description: |
       A user opened the "what's new" page button
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/5021
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/5090
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
   opened_link:
     type: event
     description: |
@@ -359,15 +383,17 @@ events:
           https://github.com/mozilla-mobile/fenix/issues/14133
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/5737
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/5975
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
   tab_counter_menu_action:
     type: event
     description:
@@ -381,28 +407,32 @@ events:
             New tab, New private tab, Close tab
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/11442
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/11533
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
   synced_tab_opened:
     type: event
     description: >
       An event that indicates that a synced tab was opened.
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/15369
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/16727
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-05-10"
+      - android-probes@mozilla.com
+    expires: "2021-12-10"
   recently_closed_tabs_opened:
     type: event
     description: |
@@ -410,13 +440,15 @@ events:
       has accessed recently closed tabs list.
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/15366
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/16739
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-05-10"
+      - android-probes@mozilla.com
+    expires: "2021-12-10"
   copy_url_tapped:
     type: event
     description: |
@@ -424,13 +456,14 @@ events:
       copy option when long pressing on url bar.
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/16827
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/16915
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-05-10"
+      - android-probes@mozilla.com
+    expires: "2021-12-10"
 
 onboarding:
   fxa_auto_signin:
@@ -442,10 +475,11 @@ onboarding:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/11867
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
       - erichards@mozilla.com
     expires: "2021-08-01"
   fxa_manual_signin:
@@ -457,10 +491,11 @@ onboarding:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/11867
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
       - erichards@mozilla.com
     expires: "2021-08-01"
   privacy_notice:
@@ -472,10 +507,11 @@ onboarding:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/11867
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
       - erichards@mozilla.com
     expires: "2021-08-01"
   pref_toggled_private_browsing:
@@ -487,10 +523,11 @@ onboarding:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/11867
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
       - erichards@mozilla.com
     expires: "2021-08-01"
   pref_toggled_toolbar_position:
@@ -507,10 +544,11 @@ onboarding:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/11867
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
       - erichards@mozilla.com
     expires: "2021-08-01"
   pref_toggled_tracking_prot:
@@ -527,10 +565,11 @@ onboarding:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/11867
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
       - erichards@mozilla.com
     expires: "2021-08-01"
   pref_toggled_theme_picker:
@@ -547,10 +586,11 @@ onboarding:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/11867
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
       - erichards@mozilla.com
     expires: "2021-08-01"
   finish:
@@ -562,10 +602,11 @@ onboarding:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/11867
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
       - erichards@mozilla.com
     expires: "2021-08-01"
 
@@ -583,8 +624,9 @@ search_shortcuts:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/1202#issuecomment-476870449
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
 
 experiments_default_browser:
@@ -596,10 +638,11 @@ experiments_default_browser:
       - https://github.com/mozilla-mobile/fenix/issues/18851
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/18895
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-10-01"
 toolbar_settings:
   changed_position:
@@ -615,10 +658,11 @@ toolbar_settings:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/6608
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
 
 crash_reporter:
@@ -628,15 +672,17 @@ crash_reporter:
       The crash reporter was displayed
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/1040
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/1214#issue-264756708
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
   closed:
     type: event
     description: |
@@ -648,15 +694,17 @@ crash_reporter:
           report
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/1040
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/1214#issue-264756708
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
 
 context_menu:
   item_tapped:
@@ -675,16 +723,18 @@ context_menu:
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/957
       - https://github.com/mozilla-mobile/fenix/issues/16076
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/1344#issuecomment-479285010
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/issues/16076#issuecomment-726216734
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
 
 login_dialog:
   displayed:
@@ -695,10 +745,11 @@ login_dialog:
       - https://github.com/mozilla-mobile/fenix/issues/9730
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/13050
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   cancelled:
     type: event
@@ -708,10 +759,11 @@ login_dialog:
       - https://github.com/mozilla-mobile/fenix/issues/9730
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/13050
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   saved:
     type: event
@@ -721,10 +773,11 @@ login_dialog:
       - https://github.com/mozilla-mobile/fenix/issues/9730
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/13050
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   never_save:
     type: event
@@ -734,10 +787,11 @@ login_dialog:
       - https://github.com/mozilla-mobile/fenix/issues/9730
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/13050
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
 
 find_in_page:
@@ -750,10 +804,11 @@ find_in_page:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/1344#issuecomment-479285010
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   closed:
     type: event
@@ -764,10 +819,11 @@ find_in_page:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/1344#issuecomment-479285010
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   searched_page:
     type: event
@@ -778,10 +834,11 @@ find_in_page:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/1344#issuecomment-479285010
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
 
 metrics:
@@ -797,10 +854,11 @@ metrics:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/1067#issuecomment-474598673
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   distribution_id:
     type: string
@@ -814,10 +872,11 @@ metrics:
       - https://github.com/mozilla-mobile/fenix/issues/16075
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/issues/16075
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: never
   mobile_bookmarks_count:
     type: counter
@@ -835,10 +894,11 @@ metrics:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/16942
       - https://github.com/mozilla-mobile/fenix/pull/16942#issuecomment-742794701
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   has_mobile_bookmarks:
     type: boolean
@@ -852,10 +912,11 @@ metrics:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/16942
       - https://github.com/mozilla-mobile/fenix/pull/16942#issuecomment-742794701
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   desktop_bookmarks_count:
     type: counter
@@ -873,10 +934,11 @@ metrics:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/16942
       - https://github.com/mozilla-mobile/fenix/pull/16942#issuecomment-742794701
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   has_desktop_bookmarks:
     type: boolean
@@ -890,10 +952,11 @@ metrics:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/16942
       - https://github.com/mozilla-mobile/fenix/pull/16942#issuecomment-742794701
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   top_sites_count:
     type: counter
@@ -911,10 +974,11 @@ metrics:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/9556
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   has_top_sites:
     type: boolean
@@ -928,10 +992,11 @@ metrics:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/9556
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   recently_used_pwa_count:
     type: counter
@@ -953,10 +1018,11 @@ metrics:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/11982#pullrequestreview-437963817
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   has_recent_pwas:
     type: boolean
@@ -971,10 +1037,11 @@ metrics:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/11982#pullrequestreview-437963817
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   search_count:
     type: labeled_counter
@@ -999,12 +1066,67 @@ metrics:
       - https://github.com/mozilla-mobile/fenix/pull/5216
       - https://github.com/mozilla-mobile/fenix/pull/7310
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
+  credit_cards_saved_count:
+    type: counter
+    lifetime: application
+    description: |
+      A counter that indicates the number of credit cards that have been
+      saved manually by the user.
+    send_in_pings:
+      - metrics
+    bugs:
+      - https://github.com/mozilla-mobile/fenix/issues/18711
+    data_reviews:
+      - https://github.com/mozilla-mobile/fenix/pull/19548#issuecomment-848811030
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
+    data_sensitivity:
+      - interaction
+    notification_emails:
+      - android-probes@mozilla.com
+    expires: "2021-10-01"
+  credit_cards_deleted_count:
+    type: counter
+    lifetime: application
+    description: |
+      A counter that indicates the number of credit cards that have been
+      deleted by the user.
+    send_in_pings:
+      - metrics
+    bugs:
+      - https://github.com/mozilla-mobile/fenix/issues/18711
+    data_reviews:
+      - https://github.com/mozilla-mobile/fenix/pull/19548#issuecomment-848811030
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
+    data_sensitivity:
+      - interaction
+    notification_emails:
+      - android-probes@mozilla.com
+    expires: "2021-10-01"
+  credit_cards_autofill_count:
+    type: counter
+    lifetime: application
+    description: |
+      A counter that indicates the number of times the user has autofilled
+      a credit card.
+    send_in_pings:
+      - metrics
+    bugs:
+      - https://github.com/mozilla-mobile/fenix/issues/18711
+    data_reviews:
+      - https://github.com/mozilla-mobile/fenix/pull/19548#issuecomment-848811030
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
+    data_sensitivity:
+      - interaction
+    notification_emails:
+      - android-probes@mozilla.com
+    expires: "2021-10-01"
   mozilla_products:
     type: string_list
     lifetime: application
@@ -1021,11 +1143,12 @@ metrics:
       - https://github.com/mozilla-mobile/fenix/pull/1953/
       - https://github.com/mozilla-mobile/fenix/pull/5216
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   default_moz_browser:
     type: string
@@ -1041,11 +1164,12 @@ metrics:
       - https://github.com/mozilla-mobile/fenix/pull/1953/
       - https://github.com/mozilla-mobile/fenix/pull/5216
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   adjust_campaign:
     type: string
@@ -1062,10 +1186,11 @@ metrics:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/5579
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   adjust_ad_group:
     type: string
@@ -1082,10 +1207,11 @@ metrics:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/9253
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   adjust_creative:
     type: string
@@ -1102,10 +1228,11 @@ metrics:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/9253
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   adjust_network:
     type: string
@@ -1122,10 +1249,11 @@ metrics:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/9253
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   toolbar_position:
     type: string
@@ -1139,10 +1267,11 @@ metrics:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/6608
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   close_tab_setting:
     type: string
@@ -1156,10 +1285,11 @@ metrics:
       - https://github.com/mozilla-mobile/fenix/issues/15347#issue-707408975
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/15811#issuecomment-706402952
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   tab_view_setting:
     type: string
@@ -1173,10 +1303,11 @@ metrics:
       - https://github.com/mozilla-mobile/fenix/issues/15347#issue-707408975
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/15811#issuecomment-706402952
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   search_widget_installed:
     type: boolean
@@ -1190,10 +1321,11 @@ metrics:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/10958
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   tabs_open_count:
     type: counter
@@ -1211,10 +1343,11 @@ metrics:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/12024
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   has_open_tabs:
     type: boolean
@@ -1228,10 +1361,11 @@ metrics:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/12024
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   start_reason_process_error:
     type: boolean
@@ -1269,8 +1403,8 @@ metrics:
     expires: "2021-08-11"
 
 preferences:
-  show_search_suggestions:
-    type: string_list
+  search_suggestions_enabled:
+    type: boolean
     description: >
       Whether or not the user has search suggestions enabled
       default: true
@@ -1281,13 +1415,14 @@ preferences:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/11211
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
-  remote_debugging:
-    type: string_list
+  remote_debugging_enabled:
+    type: boolean
     description: >
       Whether or not the user has remote debugging enabled
       default: false
@@ -1298,13 +1433,14 @@ preferences:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/11211
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
-  telemetry:
-    type: string_list
+  telemetry_enabled:
+    type: boolean
     description: >
       Whether or not the user has telemetry enabled. Note we should
       never receive a "false" value for this since telemetry would
@@ -1317,13 +1453,14 @@ preferences:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/11211
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
-  tracking_protection:
-    type: string_list
+  enhanced_tracking_protection:
+    type: string
     description: >
       What type of enhanced tracking protection the user has enabled.
       "standard," "strict," "custom," or "" (if disabled)
@@ -1335,13 +1472,14 @@ preferences:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/11211
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
-  search_bookmarks:
-    type: string_list
+  bookmarks_suggestion:
+    type: boolean
     description: >
       Whether or not the user has enabled bookmark search suggestions
       default: true
@@ -1352,13 +1490,14 @@ preferences:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/11211
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
-  search_browsing_history:
-    type: string_list
+  browsing_history_suggestion:
+    type: boolean
     description: >
       Whether or not the user has enabled browsing history suggestions.
       default: true
@@ -1369,13 +1508,14 @@ preferences:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/11211
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
-  show_clipboard_suggestions:
-    type: string_list
+  clipboard_suggestions_enabled:
+    type: boolean
     description: >
       Whether or not the user has enabled clipboard search suggestions.
       default: true
@@ -1386,13 +1526,14 @@ preferences:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/11211
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
-  show_search_shortcuts:
-    type: string_list
+  search_shortcuts_enabled:
+    type: boolean
     description: >
       Whether or not the user has enabled search shortcuts.
       default: true
@@ -1403,13 +1544,14 @@ preferences:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/11211
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
-  open_links_in_a_private_tab:
-    type: string_list
+  open_links_in_private:
+    type: boolean
     description: >
       Whether or not the user has enabled open links in a private tab.
       default: false
@@ -1420,13 +1562,14 @@ preferences:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/11211
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
-  sync:
-    type: string_list
+  signed_in_sync:
+    type: boolean
     description: >
       Whether or not the user is signed into FxA
       default: false
@@ -1437,10 +1580,11 @@ preferences:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/11211
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   sync_items:
     type: string_list
@@ -1456,13 +1600,14 @@ preferences:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/11211
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
-  show_voice_search:
-    type: string_list
+  voice_search_enabled:
+    type: boolean
     description: >
       Whether or not the user has enabled the voice search button.
       default: true
@@ -1473,13 +1618,14 @@ preferences:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/11211
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
-  search_suggestions_private:
-    type: string_list
+  private_search_suggestions:
+    type: boolean
     description: >
       Whether or not the user has enabled showing search suggestions
       in private mode.
@@ -1491,13 +1637,14 @@ preferences:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/11211
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
-  toolbar_position:
-    type: string_list
+  toolbar_position_setting:
+    type: string
     description: >
       The position of the toolbar
       default: bottom (defaults to top if the user has accessibility services)
@@ -1508,10 +1655,11 @@ preferences:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/11211
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   accessibility_services:
     type: string_list
@@ -1526,13 +1674,14 @@ preferences:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/11211
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
-  open_links_in_app:
-    type: string_list
+  open_links_in_app_enabled:
+    type: boolean
     description: >
       Whether or not the user has the open links in apps feature enabled.
       default: false
@@ -1543,13 +1692,14 @@ preferences:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/11446
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
-  theme:
-    type: string_list
+  user_theme:
+    type: string
     description: >
       The theme the user has enabled. "light," "dark," "system," or "battery"
       default: "system" for API 28+, else "light"
@@ -1560,10 +1710,11 @@ preferences:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/11446
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
 
 search.default_engine:
@@ -1583,11 +1734,12 @@ search.default_engine:
       - https://github.com/mozilla-mobile/fenix/pull/1606
       - https://github.com/mozilla-mobile/fenix/pull/5216
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   name:
     type: string
@@ -1605,11 +1757,12 @@ search.default_engine:
       - https://github.com/mozilla-mobile/fenix/pull/1606
       - https://github.com/mozilla-mobile/fenix/pull/5216
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   submission_url:
     type: string
@@ -1628,11 +1781,12 @@ search.default_engine:
       - https://github.com/mozilla-mobile/fenix/pull/1606
       - https://github.com/mozilla-mobile/fenix/pull/5216
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
 
 bookmarks_management:
@@ -1644,10 +1798,11 @@ bookmarks_management:
       - https://github.com/mozilla-mobile/fenix/issues/18173
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/18174
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2022-08-01"
   open_in_new_tab:
     type: event
@@ -1659,11 +1814,12 @@ bookmarks_management:
       - https://github.com/mozilla-mobile/fenix/pull/1708
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
   open_in_new_tabs:
     type: event
     description: |
@@ -1674,161 +1830,182 @@ bookmarks_management:
       - https://github.com/mozilla-mobile/fenix/pull/1708
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
   open_in_private_tab:
     type: event
     description: |
       A user opened a bookmark in a new private tab.
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/974
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/1708
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
   open_in_private_tabs:
     type: event
     description: |
       A user opened multiple bookmarks at once in new private tabs.
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/974
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/1708
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
   edited:
     type: event
     description: |
       A user edited the title and/or URL of an existing bookmark.
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/974
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/1708
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
   moved:
     type: event
     description: |
       A user moved an existing bookmark or folder to another folder.
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/974
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/1708
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
   removed:
     type: event
     description: |
       A user removed a bookmark item.
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/974
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/1708
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
   multi_removed:
     type: event
     description: |
       A user removed multiple bookmarks at once.
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/974
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/1708
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
   shared:
     type: event
     description: |
       A user shared a bookmark.
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/974
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/1708
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
   copied:
     type: event
     description: |
       A user copied a bookmark.
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/974
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/1708
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
   folder_add:
     type: event
     description: |
       A user added a new bookmark folder.
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/974
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/1708
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
   folder_remove:
     type: event
     description: |
       A user removed a bookmark folder.
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/3174
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/3724
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
 
 custom_tab:
   closed:
@@ -1837,45 +2014,51 @@ custom_tab:
       A user closed the custom tab
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/977
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/1697
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
   action_button:
     type: event
     description: |
       A user pressed the action button provided by the launching app
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/977
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/1697
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
   menu:
     type: event
     description: |
       A user opened the custom tabs menu
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/977
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/1697
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
 
 activation:
   identifier:
@@ -1889,15 +2072,17 @@ activation:
     bugs:
       - https://bugzilla.mozilla.org/1538011
       - https://bugzilla.mozilla.org/1501822
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/1707#issuecomment-486972209
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - highly_sensitive
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
   activation_id:
     type: uuid
     lifetime: user
@@ -1908,15 +2093,17 @@ activation:
       - activation
     bugs:
       - https://bugzilla.mozilla.org/1538011
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/1707#issuecomment-486972209
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - highly_sensitive
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
     no_lint:
       - USER_LIFETIME_EXPIRATION
 
@@ -1930,15 +2117,17 @@ error_page:
         description: "The error type of the error page encountered"
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/1242
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/2491#issuecomment-492414486
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
 
 sync_auth:
   opened:
@@ -1950,10 +2139,11 @@ sync_auth:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/2745#issuecomment-494918532
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   closed:
     type: event
@@ -1964,10 +2154,11 @@ sync_auth:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/2745#issuecomment-494918532
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   use_email:
     type: event
@@ -1979,10 +2170,11 @@ sync_auth:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/9835#pullrequestreview-398641844
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   use_email_problem:
     type: event
@@ -1993,10 +2185,11 @@ sync_auth:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/9835#pullrequestreview-398641844
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   sign_in:
     type: event
@@ -2008,10 +2201,11 @@ sync_auth:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/2745#issuecomment-494918532
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   sign_out:
     type: event
@@ -2023,10 +2217,11 @@ sync_auth:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/2745#issuecomment-494918532
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   sign_up:
     type: event
@@ -2037,11 +2232,12 @@ sync_auth:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/4931#issuecomment-529740300
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   paired:
     type: event
@@ -2053,11 +2249,12 @@ sync_auth:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/4931#issuecomment-529740300
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   recovered:
     type: event
@@ -2069,11 +2266,12 @@ sync_auth:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/4931#issuecomment-529740300
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   other_external:
     type: event
@@ -2085,11 +2283,12 @@ sync_auth:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/4931#issuecomment-529740300
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   scan_pairing:
     type: event
@@ -2100,10 +2299,11 @@ sync_auth:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/2745#issuecomment-494918532
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
 
 sync_account:
@@ -2116,10 +2316,11 @@ sync_account:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/2745#issuecomment-494918532
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   sync_now:
     type: event
@@ -2130,10 +2331,11 @@ sync_account:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/2745#issuecomment-494918532
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   send_tab:
     type: event
@@ -2144,10 +2346,11 @@ sync_account:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/5106
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   sign_in_to_send_tab:
     type: event
@@ -2158,10 +2361,11 @@ sync_account:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/5106
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
 
 history:
@@ -2174,10 +2378,11 @@ history:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/3940
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   removed:
     type: event
@@ -2188,10 +2393,11 @@ history:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/3940
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   removed_all:
     type: event
@@ -2202,10 +2408,11 @@ history:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/3940
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   shared:
     type: event
@@ -2216,10 +2423,11 @@ history:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/3940
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   opened_item:
     type: event
@@ -2229,10 +2437,11 @@ history:
       - https://github.com/mozilla-mobile/fenix/issues/18178
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/18261
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2022-08-01"
   opened_item_in_new_tab:
     type: event
@@ -2242,10 +2451,11 @@ history:
       - https://github.com/mozilla-mobile/fenix/issues/18178
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/18261
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2022-08-01"
   opened_items_in_new_tabs:
     type: event
@@ -2253,12 +2463,14 @@ history:
       A user opened multiple history items in new tabs
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/18178
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
-      - https://gith ub.com/mozilla-mobile/fenix/pull/18261
+      - https://github.com/mozilla-mobile/fenix/pull/18261
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2022-08-01"
   opened_item_in_private_tab:
     type: event
@@ -2268,10 +2480,11 @@ history:
       - https://github.com/mozilla-mobile/fenix/issues/18178
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/18261
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2022-08-01"
   opened_items_in_private_tabs:
     type: event
@@ -2281,10 +2494,11 @@ history:
       - https://github.com/mozilla-mobile/fenix/issues/18178
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/18261
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2022-08-01"
 
 tip:
@@ -2300,10 +2514,11 @@ tip:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/9836
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   pressed:
     type: event
@@ -2317,10 +2532,11 @@ tip:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/9836
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   closed:
     type: event
@@ -2334,10 +2550,11 @@ tip:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/9836
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
 
 reader_mode:
@@ -2350,10 +2567,11 @@ reader_mode:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/3941
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   opened:
     type: event
@@ -2364,10 +2582,11 @@ reader_mode:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/3941
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   closed:
     type: event
@@ -2378,10 +2597,11 @@ reader_mode:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/4328
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   appearance:
     type: event
@@ -2392,10 +2612,11 @@ reader_mode:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/3941
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
 
 tabs_tray.cfr:
@@ -2408,10 +2629,11 @@ tabs_tray.cfr:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/17442
       - https://github.com/mozilla-mobile/fenix/issues/16485#issuecomment-759641324
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   go_to_settings:
     type: event
@@ -2422,10 +2644,11 @@ tabs_tray.cfr:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/17442
       - https://github.com/mozilla-mobile/fenix/issues/16485#issuecomment-759641324
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
 
 tabs_tray:
@@ -2438,10 +2661,11 @@ tabs_tray:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/12036
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   closed:
     type: event
@@ -2452,10 +2676,11 @@ tabs_tray:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/12036
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   opened_existing_tab:
     type: event
@@ -2466,10 +2691,11 @@ tabs_tray:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/12036
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   closed_existing_tab:
     type: event
@@ -2480,10 +2706,11 @@ tabs_tray:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/12036
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   private_mode_tapped:
     type: event
@@ -2494,10 +2721,11 @@ tabs_tray:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/12036
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   normal_mode_tapped:
     type: event
@@ -2508,10 +2736,11 @@ tabs_tray:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/12036
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   synced_mode_tapped:
     type: event
@@ -2521,10 +2750,11 @@ tabs_tray:
       - https://github.com/mozilla-mobile/fenix/issues/18948
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/19004
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2022-08-01"
   new_tab_tapped:
     type: event
@@ -2535,10 +2765,11 @@ tabs_tray:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/12036
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   new_private_tab_tapped:
     type: event
@@ -2549,10 +2780,11 @@ tabs_tray:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/12036
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   menu_opened:
     type: event
@@ -2563,10 +2795,11 @@ tabs_tray:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/12036
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   save_to_collection:
     type: event
@@ -2577,10 +2810,11 @@ tabs_tray:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/12036
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   share_all_tabs:
     type: event
@@ -2592,10 +2826,11 @@ tabs_tray:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/12036
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   close_all_tabs:
     type: event
@@ -2607,10 +2842,11 @@ tabs_tray:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/12036
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
 
 collections:
@@ -2620,96 +2856,108 @@ collections:
       A user renamed a collection
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/969
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/3935
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
   tab_restored:
     type: event
     description: |
       A user restored a tab from collection tab list
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/969
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/3935
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
   all_tabs_restored:
     type: event
     description: |
       A user tapped "open tabs" from collection menu
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/969
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/3935
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
   tab_removed:
     type: event
     description: |
       A user tapped remove tab from collection tab list
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/969
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/3935
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
   shared:
     type: event
     description: |
       A user tapped share collection
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/969
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/3935
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
   removed:
     type: event
     description: |
       A user tapped delete collection from collection menu
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/969
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/3935
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
   saved:
     type: event
     description: |
@@ -2721,16 +2969,18 @@ collections:
         description: "The number of tabs added to the collection"
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/969
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/3935
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
   tabs_added:
     type: event
     description: |
@@ -2742,16 +2992,18 @@ collections:
         description: "The number of tabs added to the collection"
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/969
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/3935
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
   tab_select_opened:
     type: event
     description: |
@@ -2759,46 +3011,52 @@ collections:
       creation flow)
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/969
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/3935
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
   add_tab_button:
     type: event
     description: |
       A user tapped the "add tab" button in the three dot menu of collections
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/969
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/4358
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
   long_press:
     type: event
     description: |
       A user long pressed on a tab, triggering the collection creation screen
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/969
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/4358
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
   save_button:
     type: event
     description: |
@@ -2807,15 +3065,17 @@ collections:
       (tab_select_opened)
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/969
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/4358
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
     extra_keys:
       from_screen:
         description: |
@@ -2827,15 +3087,17 @@ collections:
       A user pressed the "rename collection" button in the three dot menu
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/969
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/4539
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
 
 search_widget:
   new_tab_button:
@@ -2848,10 +3110,11 @@ search_widget:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/4714
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   voice_button:
     type: event
@@ -2862,10 +3125,11 @@ search_widget:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/4714
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
 
 private_browsing_mode:
@@ -2879,10 +3143,11 @@ private_browsing_mode:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/4968
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   notification_tapped:
     type: event
@@ -2893,10 +3158,11 @@ private_browsing_mode:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/4968
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
 
 contextual_hint.tracking_protection:
@@ -2911,10 +3177,11 @@ contextual_hint.tracking_protection:
       - https://github.com/mozilla-mobile/fenix/pull/11923
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-07-01"
   dismiss:
     type: event
@@ -2928,10 +3195,11 @@ contextual_hint.tracking_protection:
       - https://github.com/mozilla-mobile/fenix/pull/11923
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-07-01"
   outside_tap:
     type: event
@@ -2944,10 +3212,11 @@ contextual_hint.tracking_protection:
       - https://github.com/mozilla-mobile/fenix/pull/11923
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-07-01"
   inside_tap:
     type: event
@@ -2960,10 +3229,11 @@ contextual_hint.tracking_protection:
       - https://github.com/mozilla-mobile/fenix/pull/11923
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-07-01"
 
 tracking_protection:
@@ -2977,10 +3247,11 @@ tracking_protection:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/5414#issuecomment-532847188
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   panel_settings:
     type: event
@@ -2991,10 +3262,11 @@ tracking_protection:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/5414#issuecomment-532847188
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   etp_shield:
     type: event
@@ -3005,10 +3277,11 @@ tracking_protection:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/5414#issuecomment-532847188
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   etp_tracker_list:
     type: event
@@ -3020,10 +3293,11 @@ tracking_protection:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/5414#issuecomment-532847188
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   etp_settings:
     type: event
@@ -3034,10 +3308,11 @@ tracking_protection:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/5414#issuecomment-532847188
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   etp_setting_changed:
     type: event
@@ -3054,10 +3329,11 @@ tracking_protection:
       - https://github.com/mozilla-mobile/fenix/pull/5414#issuecomment-532847188
       - https://github.com/mozilla-mobile/fenix/pull/11383
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
 
 private_browsing_shortcut:
@@ -3070,10 +3346,11 @@ private_browsing_shortcut:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/5194
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   cfr_add_shortcut:
     type: event
@@ -3085,10 +3362,11 @@ private_browsing_shortcut:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/5194
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   cfr_cancel:
     type: event
@@ -3100,10 +3378,11 @@ private_browsing_shortcut:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/5194
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   pinned_shortcut_priv:
     type: event
@@ -3115,10 +3394,11 @@ private_browsing_shortcut:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/5194
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   static_shortcut_tab:
     type: event
@@ -3130,10 +3410,11 @@ private_browsing_shortcut:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/5194
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   static_shortcut_priv:
     type: event
@@ -3145,10 +3426,11 @@ private_browsing_shortcut:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/5194
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
 
 tab:
@@ -3161,10 +3443,11 @@ tab:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/5266
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
     no_lint:
       - COMMON_PREFIX
@@ -3177,10 +3460,11 @@ tab:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/5266
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
 
 media_notification:
@@ -3193,10 +3477,11 @@ media_notification:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/5520
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   pause:
     type: event
@@ -3207,10 +3492,11 @@ media_notification:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/5520
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
 
 media_state:
@@ -3223,10 +3509,11 @@ media_state:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/6463
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   pause:
     type: event
@@ -3237,10 +3524,11 @@ media_state:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/6463
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   stop:
     type: event
@@ -3251,10 +3539,11 @@ media_state:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/6463
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   fullscreen:
     type: event
@@ -3264,10 +3553,11 @@ media_state:
       - https://github.com/mozilla-mobile/fenix/issues/15368
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/16833
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   picture_in_picture:
     type: event
@@ -3277,10 +3567,11 @@ media_state:
       - https://github.com/mozilla-mobile/fenix/issues/15368
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/16833
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
 
 logins:
@@ -3293,10 +3584,11 @@ logins:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/6352
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   open_individual_login:
     type: event
@@ -3307,10 +3599,11 @@ logins:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/6352
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   copy_login:
     type: event
@@ -3321,10 +3614,11 @@ logins:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/6352
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   view_password_login:
     type: event
@@ -3335,10 +3629,11 @@ logins:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/6352
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   save_logins_setting_changed:
     type: event
@@ -3354,10 +3649,11 @@ logins:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/7767
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   open_login_editor:
     type: event
@@ -3368,10 +3664,11 @@ logins:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/issues/11208
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   delete_saved_login:
     type: event
@@ -3382,10 +3679,11 @@ logins:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/issues/11208
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   save_edited_login:
     type: event
@@ -3396,10 +3694,11 @@ logins:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/issues/11208
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
 
 download_notification:
@@ -3413,10 +3712,11 @@ download_notification:
       - https://github.com/mozilla-mobile/fenix/pull/6554
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-07-01"
   pause:
     type: event
@@ -3428,10 +3728,11 @@ download_notification:
       - https://github.com/mozilla-mobile/fenix/pull/6554
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-07-01"
   cancel:
     type: event
@@ -3443,10 +3744,11 @@ download_notification:
       - https://github.com/mozilla-mobile/fenix/pull/6554
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-07-01"
   try_again:
     type: event
@@ -3459,10 +3761,11 @@ download_notification:
       - https://github.com/mozilla-mobile/fenix/pull/6554
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-07-01"
   open:
     type: event
@@ -3474,10 +3777,11 @@ download_notification:
       - https://github.com/mozilla-mobile/fenix/pull/6554
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-07-01"
   in_app_open:
     type: event
@@ -3489,10 +3793,11 @@ download_notification:
       - https://github.com/mozilla-mobile/fenix/pull/6554
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-07-01"
   in_app_try_again:
     type: event
@@ -3505,10 +3810,11 @@ download_notification:
       - https://github.com/mozilla-mobile/fenix/pull/6554
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-07-01"
 
 downloads_misc:
@@ -3521,8 +3827,9 @@ downloads_misc:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/16730
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-07-01"
 
 downloads_management:
@@ -3536,8 +3843,9 @@ downloads_management:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/16728
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-07-01"
 
   item_opened:
@@ -3547,12 +3855,14 @@ downloads_management:
       "Downloads" folder.
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/15367
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/16728
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
 
   item_deleted:
     type: event
@@ -3560,12 +3870,14 @@ downloads_management:
       A counter for how often a user deletes one / more downloads at a time.
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/15367
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/16728
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
 
 user_specified_search_engines:
   custom_engine_added:
@@ -3577,10 +3889,11 @@ user_specified_search_engines:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/6918
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
     no_lint:
       - COMMON_PREFIX
@@ -3594,10 +3907,11 @@ user_specified_search_engines:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/6918
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
 
 search_suggestions:
@@ -3610,11 +3924,12 @@ search_suggestions:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/6746
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
 
 voice_search:
@@ -3627,10 +3942,11 @@ voice_search:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/10785
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
 
 top_sites:
@@ -3643,10 +3959,11 @@ top_sites:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/10752
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   open_google_search_attribution:
     type: event
@@ -3656,10 +3973,11 @@ top_sites:
       - https://github.com/mozilla-mobile/fenix/issues/17418
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/17637
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   open_frecency:
     type: event
@@ -3670,10 +3988,11 @@ top_sites:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/15136
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   open_pinned:
     type: event
@@ -3684,10 +4003,11 @@ top_sites:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/15136
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   swipe_carousel:
     type: event
@@ -3702,10 +4022,11 @@ top_sites:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/15136
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   long_press:
     type: event
@@ -3720,10 +4041,11 @@ top_sites:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/15136
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   open_in_new_tab:
     type: event
@@ -3734,10 +4056,11 @@ top_sites:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/7523
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   open_in_private_tab:
     type: event
@@ -3748,10 +4071,11 @@ top_sites:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/7523
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   remove:
     type: event
@@ -3762,10 +4086,11 @@ top_sites:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/7523
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
 
 about_page:
@@ -3779,10 +4104,11 @@ about_page:
       - https://github.com/mozilla-mobile/fenix/pull/8047
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-07-01"
   privacy_notice_tapped:
     type: event
@@ -3794,10 +4120,11 @@ about_page:
       - https://github.com/mozilla-mobile/fenix/pull/8047
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-07-01"
 
 app_theme:
@@ -3812,15 +4139,17 @@ app_theme:
           'SETTINGS' or 'ONBOARDING'
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/7289
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/7968
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
 
 pocket:
   pocket_top_site_clicked:
@@ -3832,10 +4161,11 @@ pocket:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/8098
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
     no_lint:
       - COMMON_PREFIX
@@ -3849,10 +4179,11 @@ pocket:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/8098
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
 
 first_session:
@@ -3867,11 +4198,12 @@ first_session:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/8074#issuecomment-586512202
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   network:
     type: string
@@ -3884,11 +4216,12 @@ first_session:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/8074#issuecomment-586512202
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   adgroup:
     type: string
@@ -3901,11 +4234,12 @@ first_session:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/8074#issuecomment-586480836
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   creative:
     send_in_pings:
@@ -3918,11 +4252,12 @@ first_session:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/8074#issuecomment-586512202
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   timestamp:
     send_in_pings:
@@ -3937,11 +4272,12 @@ first_session:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/8074#issuecomment-586512202
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
 
 browser.search:
@@ -3949,7 +4285,7 @@ browser.search:
     type: labeled_counter
     description: |
       Records counts of SERP pages with adverts displayed.
-      The key format is ‘<provider-name>’.
+      The key format is `<provider-name>`.
     send_in_pings:
       - metrics
     bugs:
@@ -3957,16 +4293,17 @@ browser.search:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/10112
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   ad_clicks:
     type: labeled_counter
     description: |
       Records clicks of adverts on SERP pages.
-      The key format is ‘<provider-name>’.
+      The key format is `<provider-name>`.
     send_in_pings:
       - metrics
     bugs:
@@ -3974,10 +4311,11 @@ browser.search:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/10112
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   in_content:
     type: labeled_counter
@@ -3990,10 +4328,11 @@ browser.search:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/10167
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
 
 addons:
@@ -4003,15 +4342,17 @@ addons:
       A user accessed "Add-ons" from the Settings
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/6174
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/8318
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
   open_addon_in_toolbar_menu:
     type: event
     description: |
@@ -4022,15 +4363,17 @@ addons:
           The id of the add-on that was interacted with in the toolbar menu
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/6174
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/8318
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
   open_addon_setting:
     type: event
     description: |
@@ -4043,10 +4386,11 @@ addons:
       - https://github.com/mozilla-mobile/fenix/issues/17644
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/18504
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2022-08-01"
   has_installed_addons:
     type: boolean
@@ -4056,15 +4400,17 @@ addons:
       - metrics
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/6174
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/8318
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
   has_enabled_addons:
     type: boolean
     description: |
@@ -4073,15 +4419,17 @@ addons:
       - metrics
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/6174
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/8318
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
   installed_addons:
     type: string_list
     description: |
@@ -4090,15 +4438,17 @@ addons:
       - metrics
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/8920
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/11080
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
   enabled_addons:
     type: string_list
     description: |
@@ -4107,15 +4457,17 @@ addons:
       - metrics
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/8920
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/11080
       - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
       - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-07-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
 
 startup.timeline:
   framework_primary:
@@ -4580,11 +4932,12 @@ perf.awesomebar:
       - https://github.com/mozilla-mobile/android-components/issues/4992
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/10276#pullrequestreview-411101979
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
       - gkruglov@mozilla.com
     expires: "2021-11-15"
   bookmark_suggestions:
@@ -4598,11 +4951,12 @@ perf.awesomebar:
       - https://github.com/mozilla-mobile/android-components/issues/4992
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/10276#pullrequestreview-411101979
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
       - gkruglov@mozilla.com
     expires: "2021-11-15"
   search_engine_suggestions:
@@ -4616,11 +4970,12 @@ perf.awesomebar:
       - https://github.com/mozilla-mobile/android-components/issues/4992
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/10276#pullrequestreview-411101979
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
       - gkruglov@mozilla.com
     expires: "2021-11-15"
   session_suggestions:
@@ -4634,11 +4989,12 @@ perf.awesomebar:
       - https://github.com/mozilla-mobile/android-components/issues/4992
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/10276#pullrequestreview-411101979
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
       - gkruglov@mozilla.com
     expires: "2021-11-15"
   synced_tabs_suggestions:
@@ -4652,11 +5008,12 @@ perf.awesomebar:
       - https://github.com/mozilla-mobile/android-components/issues/4992
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/10276#pullrequestreview-411101979
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
       - gkruglov@mozilla.com
     expires: "2021-11-15"
   clipboard_suggestions:
@@ -4670,11 +5027,12 @@ perf.awesomebar:
       - https://github.com/mozilla-mobile/android-components/issues/4992
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/10276#pullrequestreview-411101979
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
       - gkruglov@mozilla.com
     expires: "2021-11-15"
   shortcuts_suggestions:
@@ -4688,11 +5046,12 @@ perf.awesomebar:
       - https://github.com/mozilla-mobile/android-components/issues/4992
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/10276#pullrequestreview-411101979
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
       - gkruglov@mozilla.com
     expires: "2021-11-15"
 
@@ -4704,10 +5063,11 @@ autoplay:
       - https://github.com/mozilla-mobile/fenix/issues/11579
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/13041#issuecomment-665777411
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   setting_changed:
     type: event
@@ -4723,10 +5083,11 @@ autoplay:
       - https://github.com/mozilla-mobile/fenix/issues/11579
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/13041#issuecomment-665777411
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
 
 storage.stats:
@@ -4744,11 +5105,12 @@ storage.stats:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/12876#issuecomment-666770732
       - https://github.com/mozilla-mobile/fenix/pull/17704#issue-564299127
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
       - perf-android-fe@mozilla.com
       - mcomella@mozilla.com
     expires: "2021-08-01"
@@ -4769,11 +5131,12 @@ storage.stats:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/12876#issuecomment-666770732
       - https://github.com/mozilla-mobile/fenix/pull/17704#issue-564299127
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
       - perf-android-fe@mozilla.com
       - mcomella@mozilla.com
     expires: "2021-08-01"
@@ -4791,11 +5154,12 @@ storage.stats:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/12876#issuecomment-666770732
       - https://github.com/mozilla-mobile/fenix/pull/17704#issue-564299127
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
       - perf-android-fe@mozilla.com
       - mcomella@mozilla.com
     expires: "2021-08-01"
@@ -4815,11 +5179,12 @@ storage.stats:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/12876#issuecomment-666770732
       - https://github.com/mozilla-mobile/fenix/pull/17704#issue-564299127
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
       - perf-android-fe@mozilla.com
       - mcomella@mozilla.com
     expires: "2021-08-01"
@@ -4834,10 +5199,11 @@ progressive_web_app:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/11859
       - https://github.com/mozilla-mobile/fenix/pull/18071
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
       - erichards@mozilla.com
     expires: "2021-09-01"
   install_tap:
@@ -4849,10 +5215,11 @@ progressive_web_app:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/11859
       - https://github.com/mozilla-mobile/fenix/pull/18071
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
       - erichards@mozilla.com
     expires: "2021-09-01"
   foreground:
@@ -4868,10 +5235,11 @@ progressive_web_app:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/11859
       - https://github.com/mozilla-mobile/fenix/pull/18071
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
       - erichards@mozilla.com
     expires: "2021-09-01"
   background:
@@ -4887,10 +5255,11 @@ progressive_web_app:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/11859
       - https://github.com/mozilla-mobile/fenix/pull/18071
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
       - erichards@mozilla.com
     expires: "2021-09-01"
 
@@ -4904,10 +5273,11 @@ master_password:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/14468#issuecomment-684114534
       - https://github.com/mozilla-mobile/fenix/pull/18071
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-09-01"
   migration:
     type: event
@@ -4918,10 +5288,11 @@ master_password:
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/14468#issuecomment-684114534
       - https://github.com/mozilla-mobile/fenix/pull/18071
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-09-01"
 
 tabs:
@@ -4933,10 +5304,11 @@ tabs:
       - https://github.com/mozilla-mobile/fenix/issues/15347#issue-707408975
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/15811#issuecomment-706402952
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
 
 banner_open_in_app:
@@ -4948,10 +5320,11 @@ banner_open_in_app:
       - https://github.com/mozilla-mobile/fenix/issues/16828
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/17049
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   dismissed:
     type: event
@@ -4961,10 +5334,11 @@ banner_open_in_app:
       - https://github.com/mozilla-mobile/fenix/issues/16828
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/17049
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   go_to_settings:
     type: event
@@ -4974,10 +5348,11 @@ banner_open_in_app:
       - https://github.com/mozilla-mobile/fenix/issues/16828
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/17049
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
 
 contextual_menu:
@@ -4987,52 +5362,60 @@ contextual_menu:
       The context menu's 'copy' option was used.
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/11580
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/16968
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-06-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
   search_tapped:
     type: event
     description: |
       The context menu's 'search' option was used.
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/11580
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/16968
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-06-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
   select_all_tapped:
     type: event
     description: |
       The context menu's 'select all' option was used.
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/11580
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/16968
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-06-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
   share_tapped:
     type: event
     description: |
       The context menu's 'share' option was used.
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/11580
+      - https://github.com/mozilla-mobile/fenix/issues/19923
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/16968
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2021-06-01"
+      - android-probes@mozilla.com
+    expires: "2021-12-01"
 
 engine_tab:
   kills:
@@ -5047,10 +5430,11 @@ engine_tab:
       - https://github.com/mozilla-mobile/android-components/issues/9366
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/17864
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
       - skaspari@mozilla.com
     expires: "2021-12-31"
   kill_foreground_age:
@@ -5063,10 +5447,11 @@ engine_tab:
       - https://github.com/mozilla-mobile/android-components/issues/9366
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/17864
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
       - skaspari@mozilla.com
     expires: "2021-12-31"
   kill_background_age:
@@ -5079,10 +5464,11 @@ engine_tab:
       - https://github.com/mozilla-mobile/android-components/issues/9366
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/17864
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
       - skaspari@mozilla.com
     expires: "2021-12-31"
   foreground_metrics:
@@ -5094,10 +5480,11 @@ engine_tab:
       - https://github.com/mozilla-mobile/android-components/issues/9997
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/18747#issuecomment-815731764
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
       - skaspari@mozilla.com
     expires: "2021-12-31"
     extra_keys:
@@ -5135,10 +5522,11 @@ synced_tabs:
       - https://github.com/mozilla-mobile/fenix/issues/18163
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/18172
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
 
 awesomebar:
@@ -5150,10 +5538,11 @@ awesomebar:
       - https://github.com/mozilla-mobile/fenix/issues/18068
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/18090
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   clipboard_suggestion_clicked:
     type: event
@@ -5163,10 +5552,11 @@ awesomebar:
       - https://github.com/mozilla-mobile/fenix/issues/18068
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/18090
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   history_suggestion_clicked:
     type: event
@@ -5176,10 +5566,11 @@ awesomebar:
       - https://github.com/mozilla-mobile/fenix/issues/18068
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/18090
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   search_action_clicked:
     type: event
@@ -5189,10 +5580,11 @@ awesomebar:
       - https://github.com/mozilla-mobile/fenix/issues/18068
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/18090
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   search_suggestion_clicked:
     type: event
@@ -5202,10 +5594,11 @@ awesomebar:
       - https://github.com/mozilla-mobile/fenix/issues/18068
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/18090
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
   opened_tab_suggestion_clicked:
     type: event
@@ -5215,10 +5608,11 @@ awesomebar:
       - https://github.com/mozilla-mobile/fenix/issues/18068
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/18090
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-08-01"
 
 home_menu:
@@ -5229,10 +5623,11 @@ home_menu:
       - https://github.com/mozilla-mobile/fenix/issues/18856
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/18987
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-10-01"
 
 home_screen:
@@ -5243,10 +5638,11 @@ home_screen:
       - https://github.com/mozilla-mobile/fenix/issues/18856
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/19025
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-10-01"
 
 android_keystore_experiment:
@@ -5263,10 +5659,11 @@ android_keystore_experiment:
       - https://github.com/mozilla-mobile/fenix/issues/17869
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/18333#pullrequestreview-612447395
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-09-01"
   get_failure:
     type: event
@@ -5281,10 +5678,11 @@ android_keystore_experiment:
       - https://github.com/mozilla-mobile/fenix/issues/17869
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/18333#pullrequestreview-612447395
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-09-01"
   get_result:
     type: event
@@ -5299,10 +5697,11 @@ android_keystore_experiment:
       - https://github.com/mozilla-mobile/fenix/issues/17869
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/18333#pullrequestreview-612447395
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-09-01"
   write_failure:
     type: event
@@ -5317,10 +5716,11 @@ android_keystore_experiment:
       - https://github.com/mozilla-mobile/fenix/issues/17869
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/18333#pullrequestreview-612447395
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-09-01"
   write_success:
     type: event
@@ -5330,10 +5730,11 @@ android_keystore_experiment:
       - https://github.com/mozilla-mobile/fenix/issues/17869
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/18333#pullrequestreview-612447395
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-09-01"
   reset:
     type: event
@@ -5344,10 +5745,11 @@ android_keystore_experiment:
       - https://github.com/mozilla-mobile/fenix/issues/17869
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/18333#pullrequestreview-612447395
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - technical
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-09-01"
 
 set_default_newtab_experiment:
@@ -5359,10 +5761,11 @@ set_default_newtab_experiment:
       - https://github.com/mozilla-mobile/fenix/issues/18853
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/18895
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
     expires: "2021-10-01"
   close_experiment_card_clicked:
     type: event
@@ -5372,10 +5775,27 @@ set_default_newtab_experiment:
       - https://github.com/mozilla-mobile/fenix/issues/18853
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/18895
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
     data_sensitivity:
       - interaction
     notification_emails:
-      - fenix-core@mozilla.com
+      - android-probes@mozilla.com
+    expires: "2021-10-01"
+
+set_default_setting_experiment:
+  set_default_browser_clicked:
+    type: event
+    description: |
+      Set default browser was clicked from settings screen.
+    bugs:
+      - https://github.com/mozilla-mobile/fenix/issues/18852
+    data_reviews:
+      - https://github.com/mozilla-mobile/fenix/pull/19047
+      - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
+    data_sensitivity:
+      - interaction
+    notification_emails:
+      - android-probes@mozilla.com
     expires: "2021-10-01"
 
 set_default_setting_experiment:
diff --git a/app/pings.yaml b/app/pings.yaml
index d244af9f0..8839d189f 100644
--- a/app/pings.yaml
+++ b/app/pings.yaml
@@ -17,7 +17,7 @@ activation:
   data_reviews:
     - https://github.com/mozilla-mobile/fenix/pull/1707#issuecomment-486972209
   notification_emails:
-    - fenix-core@mozilla.com
+    - android-probes@mozilla.com
 
 first-session:
   description: |
@@ -29,7 +29,7 @@ first-session:
   data_reviews:
     - https://github.com/mozilla-mobile/fenix/pull/8074#issuecomment-586512202
   notification_emails:
-    - fenix-core@mozilla.com
+    - android-probes@mozilla.com
 
 startup-timeline:
   description: |
diff --git a/app/src/androidTest/assets/pages/audioMediaPage.html b/app/src/androidTest/assets/pages/audioMediaPage.html
index 1a8720a85..8fd6da11d 100644
--- a/app/src/androidTest/assets/pages/audioMediaPage.html
+++ b/app/src/androidTest/assets/pages/audioMediaPage.html
@@ -9,18 +9,5 @@
         <source src="../resources/audioSample.mp3">
     </audio>
 </div>
-<div class="playbackState">
-</div>
-<script>
-        const audio = document.querySelector('audio');
-
-        audio.addEventListener('playing', (event) => {
-          document.querySelector('.playbackState').innerText="Media file is playing"
-        });
-
-		audio.addEventListener('pause', (event) => {
-          document.querySelector('.playbackState').innerText="Media file is paused"
-        });
-</script>
 </body>
 </html>
\ No newline at end of file
diff --git a/app/src/androidTest/assets/pages/videoMediaPage.html b/app/src/androidTest/assets/pages/videoMediaPage.html
index 32baa8d78..3de177e2c 100644
--- a/app/src/androidTest/assets/pages/videoMediaPage.html
+++ b/app/src/androidTest/assets/pages/videoMediaPage.html
@@ -9,18 +9,5 @@
             <source src="../resources/videoSample.webm">
     </video>
 </div>
-<div class="playbackState">
-</div>
-<script>
-        const video = document.querySelector('video');
-
-        video.addEventListener('playing', (event) => {
-          document.querySelector('.playbackState').innerText="Media file is playing";
-        });
-
-		video.addEventListener('pause', (event) => {
-          document.querySelector('.playbackState').innerHTML="Media file is paused";
-        });
-</script>
 </body>
 </html>
\ No newline at end of file
diff --git a/app/src/androidTest/java/org/mozilla/fenix/helpers/TestHelper.kt b/app/src/androidTest/java/org/mozilla/fenix/helpers/TestHelper.kt
index ec9b3d70e..30db0383c 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/helpers/TestHelper.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/helpers/TestHelper.kt
@@ -4,12 +4,17 @@
 
 package org.mozilla.fenix.helpers
 
+import android.app.PendingIntent
 import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.Color
 import android.net.Uri
 import android.os.Build
 import android.os.Environment
+import androidx.browser.customtabs.CustomTabsIntent
 import androidx.preference.PreferenceManager
 import androidx.test.espresso.Espresso
 import androidx.test.espresso.Espresso.onView
@@ -153,4 +158,32 @@ object TestHelper {
             }
         }
     }
+
+    fun createCustomTabIntent(
+        pageUrl: String,
+        customMenuItemLabel: String = "",
+        customActionButtonDescription: String = ""
+    ): Intent {
+        val appContext = InstrumentationRegistry.getInstrumentation()
+            .targetContext
+            .applicationContext
+        val pendingIntent = PendingIntent.getActivity(appContext, 0, Intent(), 0)
+        val customTabsIntent = CustomTabsIntent.Builder()
+            .addMenuItem(customMenuItemLabel, pendingIntent)
+            .setShareState(CustomTabsIntent.SHARE_STATE_ON)
+            .setActionButton(
+                createTestBitmap(),
+                customActionButtonDescription, pendingIntent, true
+            )
+            .build()
+        customTabsIntent.intent.data = Uri.parse(pageUrl)
+        return customTabsIntent.intent
+    }
+
+    private fun createTestBitmap(): Bitmap {
+        val bitmap = Bitmap.createBitmap(100, 100, Bitmap.Config.ARGB_8888)
+        val canvas = Canvas(bitmap)
+        canvas.drawColor(Color.GREEN)
+        return bitmap
+    }
 }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/screenshots/MenuScreenShotTest.kt b/app/src/androidTest/java/org/mozilla/fenix/screenshots/MenuScreenShotTest.kt
index d058bc8c7..ab2465a79 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/screenshots/MenuScreenShotTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/screenshots/MenuScreenShotTest.kt
@@ -68,47 +68,38 @@ class MenuScreenShotTest : ScreenshotTest() {
         }.openThreeDotMenu {
         }.openSettings {
             Screengrab.screenshot("SettingsRobot_settings-menu")
-            settingsAccountPreferences()
+        }.openTurnOnSyncMenu {
             Screengrab.screenshot("AccountSettingsRobot_settings-account")
-            mDevice.pressBack()
-
-            settingsSearch()
+        }.goBack {
+        }.openSearchSubMenu {
             Screengrab.screenshot("SettingsSubMenuSearchRobot_settings-search")
-            mDevice.pressBack()
-
-            settingsTheme()
+        }.goBack {
+        }.openCustomizeSubMenu {
             Screengrab.screenshot("SettingsSubMenuThemeRobot_settings-theme")
-            mDevice.pressBack()
-
-            settingsAccessibility()
+        }.goBack {
+        }.openAccessibilitySubMenu {
             Screengrab.screenshot("SettingsSubMenuAccessibilityRobot_settings-accessibility")
-            mDevice.pressBack()
-
-            settingsLanguage()
+        }.goBack {
+        }.openLanguageSubMenu {
             Screengrab.screenshot("SettingsSubMenuAccessibilityRobot_settings-language")
-            mDevice.pressBack()
-
-            settingDefaultBrowser()
+        }.goBack {
+        // From about here we need to scroll up to ensure all settings options are visible.
+        }.openSetDefaultBrowserSubMenu {
             Screengrab.screenshot("SettingsSubMenuDefaultBrowserRobot_settings-default-browser")
-            mDevice.pressBack()
-
-            // Disabled for Pixel 2
-            // settingsTP()
-            // Screengrab.screenshot("settings-enhanced-tp")
-            // mDevice.pressBack()
-
-            loginsAndPassword()
+        }.goBack {
+        // Disabled for Pixel 2
+        // }.openEnhancedTrackingProtectionSubMenu {
+        //     Screengrab.screenshot("settings-enhanced-tp")
+        // }.goBack {
+        }.openLoginsAndPasswordSubMenu {
             Screengrab.screenshot("SettingsSubMenuLoginsAndPasswords-settings-logins-passwords")
-            mDevice.pressBack()
-
+        }.goBack {
             swipeToBottom()
             Screengrab.screenshot("SettingsRobot_settings-scroll-to-bottom")
-
-            settingsTelemetry()
+        }.openSettingsSubMenuDataCollection {
             Screengrab.screenshot("settings-telemetry")
-            mDevice.pressBack()
-
-            addOns()
+        }.goBack {
+        }.openAddonsManagerMenu {
             Screengrab.screenshot("settings-addons")
         }
     }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
index d09de56b3..747aed42d 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
@@ -223,8 +223,7 @@ class BookmarksTest {
             IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
         }.openThreeDotMenu(defaultWebPage.url) {
         }.clickOpenInNewTab {
-            verifyUrl(defaultWebPage.url.toString())
-        }.openTabDrawer {
+            verifyTabTrayIsOpened()
             verifyNormalModeSelected()
         }
     }
@@ -242,8 +241,7 @@ class BookmarksTest {
             IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
         }.openThreeDotMenu(defaultWebPage.url) {
         }.clickOpenInPrivateTab {
-            verifyUrl(defaultWebPage.url.toString())
-        }.openTabDrawer {
+            verifyTabTrayIsOpened()
             verifyPrivateModeSelected()
         }
     }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/DeepLinkTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/DeepLinkTest.kt
index 7bca26ebe..ff9159210 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/DeepLinkTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/DeepLinkTest.kt
@@ -108,7 +108,6 @@ class DeepLinkTest {
     fun openSettingsLogins() {
         robot.openSettingsLogins {
             verifyDefaultView()
-            verifyDefaultValueSyncLogins()
             verifyDefaultValueAutofillLogins()
         }
     }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/HistoryTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/HistoryTest.kt
index 8267e85be..6dcdc9e4c 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/HistoryTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/HistoryTest.kt
@@ -149,8 +149,7 @@ class HistoryTest {
             IdlingRegistry.getInstance().register(historyListIdlingResource!!)
         }.openThreeDotMenu {
         }.clickOpenInNormalTab {
-            verifyUrl(firstWebPage.url.toString())
-        }.openTabDrawer {
+            verifyTabTrayIsOpened()
             verifyNormalModeSelected()
         }
     }
@@ -170,8 +169,7 @@ class HistoryTest {
             IdlingRegistry.getInstance().register(historyListIdlingResource!!)
         }.openThreeDotMenu {
         }.clickOpenInPrivateTab {
-            verifyUrl(firstWebPage.url.toString())
-        }.openTabDrawer {
+            verifyTabTrayIsOpened()
             verifyPrivateModeSelected()
         }
     }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/MediaNotificationTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/MediaNotificationTest.kt
index 02ce669f2..ac17093b2 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/MediaNotificationTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/MediaNotificationTest.kt
@@ -4,13 +4,15 @@
 
 package org.mozilla.fenix.ui
 
-import androidx.test.uiautomator.UiSelector
+import mozilla.components.browser.state.store.BrowserStore
+import mozilla.components.concept.engine.mediasession.MediaSession
 import okhttp3.mockwebserver.MockWebServer
 import org.junit.After
 import org.junit.Before
 import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
+import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.HomeActivityTestRule
 import org.mozilla.fenix.helpers.TestAssetHelper
@@ -33,9 +35,14 @@ class MediaNotificationTest {
 
     @get:Rule
     val activityTestRule = HomeActivityTestRule()
+    private lateinit var browserStore: BrowserStore
 
     @Before
     fun setUp() {
+        // Initializing this as part of class construction, below the rule would throw a NPE
+        // So we are initializing this here instead of in all tests.
+        browserStore = activityTestRule.activity.components.core.store
+
         mockWebServer = MockWebServer().apply {
             dispatcher = AndroidAssetDispatcher()
             start()
@@ -45,16 +52,10 @@ class MediaNotificationTest {
     @After
     fun tearDown() {
         mockWebServer.shutdown()
-        // verify if the notification tray is expanded and should be closed before the next test
-        val notificationShade =
-            mDevice.findObject(UiSelector().resourceId("com.android.systemui:id/notification_stack_scroller"))
-
-        if (notificationShade.exists())
-            mDevice.pressBack()
     }
 
+    @Ignore("Still failing, due to https://github.com/mozilla-mobile/android-components/issues/9748")
     @Test
-    @Ignore("https://github.com/mozilla-mobile/fenix/issues/15754")
     fun videoPlaybackSystemNotificationTest() {
         val videoTestPage = TestAssetHelper.getVideoPageAsset(mockWebServer)
 
@@ -62,7 +63,7 @@ class MediaNotificationTest {
         }.enterURLAndEnterToBrowser(videoTestPage.url) {
             mDevice.waitForIdle()
             clickMediaPlayerPlayButton()
-            waitForPlaybackToStart()
+            assertPlaybackState(browserStore, MediaSession.PlaybackState.PLAYING)
         }.openNotificationShade {
             verifySystemNotificationExists(videoTestPage.title)
             clickMediaSystemNotificationControlButton("Pause")
@@ -72,7 +73,7 @@ class MediaNotificationTest {
         mDevice.pressBack()
 
         browserScreen {
-            verifyMediaIsPaused()
+            assertPlaybackState(browserStore, MediaSession.PlaybackState.PAUSED)
         }.openTabDrawer {
             closeTab()
         }
@@ -88,60 +89,6 @@ class MediaNotificationTest {
     }
 
     @Test
-    @Ignore("https://github.com/mozilla-mobile/fenix/issues/15754")
-    fun audioPlaybackSystemNotificationTest() {
-        val audioTestPage = TestAssetHelper.getAudioPageAsset(mockWebServer)
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(audioTestPage.url) {
-            mDevice.waitForIdle()
-            clickMediaPlayerPlayButton()
-            waitForPlaybackToStart()
-        }.openNotificationShade {
-            verifySystemNotificationExists(audioTestPage.title)
-            clickMediaSystemNotificationControlButton("Pause")
-            verifyMediaSystemNotificationButtonState("Play")
-        }
-
-        mDevice.pressBack()
-
-        browserScreen {
-            verifyMediaIsPaused()
-        }.openTabDrawer {
-            closeTab()
-        }
-
-        mDevice.openNotification()
-
-        notificationShade {
-            verifySystemNotificationGone(audioTestPage.title)
-        }
-
-        // close notification shade before the next test
-        mDevice.pressBack()
-    }
-
-    @Test
-    @Ignore("https://github.com/mozilla-mobile/fenix/issues/15754")
-    fun tabMediaControlButtonTest() {
-        val audioTestPage = TestAssetHelper.getAudioPageAsset(mockWebServer)
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(audioTestPage.url) {
-            mDevice.waitForIdle()
-            clickMediaPlayerPlayButton()
-            waitForPlaybackToStart()
-        }.openTabDrawer {
-            verifyTabMediaControlButtonState("Pause")
-            clickTabMediaControlButton()
-            verifyTabMediaControlButtonState("Play")
-        }.openTab(audioTestPage.title) {
-            verifyMediaIsPaused()
-        }
-    }
-
-    @Test
-    @Ignore("https://github.com/mozilla-mobile/fenix/issues/15754")
     fun mediaSystemNotificationInPrivateModeTest() {
         val audioTestPage = TestAssetHelper.getAudioPageAsset(mockWebServer)
 
@@ -151,7 +98,7 @@ class MediaNotificationTest {
         }.enterURLAndEnterToBrowser(audioTestPage.url) {
             mDevice.waitForIdle()
             clickMediaPlayerPlayButton()
-            waitForPlaybackToStart()
+            assertPlaybackState(browserStore, MediaSession.PlaybackState.PLAYING)
         }.openNotificationShade {
             verifySystemNotificationExists("A site is playing media")
             clickMediaSystemNotificationControlButton("Pause")
@@ -161,7 +108,7 @@ class MediaNotificationTest {
         mDevice.pressBack()
 
         browserScreen {
-            verifyMediaIsPaused()
+            assertPlaybackState(browserStore, MediaSession.PlaybackState.PAUSED)
         }.openTabDrawer {
             closeTab()
             verifySnackBarText("Private tab closed")
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SearchTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SearchTest.kt
index 11454a188..06ac71c14 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SearchTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SearchTest.kt
@@ -32,6 +32,7 @@ class SearchTest {
             verifySearchView()
             verifyBrowserToolbar()
             verifyScanButton()
+            verifySearchEngineButton()
         }
     }
 
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsPrivacyTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsPrivacyTest.kt
index 81a1a4459..1999e13d8 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsPrivacyTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsPrivacyTest.kt
@@ -147,6 +147,12 @@ class SettingsPrivacyTest {
             verifyDeleteBrowsingDataOnQuitSubMenuItems()
         }.goBack {
 
+            // NOTIFICATIONS
+            verifyNotificationsButton()
+        }.openSettingsSubMenuNotifications {
+            verifySystemNotificationsView()
+        }.goBack {
+
             // DATA COLLECTION
             verifyDataCollectionButton()
         }.openSettingsSubMenuDataCollection {
@@ -170,7 +176,6 @@ class SettingsPrivacyTest {
             TestHelper.scrollToElementByText("Logins and passwords")
         }.openLoginsAndPasswordSubMenu {
             verifyDefaultView()
-            verifyDefaultValueSyncLogins()
             verifyDefaultValueAutofillLogins()
             verifyDefaultValueExceptions()
         }.openSavedLogins {
@@ -203,7 +208,6 @@ class SettingsPrivacyTest {
             TestHelper.scrollToElementByText("Logins and passwords")
         }.openLoginsAndPasswordSubMenu {
             verifyDefaultView()
-            verifyDefaultValueSyncLogins()
         }.openSavedLogins {
             verifySecurityPromptForLogins()
             tapSetupLater()
@@ -228,7 +232,6 @@ class SettingsPrivacyTest {
         }.openSettings {
         }.openLoginsAndPasswordSubMenu {
             verifyDefaultView()
-            verifyDefaultValueSyncLogins()
         }.openSavedLogins {
             verifySecurityPromptForLogins()
             tapSetupLater()
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt
index be94e034d..1e5d40593 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt
@@ -9,8 +9,11 @@ import androidx.core.net.toUri
 import androidx.recyclerview.widget.RecyclerView
 import androidx.test.espresso.IdlingRegistry
 import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.rule.ActivityTestRule
 import androidx.test.rule.GrantPermissionRule
 import androidx.test.uiautomator.UiDevice
+import mozilla.components.browser.state.store.BrowserStore
+import mozilla.components.concept.engine.mediasession.MediaSession
 import okhttp3.mockwebserver.MockWebServer
 import org.junit.After
 import org.junit.Before
@@ -18,23 +21,29 @@ import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.FeatureFlags
+import org.mozilla.fenix.IntentReceiverActivity
 import org.mozilla.fenix.R
+import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.HomeActivityTestRule
 import org.mozilla.fenix.helpers.RecyclerViewIdlingResource
 import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.helpers.TestHelper
+import org.mozilla.fenix.helpers.TestHelper.createCustomTabIntent
 import org.mozilla.fenix.helpers.TestHelper.deleteDownloadFromStorage
+import org.mozilla.fenix.helpers.TestHelper.scrollToElementByText
 import org.mozilla.fenix.helpers.ViewVisibilityIdlingResource
 import org.mozilla.fenix.ui.robots.browserScreen
 import org.mozilla.fenix.ui.robots.clickTabCrashedRestoreButton
 import org.mozilla.fenix.ui.robots.clickUrlbar
+import org.mozilla.fenix.ui.robots.customTabScreen
 import org.mozilla.fenix.ui.robots.dismissTrackingOnboarding
 import org.mozilla.fenix.ui.robots.downloadRobot
 import org.mozilla.fenix.ui.robots.enhancedTrackingProtection
 import org.mozilla.fenix.ui.robots.homeScreen
 import org.mozilla.fenix.ui.robots.navigationToolbar
+import org.mozilla.fenix.ui.robots.notificationShade
 import org.mozilla.fenix.ui.robots.tabDrawer
 import org.mozilla.fenix.ui.util.STRING_ONBOARDING_TRACKING_PROTECTION_HEADER
 
@@ -52,8 +61,9 @@ class SmokeTest {
     private var recentlyClosedTabsListIdlingResource: RecyclerViewIdlingResource? = null
     private var readerViewNotification: ViewVisibilityIdlingResource? = null
     private val downloadFileName = "Globe.svg"
-    val collectionName = "First Collection"
+    private val collectionName = "First Collection"
     private var bookmarksListIdlingResource: RecyclerViewIdlingResource? = null
+    private val customMenuItem = "TestMenuItem"
 
     // This finds the dialog fragment child of the homeFragment, otherwise the awesomeBar would return null
     private fun getAwesomebarView(): View? {
@@ -66,6 +76,12 @@ class SmokeTest {
 
     @get:Rule
     val activityTestRule = HomeActivityTestRule()
+    private lateinit var browserStore: BrowserStore
+
+    @get: Rule
+    val intentReceiverActivityTestRule = ActivityTestRule(
+        IntentReceiverActivity::class.java, true, false
+    )
 
     @get:Rule
     var mGrantPermissions = GrantPermissionRule.grant(
@@ -75,6 +91,10 @@ class SmokeTest {
 
     @Before
     fun setUp() {
+        // Initializing this as part of class construction, below the rule would throw a NPE
+        // So we are initializing this here instead of in all related tests.
+        browserStore = activityTestRule.activity.components.core.store
+
         mockWebServer = MockWebServer().apply {
             dispatcher = AndroidAssetDispatcher()
             start()
@@ -112,7 +132,7 @@ class SmokeTest {
         }
     }
 
-    // copied over from HomeScreenTest
+    // Verifies the first run onboarding screen
     @Test
     fun firstRunScreenTest() {
         homeScreen {
@@ -155,7 +175,6 @@ class SmokeTest {
     }
 
     @Test
-    @Ignore("https://github.com/mozilla-mobile/fenix/issues/18603")
     // Verifies the functionality of the onboarding Start Browsing button
     fun startBrowsingButtonTest() {
         homeScreen {
@@ -525,7 +544,6 @@ class SmokeTest {
         }
     }
 
-    @Ignore("Failing, see: https://github.com/mozilla-mobile/fenix/issues/17847")
     @Test
     // Swipes the nav bar left/right to switch between tabs
     fun swipeToSwitchTabTest() {
@@ -1062,34 +1080,6 @@ class SmokeTest {
         }
     }
 
-    @Ignore("Feature is temporarily removed; disabling test. See https://github.com/mozilla-mobile/fenix/issues/18656")
-    @Test
-    fun selectTabsButtonVisibilityTest() {
-        homeScreen {
-        }.dismissOnboarding()
-
-        val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-        val secondWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2)
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(firstWebPage.url) {
-            mDevice.waitForIdle()
-        }.openTabDrawer {
-        }.openNewTab {
-        }.submitQuery(secondWebPage.url.toString()) {
-            mDevice.waitForIdle()
-        }.openTabDrawer {
-        }.toggleToPrivateTabs {
-        }.openNewTab {
-        }.dismissSearchBar { }
-
-        homeScreen {
-        }.openTabDrawer {
-        }.toggleToNormalTabs {
-            verifySelectTabsButton()
-        }
-    }
-
     @Test
     fun privateTabsTrayWithOpenedTabTest() {
         val website = TestAssetHelper.getGenericAsset(mockWebServer, 1)
@@ -1230,4 +1220,104 @@ class SmokeTest {
             verifyPageContent(website.content)
         }
     }
+
+    @Test
+    // Verifies the main menu of a custom tab with a custom menu item
+    fun customTabMenuItemsTest() {
+        val customTabPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
+
+        intentReceiverActivityTestRule.launchActivity(
+            createCustomTabIntent(
+                customTabPage.url.toString(),
+                customMenuItem
+            )
+        )
+
+        customTabScreen {
+            browserScreen {
+                verifyPageContent(customTabPage.content)
+            }
+        }.openMainMenu {
+            verifyPoweredByTextIsDisplayed()
+            verifyCustomMenuItem(customMenuItem)
+            verifyDesktopSiteButtonExists()
+            verifyFindInPageButtonExists()
+            verifyOpenInBrowserButtonExists()
+            verifyBackButtonExists()
+            verifyForwardButtonExists()
+            verifyRefreshButtonExists()
+        }
+    }
+
+    @Test
+    // The test opens a link in a custom tab then sends it to the browser
+    fun openCustomTabInBrowserTest() {
+        val customTabPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
+
+        intentReceiverActivityTestRule.launchActivity(
+            createCustomTabIntent(
+                customTabPage.url.toString()
+            )
+        )
+
+        customTabScreen {
+            browserScreen {
+                verifyPageContent(customTabPage.content)
+            }
+        }.openMainMenu {
+        }.clickOpenInBrowserButton {
+            verifyTabCounter("1")
+        }
+    }
+
+    @Test
+    fun audioPlaybackSystemNotificationTest() {
+        val audioTestPage = TestAssetHelper.getAudioPageAsset(mockWebServer)
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(audioTestPage.url) {
+            mDevice.waitForIdle()
+            clickMediaPlayerPlayButton()
+            assertPlaybackState(browserStore, MediaSession.PlaybackState.PLAYING)
+        }.openNotificationShade {
+            verifySystemNotificationExists(audioTestPage.title)
+            clickMediaSystemNotificationControlButton("Pause")
+            verifyMediaSystemNotificationButtonState("Play")
+        }
+
+        mDevice.pressBack()
+
+        browserScreen {
+            assertPlaybackState(browserStore, MediaSession.PlaybackState.PAUSED)
+        }.openTabDrawer {
+            closeTab()
+        }
+
+        mDevice.openNotification()
+
+        notificationShade {
+            verifySystemNotificationGone(audioTestPage.title)
+        }
+
+        // close notification shade before the next test
+        mDevice.pressBack()
+    }
+
+    @Test
+    fun tabMediaControlButtonTest() {
+        val audioTestPage = TestAssetHelper.getAudioPageAsset(mockWebServer)
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(audioTestPage.url) {
+            mDevice.waitForIdle()
+            clickMediaPlayerPlayButton()
+            assertPlaybackState(browserStore, MediaSession.PlaybackState.PLAYING)
+        }.openTabDrawer {
+            verifyTabMediaControlButtonState("Pause")
+            clickTabMediaControlButton()
+            verifyTabMediaControlButtonState("Play")
+        }.openTab(audioTestPage.title) {
+            assertPlaybackState(browserStore, MediaSession.PlaybackState.PAUSED)
+        }
+    }
 }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt
index d10a7df65..30a1691bf 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt
@@ -9,6 +9,7 @@ package org.mozilla.fenix.ui.robots
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
+import android.os.SystemClock
 import android.widget.EditText
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.Espresso.pressBack
@@ -33,10 +34,13 @@ import androidx.test.uiautomator.UiDevice
 import androidx.test.uiautomator.UiSelector
 import androidx.test.uiautomator.Until
 import mozilla.components.browser.state.selector.selectedTab
+import mozilla.components.browser.state.store.BrowserStore
+import mozilla.components.concept.engine.mediasession.MediaSession
 import org.hamcrest.CoreMatchers.allOf
 import org.hamcrest.CoreMatchers.containsString
 import org.hamcrest.Matchers.not
 import org.junit.Assert.assertTrue
+import org.junit.Assert.fail
 import org.mozilla.fenix.R
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.helpers.Constants.LONG_CLICK_DURATION
@@ -371,14 +375,33 @@ class BrowserRobot {
         mediaPlayerPlayButton().click()
     }
 
-    fun waitForPlaybackToStart() {
-        val playStateMessage = mDevice.findObject(UiSelector().text("Media file is playing"))
-        assertTrue(playStateMessage.waitForExists(waitingTime))
-    }
-
-    fun verifyMediaIsPaused() {
-        val pausedStateMessage = mDevice.findObject(UiSelector().text("Media file is paused"))
-        assertTrue(pausedStateMessage.waitForExists(waitingTime))
+    /**
+     * Get the current playback state of the currently selected tab.
+     * The result may be null if there if the currently playing media tab cannot be found in [store]
+     *
+     * @param store [BrowserStore] from which to get data about the current tab's state.
+     * @return nullable [MediaSession.PlaybackState] indicating the media playback state for the current tab.
+     */
+    private fun getCurrentPlaybackState(store: BrowserStore): MediaSession.PlaybackState? {
+        return store.state.selectedTab?.mediaSessionState?.playbackState
+    }
+
+    /**
+     * Asserts that in [waitingTime] the playback state of the current tab will be [expectedState].
+     *
+     * @param store [BrowserStore] from which to get data about the current tab's state.
+     * @param expectedState [MediaSession.PlaybackState] the playback state that will be asserted
+     * @param waitingTime maximum time the test will wait for the playback state to become [expectedState]
+     * before failing the assertion.
+     */
+    fun assertPlaybackState(store: BrowserStore, expectedState: MediaSession.PlaybackState) {
+        val startMills = SystemClock.uptimeMillis()
+        var currentMills: Long = 0
+        while (currentMills <= waitingTime) {
+            if (expectedState == getCurrentPlaybackState(store)) return
+            currentMills = SystemClock.uptimeMillis() - startMills
+        }
+        fail("Playback did not moved to state: $expectedState")
     }
 
     fun swipeNavBarRight(tabUrl: String) {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/CustomTabRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/CustomTabRobot.kt
new file mode 100644
index 000000000..90f05e96a
--- /dev/null
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/CustomTabRobot.kt
@@ -0,0 +1,84 @@
+/* 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/. */
+package org.mozilla.fenix.ui.robots
+
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.uiautomator.UiSelector
+import junit.framework.TestCase.assertTrue
+import mozilla.components.support.ktx.android.content.appName
+import org.mozilla.fenix.R
+import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime
+
+/**
+ *  Implementation of the robot pattern for Custom tabs
+ */
+class CustomTabRobot {
+
+    fun verifyDesktopSiteButtonExists() {
+        desktopSiteButton().check(matches(isDisplayed()))
+    }
+
+    fun verifyFindInPageButtonExists() {
+        findInPageButton().check(matches(isDisplayed()))
+    }
+
+    fun verifyPoweredByTextIsDisplayed() {
+        mDevice.findObject(UiSelector().textContains("POWERED BY ${appContext.appName}"))
+    }
+
+    fun verifyOpenInBrowserButtonExists() {
+        openInBrowserButton().check(matches(isDisplayed()))
+    }
+
+    fun verifyBackButtonExists() = assertTrue(backButton().waitForExists(waitingTime))
+
+    fun verifyForwardButtonExists() = assertTrue(forwardButton().waitForExists(waitingTime))
+
+    fun verifyRefreshButtonExists() = assertTrue(refreshButton().waitForExists(waitingTime))
+
+    fun verifyCustomMenuItem(label: String) {
+        assertTrue(mDevice.findObject(UiSelector().text(label)).exists())
+    }
+
+    class Transition {
+        fun openMainMenu(interact: CustomTabRobot.() -> Unit): Transition {
+            mainMenuButton().waitForExists(waitingTime)
+            mainMenuButton().click()
+
+            CustomTabRobot().interact()
+            return Transition()
+        }
+
+        fun clickOpenInBrowserButton(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
+            openInBrowserButton().perform(click())
+
+            BrowserRobot().interact()
+            return BrowserRobot.Transition()
+        }
+    }
+}
+
+fun customTabScreen(interact: CustomTabRobot.() -> Unit): CustomTabRobot.Transition {
+    CustomTabRobot().interact()
+    return CustomTabRobot.Transition()
+}
+
+private fun mainMenuButton() = mDevice.findObject(UiSelector().description("Menu"))
+
+private fun desktopSiteButton() = onView(withId(R.id.switch_widget))
+
+private fun findInPageButton() = onView(withText("Find in page"))
+
+private fun openInBrowserButton() = onView(withText("Open in ${appContext.appName}"))
+
+private fun refreshButton() = mDevice.findObject(UiSelector().description("Refresh"))
+
+private fun forwardButton() = mDevice.findObject(UiSelector().description("Forward"))
+
+private fun backButton() = mDevice.findObject(UiSelector().description("Back"))
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt
index 95825a1c5..2f62957d1 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt
@@ -11,7 +11,6 @@ import android.widget.EditText
 import androidx.recyclerview.widget.RecyclerView
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.NoMatchingViewException
-import androidx.test.espresso.ViewInteraction
 import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.action.ViewActions.swipeLeft
@@ -24,7 +23,6 @@ import androidx.test.espresso.matcher.ViewMatchers.Visibility
 import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
 import androidx.test.espresso.matcher.ViewMatchers.hasSibling
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
-import androidx.test.espresso.matcher.ViewMatchers.withContentDescription
 import androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility
 import androidx.test.espresso.matcher.ViewMatchers.withHint
 import androidx.test.espresso.matcher.ViewMatchers.withId
@@ -33,10 +31,12 @@ import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.uiautomator.By
 import androidx.test.uiautomator.By.text
 import androidx.test.uiautomator.UiDevice
+import androidx.test.uiautomator.UiObject
 import androidx.test.uiautomator.UiScrollable
 import androidx.test.uiautomator.UiSelector
 import androidx.test.uiautomator.Until
 import androidx.test.uiautomator.Until.findObject
+import junit.framework.TestCase.assertTrue
 import mozilla.components.browser.state.state.searchEngines
 import mozilla.components.support.ktx.android.content.appName
 import org.hamcrest.CoreMatchers.allOf
@@ -240,12 +240,6 @@ class HomeScreenRobot {
         }
     }
 
-    fun scrollToElementByText(text: String): UiScrollable {
-        val appView = UiScrollable(UiSelector().scrollable(true))
-        appView.scrollTextIntoView(text)
-        return appView
-    }
-
     fun togglePrivateBrowsingModeOnOff() {
         onView(ViewMatchers.withResourceName("privateBrowsingButton"))
             .perform(click())
@@ -256,12 +250,6 @@ class HomeScreenRobot {
     fun swipeToTop() =
         onView(withId(R.id.sessionControlRecyclerView)).perform(ViewActions.swipeDown())
 
-    fun swipeTabRight(title: String) =
-        tab(title).perform(ViewActions.swipeRight())
-
-    fun swipeTabLeft(title: String) =
-        tab(title).perform(ViewActions.swipeLeft())
-
     fun verifySnackBarText(expectedText: String) {
         val mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
         mDevice.waitNotNull(findObject(By.text(expectedText)), waitingTime)
@@ -273,21 +261,6 @@ class HomeScreenRobot {
         ).perform(click())
     }
 
-    fun verifyTabMediaControlButtonState(action: String) {
-        mDevice.waitNotNull(
-            findObject(
-                By
-                    .res("org.mozilla.fenix.debug:id/play_pause_button")
-                    .desc(action)
-            ),
-            waitingTime
-        )
-
-        tabMediaControlButton().check(matches(withContentDescription(action)))
-    }
-
-    fun clickTabMediaControlButton() = tabMediaControlButton().click()
-
     class Transition {
         val mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
 
@@ -314,6 +287,8 @@ class HomeScreenRobot {
         }
 
         fun openSearch(interact: SearchRobot.() -> Unit): SearchRobot.Transition {
+            mDevice.findObject(UiSelector().resourceId("$packageName:id/toolbar"))
+                .waitForExists(waitingTime)
             navigationToolbar().perform(click())
 
             SearchRobot().interact()
@@ -325,7 +300,6 @@ class HomeScreenRobot {
         }
 
         fun clickStartBrowsingButton(interact: SearchRobot.() -> Unit): SearchRobot.Transition {
-            scrollToElementByText("Start browsing")
             startBrowsingButton().click()
 
             SearchRobot().interact()
@@ -333,7 +307,11 @@ class HomeScreenRobot {
         }
 
         fun togglePrivateBrowsingMode() {
-            onView(ViewMatchers.withResourceName("privateBrowsingButton"))
+            mDevice.findObject(UiSelector().resourceId("$packageName:id/privateBrowsingButton"))
+                .waitForExists(
+                    waitingTime
+                )
+            privateBrowsingButton()
                 .perform(click())
         }
 
@@ -342,10 +320,10 @@ class HomeScreenRobot {
             for (i in 1..5) {
                 mDevice.findObject(UiSelector().resourceId("$packageName:id/privateBrowsingButton"))
                     .waitForExists(
-                            waitingTime
+                        waitingTime
                     )
 
-                onView(ViewMatchers.withResourceName("privateBrowsingButton"))
+                privateBrowsingButton()
                     .perform(click())
             }
 
@@ -357,25 +335,11 @@ class HomeScreenRobot {
             onView(ViewMatchers.isRoot()).perform(ViewActions.pressBack())
         }
 
-        fun openTabsListThreeDotMenu(interact: ThreeDotMenuMainRobot.() -> Unit): ThreeDotMenuMainRobot.Transition {
-//            tabsListThreeDotButton().perform(click())
-
-            ThreeDotMenuMainRobot().interact()
-            return ThreeDotMenuMainRobot.Transition()
-        }
-
-        fun closeAllPrivateTabs(interact: HomeScreenRobot.() -> Unit): Transition {
-            onView(withId(R.id.close_tabs_button))
-                .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-                .perform(click())
-
-            HomeScreenRobot().interact()
-            return Transition()
-        }
-
         fun openNavigationToolbar(interact: NavigationToolbarRobot.() -> Unit): NavigationToolbarRobot.Transition {
+            mDevice.findObject(UiSelector().resourceId("$packageName:id/toolbar"))
+                .waitForExists(waitingTime)
+            navigationToolbar().perform(click())
 
-            assertNavigationToolbar().perform(click())
             NavigationToolbarRobot().interact()
             return NavigationToolbarRobot.Transition()
         }
@@ -462,6 +426,13 @@ fun homeScreen(interact: HomeScreenRobot.() -> Unit): HomeScreenRobot.Transition
 val mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
 val appContext = InstrumentationRegistry.getInstrumentation().targetContext
 
+private fun homeScreenList() =
+    UiScrollable(
+        UiSelector()
+            .resourceId("$packageName:id/sessionControlRecyclerView")
+            .scrollable(true)
+    ).setAsVerticalList()
+
 private fun assertKeyboardVisibility(isExpectedToBeVisible: Boolean) =
     Assert.assertEquals(
         isExpectedToBeVisible,
@@ -470,14 +441,10 @@ private fun assertKeyboardVisibility(isExpectedToBeVisible: Boolean) =
             .contains("mInputShown=true")
     )
 
-private fun navigationToolbar() =
-    onView(allOf(withText("Search or enter address")))
-
-private fun closeTabButton() = onView(withId(R.id.close_tab_button))
+private fun navigationToolbar() = onView(withId(R.id.toolbar))
 
 private fun assertNavigationToolbar() =
-    onView(allOf(withText("Search or enter address")))
-        .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+    navigationToolbar().check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
 
 private fun assertFocusedNavigationToolbar() =
     onView(allOf(withHint("Search or enter address")))
@@ -493,8 +460,8 @@ private fun assertHomeMenu() = onView(ViewMatchers.withResourceName("menuButton"
     .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
 
 private fun assertHomePrivateBrowsingButton() =
-    onView(ViewMatchers.withResourceName("privateBrowsingButton"))
-        .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+    privateBrowsingButton()
+        .check(matches(isDisplayed()))
 
 private fun assertHomeWordmark() = onView(ViewMatchers.withResourceName("wordmark"))
     .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
@@ -644,9 +611,7 @@ private fun assertPrivacyNoticeButton() {
 }
 
 private fun assertStartBrowsingButton() {
-    scrollToElementByText("Start browsing")
-    onView(withId(R.id.finish_button))
-        .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+    assertTrue(startBrowsingButton().waitForExists(waitingTime))
 }
 
 // Pick your toolbar placement
@@ -711,7 +676,7 @@ private fun assertShareTabsOverlay() {
     onView(withId(R.id.share_tab_url)).check(matches(isDisplayed()))
 }
 
-private fun tabMediaControlButton() = onView(withId(R.id.play_pause_button))
+private fun privateBrowsingButton() = onView(withId(R.id.privateBrowsingButton))
 
 private fun collectionItem(title: String) =
     onView(allOf(withId(R.id.label), withText(title)))
@@ -730,15 +695,11 @@ private fun removeTabFromCollectionButton(title: String) =
 
 private fun tabsCounter() = onView(withId(R.id.tab_button))
 
-private fun tab(title: String) =
-    onView(
-        allOf(
-            withId(R.id.tab_title),
-            withText(title)
-        )
-    )
-
-private fun startBrowsingButton(): ViewInteraction {
-    scrollToElementByText("Start browsing")
-    return onView(allOf(withText("Start browsing")))
+private fun startBrowsingButton(): UiObject {
+    val startBrowsingButton = mDevice.findObject(UiSelector().resourceId("$packageName:id/finish_button"))
+    homeScreenList()
+        .scrollIntoView(startBrowsingButton)
+    homeScreenList()
+        .ensureFullyVisible(startBrowsingButton)
+    return startBrowsingButton
 }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SearchRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SearchRobot.kt
index 6bf120a16..a9ccd138a 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SearchRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SearchRobot.kt
@@ -49,6 +49,7 @@ class SearchRobot {
     fun verifySearchView() = assertSearchView()
     fun verifyBrowserToolbar() = assertBrowserToolbarEditView()
     fun verifyScanButton() = assertScanButton()
+    fun verifySearchEngineButton() = assertSearchEngineButton()
     fun verifySearchWithText() = assertSearchWithText()
     fun verifySearchEngineResults(searchEngineName: String) =
         assertSearchEngineResults(searchEngineName)
@@ -215,7 +216,7 @@ private fun assertSearchEngineResults(searchEngineName: String) {
 }
 
 private fun assertSearchView() {
-    onView(allOf(withId(R.id.search_layout)))
+    onView(withId(R.id.search_wrapper)).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
 }
 
 private fun assertBrowserToolbarEditView() =
@@ -226,6 +227,10 @@ private fun assertScanButton() =
     onView(allOf(withText("Scan")))
         .check(matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
 
+private fun assertSearchEngineButton() =
+    onView(withId(R.id.search_engines_shortcut_button))
+        .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+
 private fun assertSearchWithText() =
     onView(allOf(withText("THIS TIME, SEARCH WITH:")))
         .check(matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsRobot.kt
index 61acebf2a..c0d8f33bf 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsRobot.kt
@@ -9,10 +9,10 @@ package org.mozilla.fenix.ui.robots
 import android.content.pm.PackageManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.action.ViewActions
-import androidx.test.espresso.contrib.RecyclerViewActions
 import androidx.test.espresso.ViewInteraction
+import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.contrib.RecyclerViewActions
 import androidx.test.espresso.intent.Intents.intended
 import androidx.test.espresso.intent.matcher.IntentMatchers
 import androidx.test.espresso.intent.matcher.IntentMatchers.toPackage
@@ -70,6 +70,7 @@ class SettingsRobot {
     fun verifyDeleteBrowsingDataOnQuitButton() = assertDeleteBrowsingDataOnQuitButton()
     fun verifyDeleteBrowsingDataOnQuitValue(state: String) =
         assertDeleteBrowsingDataValue(state)
+    fun verifyNotificationsButton() = assertNotificationsButton()
     fun verifyDataCollectionButton() = assertDataCollectionButton()
     fun verifyOpenLinksInAppsButton() = assertOpenLinksInAppsButton()
     fun verifyOpenLinksInAppsSwitchDefault() = assertOpenLinksInAppsValue()
@@ -154,6 +155,24 @@ class SettingsRobot {
             return SettingsSubMenuAccessibilityRobot.Transition()
         }
 
+        fun openLanguageSubMenu(interact: SettingsSubMenuLanguageRobot.() -> Unit): SettingsSubMenuLanguageRobot.Transition {
+
+            fun languageButton() = onView(withText("Language"))
+            languageButton().click()
+
+            SettingsSubMenuLanguageRobot().interact()
+            return SettingsSubMenuLanguageRobot.Transition()
+        }
+
+        fun openSetDefaultBrowserSubMenu(interact: SettingsSubMenuSetDefaultBrowserRobot.() -> Unit): SettingsSubMenuSetDefaultBrowserRobot.Transition {
+            scrollToElementByText("Set as default browser")
+            fun setDefaultBrowserButton() = onView(withText("Set as default browser"))
+            setDefaultBrowserButton().click()
+
+            SettingsSubMenuSetDefaultBrowserRobot().interact()
+            return SettingsSubMenuSetDefaultBrowserRobot.Transition()
+        }
+
         fun openEnhancedTrackingProtectionSubMenu(interact: SettingsSubMenuEnhancedTrackingProtectionRobot.() -> Unit): SettingsSubMenuEnhancedTrackingProtectionRobot.Transition {
             scrollToElementByText("Enhanced Tracking Protection")
             fun enhancedTrackingProtectionButton() =
@@ -217,6 +236,15 @@ class SettingsRobot {
             return SettingsSubMenuDeleteBrowsingDataOnQuitRobot.Transition()
         }
 
+        fun openSettingsSubMenuNotifications(interact: SystemSettingsRobot.() -> Unit): SystemSettingsRobot.Transition {
+            scrollToElementByText("Notifications")
+            fun notificationsButton() = mDevice.findObject(textContains("Notifications"))
+            notificationsButton().click()
+
+            SystemSettingsRobot().interact()
+            return SystemSettingsRobot.Transition()
+        }
+
         fun openSettingsSubMenuDataCollection(interact: SettingsSubMenuDataCollectionRobot.() -> Unit): SettingsSubMenuDataCollectionRobot.Transition {
             scrollToElementByText("Data collection")
             fun dataCollectionButton() = mDevice.findObject(textContains("Data collection"))
@@ -365,8 +393,17 @@ private fun assertDeleteBrowsingDataValue(state: String) {
     onView(withText(state)).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
 }
 
-private fun assertDataCollectionButton() = onView(withText("Data collection"))
+private fun assertNotificationsButton() {
+    scrollToElementByText("Notifications")
+    onView(withText("Notifications"))
+        .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+}
+
+private fun assertDataCollectionButton() {
+    scrollToElementByText("Data collection")
+    onView(withText("Data collection"))
     .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+}
 
 private fun openLinksInAppsButton() = onView(withText("Open links in apps"))
 
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuLanguageRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuLanguageRobot.kt
new file mode 100644
index 000000000..1dd28b2a7
--- /dev/null
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuLanguageRobot.kt
@@ -0,0 +1,29 @@
+/* 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/. */
+
+package org.mozilla.fenix.ui.robots
+
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.uiautomator.UiDevice
+import org.hamcrest.CoreMatchers
+
+class SettingsSubMenuLanguageRobot {
+    class Transition {
+        val mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
+
+        fun goBack(interact: SettingsRobot.() -> Unit): SettingsRobot.Transition {
+            mDevice.waitForIdle()
+            goBackButton().perform(ViewActions.click())
+
+            SettingsRobot().interact()
+            return SettingsRobot.Transition()
+        }
+    }
+}
+
+private fun goBackButton() =
+    onView(CoreMatchers.allOf(ViewMatchers.withContentDescription("Navigate up")))
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuLoginsAndPasswordRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuLoginsAndPasswordRobot.kt
index 46b8656ce..74a6805de 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuLoginsAndPasswordRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuLoginsAndPasswordRobot.kt
@@ -26,7 +26,7 @@ import org.mozilla.fenix.helpers.ext.waitNotNull
 class SettingsSubMenuLoginsAndPasswordRobot {
 
     fun verifyDefaultView() {
-        mDevice.waitNotNull(Until.findObjects(By.text("Sync logins")), TestAssetHelper.waitingTime)
+        mDevice.waitNotNull(Until.findObjects(By.text("Sync logins across devices")), TestAssetHelper.waitingTime)
         assertDefaultView()
     }
 
@@ -42,8 +42,6 @@ class SettingsSubMenuLoginsAndPasswordRobot {
 
     fun verifyDefaultValueAutofillLogins() = assertDefaultValueAutofillLogins()
 
-    fun verifyDefaultValueSyncLogins() = assertDefaultValueSyncLogins()
-
     class Transition {
         val mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
 
@@ -71,7 +69,7 @@ class SettingsSubMenuLoginsAndPasswordRobot {
         }
 
         fun openSyncLogins(interact: SettingsTurnOnSyncRobot.() -> Unit): SettingsTurnOnSyncRobot.Transition {
-            fun syncLoginsButton() = onView(ViewMatchers.withText("Sync logins"))
+            fun syncLoginsButton() = onView(ViewMatchers.withText("Sync logins across devices"))
             syncLoginsButton().click()
 
             SettingsTurnOnSyncRobot().interact()
@@ -96,7 +94,7 @@ fun settingsSubMenuLoginsAndPassword(interact: SettingsSubMenuLoginsAndPasswordR
 private fun goBackButton() =
         onView(CoreMatchers.allOf(ViewMatchers.withContentDescription("Navigate up")))
 
-private fun assertDefaultView() = onView(ViewMatchers.withText("Sync logins"))
+private fun assertDefaultView() = onView(ViewMatchers.withText("Sync logins across devices"))
         .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
 
 private fun assertDefaultValueAutofillLogins() = onView(ViewMatchers.withText("Autofill"))
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuSetDefaultBrowserRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuSetDefaultBrowserRobot.kt
new file mode 100644
index 000000000..7b7d3bd2c
--- /dev/null
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuSetDefaultBrowserRobot.kt
@@ -0,0 +1,25 @@
+/* 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/. */
+
+package org.mozilla.fenix.ui.robots
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.uiautomator.UiDevice
+
+class SettingsSubMenuSetDefaultBrowserRobot {
+    class Transition {
+        val mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
+
+        fun goBack(interact: SettingsRobot.() -> Unit): SettingsRobot.Transition {
+            mDevice.waitForIdle()
+
+            // We are now in system settings / showing a default browser dialog.
+            // Really want to go back to the app. Not interested in up navigation like in other robots.
+            mDevice.pressBack()
+
+            SettingsRobot().interact()
+            return SettingsRobot.Transition()
+        }
+    }
+}
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsTurnOnSyncRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsTurnOnSyncRobot.kt
index 156815761..5faa2840b 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsTurnOnSyncRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsTurnOnSyncRobot.kt
@@ -36,11 +36,11 @@ class SettingsTurnOnSyncRobot {
     class Transition {
         val mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
 
-        fun goBack(interact: SettingsSubMenuLoginsAndPasswordRobot.() -> Unit): SettingsSubMenuLoginsAndPasswordRobot.Transition {
+        fun goBack(interact: SettingsSubMenuLoginsAndPasswordRobot.() -> Unit): SettingsRobot.Transition {
             goBackButton().perform(ViewActions.click())
 
             SettingsSubMenuLoginsAndPasswordRobot().interact()
-            return SettingsSubMenuLoginsAndPasswordRobot.Transition()
+            return SettingsRobot.Transition()
         }
     }
 }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SystemSettingsRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SystemSettingsRobot.kt
index bd3847a8a..daf9ae8c7 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SystemSettingsRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SystemSettingsRobot.kt
@@ -6,8 +6,12 @@ package org.mozilla.fenix.ui.robots
 
 import androidx.test.espresso.intent.Intents
 import androidx.test.espresso.intent.matcher.IntentMatchers.hasAction
+import androidx.test.uiautomator.UiSelector
+import org.junit.Assert.assertTrue
+import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime
 
 class SystemSettingsRobot {
+    fun verifySystemNotificationsView() = assertSystemNotificationsView()
     fun verifyNotifications() {
         Intents.intended(hasAction("android.settings.APP_NOTIFICATION_SETTINGS"))
     }
@@ -18,6 +22,12 @@ class SystemSettingsRobot {
 
     class Transition {
         // Difficult to know where this will go
+        fun goBack(interact: SettingsRobot.() -> Unit): SettingsRobot.Transition {
+            mDevice.pressBack()
+
+            SettingsRobot().interact()
+            return SettingsRobot.Transition()
+        }
     }
 }
 
@@ -25,3 +35,11 @@ fun systemSettings(interact: SystemSettingsRobot.() -> Unit): SystemSettingsRobo
     SystemSettingsRobot().interact()
     return SystemSettingsRobot.Transition()
 }
+
+private fun assertSystemNotificationsView() {
+    mDevice.findObject(UiSelector().resourceId("com.android.settings:id/list"))
+        .waitForExists(waitingTime)
+    assertTrue(mDevice.findObject(UiSelector().textContains("Show notifications"))
+        .waitForExists(waitingTime)
+    )
+}
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/TabDrawerRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/TabDrawerRobot.kt
index f0007760c..8a9256817 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/TabDrawerRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/TabDrawerRobot.kt
@@ -80,6 +80,7 @@ class TabDrawerRobot {
     fun verifySelectTabsButton() = assertSelectTabsButton()
     fun verifyTabTrayOverflowMenu(visibility: Boolean) = assertTabTrayOverflowButton(visibility)
 
+    fun verifyTabTrayIsOpened() = assertTabTrayDoesExist()
     fun verifyTabTrayIsClosed() = assertTabTrayDoesNotExist()
     fun verifyHalfExpandedRatio() = assertMinisculeHalfExpandedRatio()
     fun verifyBehaviorState(expectedState: Int) = assertBehaviorState(expectedState)
@@ -421,6 +422,11 @@ private fun assertTabTrayOverflowButton(visible: Boolean) =
     onView(withId(R.id.tab_tray_overflow))
         .check(matches(withEffectiveVisibility(visibleOrGone(visible))))
 
+private fun assertTabTrayDoesExist() {
+    onView(withId(R.id.tab_wrapper))
+        .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
+}
+
 private fun assertTabTrayDoesNotExist() {
     onView(withId(R.id.tab_wrapper))
         .check(doesNotExist())
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuBookmarksRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuBookmarksRobot.kt
index 1173b6bec..2c13ba626 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuBookmarksRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuBookmarksRobot.kt
@@ -38,18 +38,18 @@ class ThreeDotMenuBookmarksRobot {
             return BookmarksRobot.Transition()
         }
 
-        fun clickOpenInNewTab(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
+        fun clickOpenInNewTab(interact: TabDrawerRobot.() -> Unit): TabDrawerRobot.Transition {
             openInNewTabButton().click()
 
-            BrowserRobot().interact()
-            return BrowserRobot.Transition()
+            TabDrawerRobot().interact()
+            return TabDrawerRobot.Transition()
         }
 
-        fun clickOpenInPrivateTab(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
+        fun clickOpenInPrivateTab(interact: TabDrawerRobot.() -> Unit): TabDrawerRobot.Transition {
             openInPrivateTabButton().click()
 
-            BrowserRobot().interact()
-            return BrowserRobot.Transition()
+            TabDrawerRobot().interact()
+            return TabDrawerRobot.Transition()
         }
 
         fun clickDelete(interact: BookmarksRobot.() -> Unit): BookmarksRobot.Transition {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuHistoryItemRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuHistoryItemRobot.kt
index cc44a1621..850a9cec9 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuHistoryItemRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuHistoryItemRobot.kt
@@ -41,16 +41,16 @@ class ThreeDotMenuHistoryItemRobot {
             return LibrarySubMenusMultipleSelectionToolbarRobot.Transition()
         }
 
-        fun clickOpenInNormalTab(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
+        fun clickOpenInNormalTab(interact: TabDrawerRobot.() -> Unit): TabDrawerRobot.Transition {
             openInNewNormalTabButton().click()
-            BrowserRobot().interact()
-            return BrowserRobot.Transition()
+            TabDrawerRobot().interact()
+            return TabDrawerRobot.Transition()
         }
 
-        fun clickOpenInPrivateTab(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
+        fun clickOpenInPrivateTab(interact: TabDrawerRobot.() -> Unit): TabDrawerRobot.Transition {
             openInNewPrivateTabButton().click()
-            BrowserRobot().interact()
-            return BrowserRobot.Transition()
+            TabDrawerRobot().interact()
+            return TabDrawerRobot.Transition()
         }
 
         fun clickDelete(interact: HistoryRobot.() -> Unit): HistoryRobot.Transition {
diff --git a/app/src/debug/res/raw/initial_experiments.json b/app/src/debug/res/raw/initial_experiments.json
new file mode 100644
index 000000000..fdff36028
--- /dev/null
+++ b/app/src/debug/res/raw/initial_experiments.json
@@ -0,0 +1,236 @@
+{
+  "data": [{
+          "slug": "feature-text-variables-validation-android",
+          "appId": "org.mozilla.fenix",
+          "appName": "fenix",
+          "channel": "nightly",
+          "branches": [{
+                  "slug": "control",
+                  "ratio": 100,
+                  "feature": {
+                      "value": {},
+                      "enabled": true,
+                      "featureId": "nimbus-validation"
+                  }
+              },
+              {
+                  "slug": "a1",
+                  "ratio": 0,
+                  "feature": {
+                      "value": {
+                          "settings-title": "settings_title",
+                          "settings-title-punctuation": "…"
+                      },
+                      "enabled": true,
+                      "featureId": "nimbus-validation"
+                  }
+              },
+              {
+                  "slug": "a2",
+                  "ratio": 0,
+                  "feature": {
+                      "value": {
+                          "settings-title": "preferences_category_general",
+                          "settings-title-punctuation": "!"
+                      },
+                      "enabled": true,
+                      "featureId": "nimbus-validation"
+                  }
+              }
+          ],
+          "outcomes": [],
+          "arguments": {},
+          "probeSets": [],
+          "startDate": null,
+          "targeting": "true",
+          "featureIds": [
+              "nimbus-validation"
+          ],
+          "application": "org.mozilla.firefox_beta",
+          "bucketConfig": {
+              "count": 0,
+              "start": 0,
+              "total": 10000,
+              "namespace": "nimbus-validation-2",
+              "randomizationUnit": "nimbus_id"
+          },
+          "schemaVersion": "1.5.0",
+          "userFacingName": "Nimbus Text Variables Validation",
+          "referenceBranch": "control",
+          "proposedDuration": 14,
+          "isEnrollmentPaused": false,
+          "proposedEnrollment": 7,
+          "userFacingDescription": "Demonstration experiment to make trivial visible changes to text in Settings",
+          "last_modified": 1621443780172
+      },
+      {
+          "slug": "feature-icon-variables-validation-android",
+          "appId": "org.mozilla.fenix",
+          "appName": "fenix",
+          "channel": "nightly",
+          "branches": [{
+                  "slug": "control",
+                  "ratio": 100,
+                  "feature": {
+                      "value": {},
+                      "enabled": true,
+                      "featureId": "nimbus-validation"
+                  }
+              },
+              {
+                  "slug": "treatment",
+                  "ratio": 0,
+                  "feature": {
+                      "value": {
+                          "settings-title": "Fancy Settings",
+                          "settings-icon": "ic_edit"
+                      },
+                      "enabled": true,
+                      "featureId": "nimbus-validation"
+                  }
+              }
+          ],
+          "outcomes": [],
+          "arguments": {},
+          "probeSets": [],
+          "startDate": null,
+          "targeting": "true",
+          "featureIds": [
+              "nimbus-validation"
+          ],
+          "application": "org.mozilla.firefox_beta",
+          "bucketConfig": {
+              "count": 0,
+              "start": 0,
+              "total": 10000,
+              "namespace": "nimbus-validation-2",
+              "randomizationUnit": "nimbus_id"
+          },
+          "schemaVersion": "1.5.0",
+          "userFacingName": "Nimbus Icon Variables Validation",
+          "referenceBranch": "control",
+          "proposedDuration": 14,
+          "isEnrollmentPaused": false,
+          "proposedEnrollment": 7,
+          "userFacingDescription": "Demonstration experiment to make trivial visible changes to icons in Settings",
+          "last_modified": 1621443780172
+      },
+
+      {
+          "slug": "feature-text-variables-validation-ios",
+          "appId": "org.mozilla.ios.Fennec",
+          "appName": "firefox_ios",
+          "channel": "nightly",
+          "branches": [{
+                  "slug": "control",
+                  "ratio": 100,
+                  "feature": {
+                      "value": {},
+                      "enabled": true,
+                      "featureId": "nimbus-validation"
+                  }
+              },
+              {
+                  "slug": "a1",
+                  "ratio": 0,
+                  "feature": {
+                      "value": {
+                          "settings-title": "Menu/Menu.OpenSettingsAction.Title",
+                          "settings-title-punctuation": "…"
+                      },
+                      "enabled": true,
+                      "featureId": "nimbus-validation"
+                  }
+              },
+              {
+                  "slug": "a2",
+                  "ratio": 0,
+                  "feature": {
+                      "value": {
+                          "settings-title": "Settings.General.SectionName",
+                          "settings-title-punctuation": "!"
+                      },
+                      "enabled": true,
+                      "featureId": "nimbus-validation"
+                  }
+              }
+          ],
+          "outcomes": [],
+          "arguments": {},
+          "probeSets": [],
+          "startDate": null,
+          "targeting": "true",
+          "featureIds": [
+              "nimbus-validation"
+          ],
+          "application": "org.mozilla.ios.Fennec",
+          "bucketConfig": {
+              "count": 0,
+              "start": 0,
+              "total": 10000,
+              "namespace": "nimbus-validation-2",
+              "randomizationUnit": "nimbus_id"
+          },
+          "schemaVersion": "1.5.0",
+          "userFacingName": "Nimbus Text Variables Validation",
+          "referenceBranch": "control",
+          "proposedDuration": 14,
+          "isEnrollmentPaused": false,
+          "proposedEnrollment": 7,
+          "userFacingDescription": "Demonstration experiment to make trivial visible changes to text in Settings",
+          "last_modified": 1621443780172
+      },
+      {
+          "slug": "feature-icon-variables-validation-ios",
+          "appId": "org.mozilla.ios.Fennec",
+          "appName": "firefox_ios",
+          "channel": "nightly",
+          "branches": [{
+                  "slug": "control",
+                  "ratio": 100,
+                  "feature": {
+                      "value": {},
+                      "enabled": true,
+                      "featureId": "nimbus-validation"
+                  }
+              },
+              {
+                  "slug": "treatment",
+                  "ratio": 0,
+                  "feature": {
+                      "value": {
+                          "settings-title": "Fancy Settings",
+                          "settings-icon": "menu-ViewMobile"
+                      },
+                      "enabled": true,
+                      "featureId": "nimbus-validation"
+                  }
+              }
+          ],
+          "outcomes": [],
+          "arguments": {},
+          "probeSets": [],
+          "startDate": null,
+          "targeting": "true",
+          "featureIds": [
+              "nimbus-validation"
+          ],
+          "application": "org.mozilla.ios.Fennec",
+          "bucketConfig": {
+              "count": 0,
+              "start": 0,
+              "total": 10000,
+              "namespace": "nimbus-validation-2",
+              "randomizationUnit": "nimbus_id"
+          },
+          "schemaVersion": "1.5.0",
+          "userFacingName": "Nimbus Icon Variables Validation",
+          "referenceBranch": "control",
+          "proposedDuration": 14,
+          "isEnrollmentPaused": false,
+          "proposedEnrollment": 7,
+          "userFacingDescription": "Demonstration experiment to make trivial visible changes to icons in Settings",
+          "last_modified": 1621443780172
+      }
+  ]
+}
diff --git a/app/src/debug/res/xml/shortcuts.xml b/app/src/debug/res/xml/shortcuts.xml
index 1873a5af4..43b3ff7bd 100644
--- a/app/src/debug/res/xml/shortcuts.xml
+++ b/app/src/debug/res/xml/shortcuts.xml
@@ -26,4 +26,4 @@
             android:targetPackage="org.mozilla.fenix.debug"
             android:targetClass="org.mozilla.fenix.IntentReceiverActivity" />
     </shortcut>
-</shortcuts>
\ No newline at end of file
+</shortcuts>
diff --git a/app/src/geckoNightly/java/org/mozilla/fenix/engine/GeckoProvider.kt b/app/src/geckoNightly/java/org/mozilla/fenix/engine/GeckoProvider.kt
deleted file mode 100644
index 9a1d2f8b1..000000000
--- a/app/src/geckoNightly/java/org/mozilla/fenix/engine/GeckoProvider.kt
+++ /dev/null
@@ -1,91 +0,0 @@
-/* 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/. */
-
-import android.content.Context
-import mozilla.components.browser.engine.gecko.autofill.GeckoLoginDelegateWrapper
-import mozilla.components.browser.engine.gecko.ext.toContentBlockingSetting
-import mozilla.components.browser.engine.gecko.glean.GeckoAdapter
-import mozilla.components.concept.engine.EngineSession.TrackingProtectionPolicy
-import mozilla.components.concept.storage.LoginsStorage
-import mozilla.components.lib.crash.handler.CrashHandlerService
-import mozilla.components.service.sync.logins.GeckoLoginStorageDelegate
-import org.mozilla.fenix.Config
-import org.mozilla.fenix.ext.components
-import org.mozilla.geckoview.GeckoRuntime
-import org.mozilla.geckoview.GeckoRuntimeSettings
-import org.mozilla.geckoview.ContentBlocking
-import org.mozilla.geckoview.ContentBlocking.SafeBrowsingProvider
-
-object GeckoProvider {
-    private var runtime: GeckoRuntime? = null
-    const val CN_UPDATE_URL =
-        "https://sb.firefox.com.cn/downloads?client=SAFEBROWSING_ID&appver=%MAJOR_VERSION%&pver=2.2"
-    const val CN_GET_HASH_URL =
-        "https://sb.firefox.com.cn/gethash?client=SAFEBROWSING_ID&appver=%MAJOR_VERSION%&pver=2.2"
-
-    @Synchronized
-    fun getOrCreateRuntime(
-        context: Context,
-        storage: Lazy<LoginsStorage>,
-        trackingProtectionPolicy: TrackingProtectionPolicy
-    ): GeckoRuntime {
-        if (runtime == null) {
-            runtime = createRuntime(context, storage, trackingProtectionPolicy)
-        }
-
-        return runtime!!
-    }
-
-    private fun createRuntime(
-        context: Context,
-        storage: Lazy<LoginsStorage>,
-        policy: TrackingProtectionPolicy
-    ): GeckoRuntime {
-        val builder = GeckoRuntimeSettings.Builder()
-
-        val runtimeSettings = builder
-            .crashHandler(CrashHandlerService::class.java)
-            .telemetryDelegate(GeckoAdapter())
-            .contentBlocking(policy.toContentBlockingSetting())
-            .debugLogging(Config.channel.isDebug)
-            .aboutConfigEnabled(true)
-            .build()
-
-        val settings = context.components.settings
-        if (!settings.shouldUseAutoSize) {
-            runtimeSettings.automaticFontSizeAdjustment = false
-            val fontSize = settings.fontSizeFactor
-            runtimeSettings.fontSizeFactor = fontSize
-        }
-
-        // Add safebrowsing providers for China
-        if (Config.channel.isMozillaOnline) {
-            val mozcn = SafeBrowsingProvider
-                .withName("mozcn")
-                .version("2.2")
-                .lists("m6eb-phish-shavar", "m6ib-phish-shavar")
-                .updateUrl(CN_UPDATE_URL)
-                .getHashUrl(CN_GET_HASH_URL)
-                .build()
-
-            runtimeSettings.contentBlocking.setSafeBrowsingProviders(mozcn,
-                // Keep the existing configuration
-                ContentBlocking.GOOGLE_SAFE_BROWSING_PROVIDER,
-                ContentBlocking.GOOGLE_LEGACY_SAFE_BROWSING_PROVIDER)
-
-            runtimeSettings.contentBlocking.setSafeBrowsingPhishingTable(
-                "m6eb-phish-shavar",
-                "m6ib-phish-shavar",
-                // Existing configuration
-                "goog-phish-proto")
-        }
-
-        val geckoRuntime = GeckoRuntime.create(context, runtimeSettings)
-        val loginStorageDelegate = GeckoLoginStorageDelegate(storage)
-        @Suppress("Deprecation")
-        geckoRuntime.loginStorageDelegate = GeckoLoginDelegateWrapper(loginStorageDelegate)
-
-        return geckoRuntime
-    }
-}
diff --git a/app/src/main/java/org/mozilla/fenix/FenixApplication.kt b/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
index a14b00e73..f613fac45 100644
--- a/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
+++ b/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
@@ -63,6 +63,17 @@ import org.mozilla.fenix.session.VisibilityLifecycleCallback
 import org.mozilla.fenix.telemetry.TelemetryLifecycleObserver
 import org.mozilla.fenix.utils.BrowsersCache
 import java.util.concurrent.TimeUnit
+import mozilla.components.browser.state.store.BrowserStore
+import mozilla.components.feature.search.ext.buildSearchUrl
+import mozilla.components.feature.search.ext.waitForSelectedOrDefaultSearchEngine
+import mozilla.components.service.fxa.manager.SyncEnginesStorage
+import org.mozilla.fenix.GleanMetrics.Addons
+import org.mozilla.fenix.GleanMetrics.Preferences
+import org.mozilla.fenix.GleanMetrics.SearchDefaultEngine
+import org.mozilla.fenix.components.metrics.Event
+import org.mozilla.fenix.components.metrics.MozillaProductDetector
+import org.mozilla.fenix.components.toolbar.ToolbarPosition
+import org.mozilla.fenix.utils.Settings
 
 /**
  *The main application class for Fenix. Records data to measure initialization performance.
@@ -130,13 +141,11 @@ open class FenixApplication : LocaleAwareApplication(), Provider {
             buildInfo = GleanBuildInfo.buildInfo
         )
 
-        // Set this early to guarantee it's in every ping from here on.
-        Metrics.distributionId.set(
-            when (Config.channel.isMozillaOnline) {
-                true -> "MozillaOnline"
-                false -> "Mozilla"
-            }
-        )
+        // We avoid blocking the main thread on startup by setting startup metrics on the background thread.
+        val store = components.core.store
+        GlobalScope.launch(Dispatchers.IO) {
+            setStartupMetrics(store, settings())
+        }
     }
 
     @CallSuper
@@ -167,7 +176,6 @@ open class FenixApplication : LocaleAwareApplication(), Provider {
                 initializeWebExtensionSupport()
                 restoreBrowserState()
                 restoreDownloads()
-                restoreLocale()
 
                 // Just to make sure it is impossible for any application-services pieces
                 // to invoke parts of itself that require complete megazord initialization
@@ -220,10 +228,6 @@ open class FenixApplication : LocaleAwareApplication(), Provider {
         components.useCases.downloadUseCases.restoreDownloads()
     }
 
-    private fun restoreLocale() {
-        components.useCases.localeUseCases.restore()
-    }
-
     private fun initVisualCompletenessQueueAndQueueTasks() {
         val queue = components.performance.visualCompletenessQueue.queue
 
@@ -239,6 +243,7 @@ open class FenixApplication : LocaleAwareApplication(), Provider {
                         components.core.historyStorage.warmUp()
                         components.core.bookmarksStorage.warmUp()
                         components.core.passwordsStorage.warmUp()
+                        components.core.autofillStorage.warmUp()
                     }
 
                     SecurePrefsTelemetry(this@FenixApplication, components.analytics.experiments).startTests()
@@ -269,6 +274,14 @@ open class FenixApplication : LocaleAwareApplication(), Provider {
             }
         }
 
+        fun queueRestoreLocale() {
+            components.performance.visualCompletenessQueue.queue.runIfReadyOrQueue {
+                GlobalScope.launch(Dispatchers.IO) {
+                    components.useCases.localeUseCases.restore()
+                }
+            }
+        }
+
         initQueue()
 
         // We init these items in the visual completeness queue to avoid them initing in the critical
@@ -276,6 +289,7 @@ open class FenixApplication : LocaleAwareApplication(), Provider {
         queueInitStorageAndServices()
         queueMetrics()
         queueReviewPrompt()
+        queueRestoreLocale()
     }
 
     private fun startMetricsIfEnabled() {
@@ -514,6 +528,181 @@ open class FenixApplication : LocaleAwareApplication(), Provider {
         }
     }
 
+    /**
+     * This function is called right after Glean is initialized. Part of this function depends on
+     * shared preferences to be updated so the correct value is sent with the metrics ping.
+     *
+     * The reason we're using shared preferences to track these values is due to the limitations of
+     * the current metrics ping design. The values set here will be sent in every metrics ping even
+     * if these values have not changed since the last startup.
+     */
+    @Suppress("ComplexMethod", "LongMethod")
+    @VisibleForTesting
+    internal fun setStartupMetrics(
+        browserStore: BrowserStore,
+        settings: Settings,
+        browsersCache: BrowsersCache = BrowsersCache,
+        mozillaProductDetector: MozillaProductDetector = MozillaProductDetector
+    ) {
+        setPreferenceMetrics(settings)
+        with(Metrics) {
+            // Set this early to guarantee it's in every ping from here on.
+            distributionId.set(
+                when (Config.channel.isMozillaOnline) {
+                    true -> "MozillaOnline"
+                    false -> "Mozilla"
+                }
+            )
+
+            defaultBrowser.set(browsersCache.all(applicationContext).isDefaultBrowser)
+            mozillaProductDetector.getMozillaBrowserDefault(applicationContext)?.also {
+                defaultMozBrowser.set(it)
+            }
+
+            mozillaProducts.set(mozillaProductDetector.getInstalledMozillaProducts(applicationContext))
+
+            adjustCampaign.set(settings.adjustCampaignId)
+            adjustAdGroup.set(settings.adjustAdGroup)
+            adjustCreative.set(settings.adjustCreative)
+            adjustNetwork.set(settings.adjustNetwork)
+
+            searchWidgetInstalled.set(settings.searchWidgetInstalled)
+
+            val openTabsCount = settings.openTabsCount
+            hasOpenTabs.set(openTabsCount > 0)
+            if (openTabsCount > 0) {
+                tabsOpenCount.add(openTabsCount)
+            }
+
+            val topSitesSize = settings.topSitesSize
+            hasTopSites.set(topSitesSize > 0)
+            if (topSitesSize > 0) {
+                topSitesCount.add(topSitesSize)
+            }
+
+            if (settings.creditCardsSavedCount > 0) {
+                creditCardsSavedCount.add(settings.creditCardsSavedCount)
+            }
+
+            if (settings.creditCardsDeletedCount > 0) {
+                creditCardsDeletedCount.add(settings.creditCardsDeletedCount)
+            }
+
+            if (settings.creditCardsAutofilledCount > 0) {
+                creditCardsAutofillCount.add(settings.creditCardsAutofilledCount)
+            }
+
+            val installedAddonSize = settings.installedAddonsCount
+            Addons.hasInstalledAddons.set(installedAddonSize > 0)
+            if (installedAddonSize > 0) {
+                Addons.installedAddons.set(settings.installedAddonsList.split(','))
+            }
+
+            val enabledAddonSize = settings.enabledAddonsCount
+            Addons.hasEnabledAddons.set(enabledAddonSize > 0)
+            if (enabledAddonSize > 0) {
+                Addons.enabledAddons.set(settings.enabledAddonsList.split(','))
+            }
+
+            val desktopBookmarksSize = settings.desktopBookmarksSize
+            hasDesktopBookmarks.set(desktopBookmarksSize > 0)
+            if (desktopBookmarksSize > 0) {
+                desktopBookmarksCount.add(desktopBookmarksSize)
+            }
+
+            val mobileBookmarksSize = settings.mobileBookmarksSize
+            hasMobileBookmarks.set(mobileBookmarksSize > 0)
+            if (mobileBookmarksSize > 0) {
+                mobileBookmarksCount.add(mobileBookmarksSize)
+            }
+
+            toolbarPosition.set(
+                when (settings.toolbarPosition) {
+                    ToolbarPosition.BOTTOM -> Event.ToolbarPositionChanged.Position.BOTTOM.name
+                    ToolbarPosition.TOP -> Event.ToolbarPositionChanged.Position.TOP.name
+                }
+            )
+
+            tabViewSetting.set(settings.getTabViewPingString())
+            closeTabSetting.set(settings.getTabTimeoutPingString())
+        }
+
+        browserStore.waitForSelectedOrDefaultSearchEngine { searchEngine ->
+            if (searchEngine != null) {
+                SearchDefaultEngine.apply {
+                    code.set(searchEngine.id)
+                    name.set(searchEngine.name)
+                    submissionUrl.set(searchEngine.buildSearchUrl(""))
+                }
+            }
+        }
+    }
+
+    @Suppress("ComplexMethod")
+    private fun setPreferenceMetrics(
+        settings: Settings
+    ) {
+        with(Preferences) {
+            searchSuggestionsEnabled.set(settings.shouldShowSearchSuggestions)
+            remoteDebuggingEnabled.set(settings.isRemoteDebuggingEnabled)
+            telemetryEnabled.set(settings.isTelemetryEnabled)
+            browsingHistorySuggestion.set(settings.shouldShowHistorySuggestions)
+            bookmarksSuggestion.set(settings.shouldShowBookmarkSuggestions)
+            clipboardSuggestionsEnabled.set(settings.shouldShowClipboardSuggestions)
+            searchShortcutsEnabled.set(settings.shouldShowSearchShortcuts)
+            openLinksInPrivate.set(settings.openLinksInAPrivateTab)
+            privateSearchSuggestions.set(settings.shouldShowSearchSuggestionsInPrivate)
+            voiceSearchEnabled.set(settings.shouldShowVoiceSearch)
+            openLinksInAppEnabled.set(settings.openLinksInExternalApp)
+            signedInSync.set(settings.signedInFxaAccount)
+
+            val syncedItems = SyncEnginesStorage(applicationContext).getStatus().entries.filter {
+                it.value
+            }.map { it.key.nativeName }
+            syncItems.set(syncedItems)
+
+            toolbarPositionSetting.set(
+                when {
+                    settings.shouldUseFixedTopToolbar -> "fixed_top"
+                    settings.shouldUseBottomToolbar -> "bottom"
+                    else -> "top"
+                }
+            )
+
+            enhancedTrackingProtection.set(
+                when {
+                    !settings.shouldUseTrackingProtection -> ""
+                    settings.useStandardTrackingProtection -> "standard"
+                    settings.useStrictTrackingProtection -> "strict"
+                    settings.useCustomTrackingProtection -> "custom"
+                    else -> ""
+                }
+            )
+
+            val accessibilitySelection = mutableListOf<String>()
+
+            if (settings.switchServiceIsEnabled) {
+                accessibilitySelection.add("switch")
+            }
+
+            if (settings.touchExplorationIsEnabled) {
+                accessibilitySelection.add("touch exploration")
+            }
+
+            accessibilityServices.set(accessibilitySelection.toList())
+
+            userTheme.set(
+                when {
+                    settings.shouldUseLightTheme -> "light"
+                    settings.shouldUseDarkTheme -> "dark"
+                    settings.shouldFollowDeviceTheme -> "system"
+                    settings.shouldUseAutoBatteryTheme -> "battery"
+                    else -> ""
+                }
+            )
+        }
+    }
+
     protected fun recordOnInit() {
         // This gets called by more than one process. Ideally we'd only run this in the main process
         // but the code to check which process we're in crashes because the Context isn't valid yet.
diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
index 1da6a183f..5317b9c2d 100644
--- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
+++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
@@ -52,7 +52,6 @@ import mozilla.components.concept.storage.BookmarkNodeType
 import mozilla.components.feature.contextmenu.DefaultSelectionActionDelegate
 import mozilla.components.feature.privatemode.notification.PrivateNotificationFeature
 import mozilla.components.feature.search.BrowserStoreSearchAdapter
-import mozilla.components.feature.search.ext.legacy
 import mozilla.components.service.fxa.sync.SyncReason
 import mozilla.components.support.base.feature.ActivityResultHandler
 import mozilla.components.support.base.feature.UserInteractionHandler
@@ -83,6 +82,7 @@ import org.mozilla.fenix.ext.navigateBlockingForAsyncNavGraph
 import org.mozilla.fenix.ext.measureNoInline
 import org.mozilla.fenix.ext.metrics
 import org.mozilla.fenix.ext.nav
+import org.mozilla.fenix.ext.setNavigationIcon
 import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.home.HomeFragmentDirections
 import org.mozilla.fenix.home.intent.CrashReporterIntentProcessor
@@ -303,9 +303,12 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
         super.onResume()
 
         // Even if screenshots are allowed, we hide private content in the recents screen in onPause
-        // so onResume we should go back to setting these flags with the user screenshot setting
+        // only when we are in private mode, so in onResume we should go back to setting these flags
+        // with the user screenshot setting only when we are in private mode.
         // See https://github.com/mozilla-mobile/fenix/issues/11153
-        updateSecureWindowFlags(settings().lastKnownMode)
+        if (settings().lastKnownMode == BrowsingMode.Private) {
+            updateSecureWindowFlags(settings().lastKnownMode)
+        }
 
         // Diagnostic breadcrumb for "Display already aquired" crash:
         // https://github.com/mozilla-mobile/android-components/issues/7960
@@ -373,6 +376,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
             components.core.store.state.getNormalOrPrivateTabs(private = false).isNotEmpty()
 
         // Even if screenshots are allowed, we want to hide private content in the recents screen
+        // only when we are in private mode
         // See https://github.com/mozilla-mobile/fenix/issues/11153
         if (settings().lastKnownMode.isPrivate) {
             window.addFlags(FLAG_SECURE)
@@ -719,6 +723,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
             setSupportActionBar(navigationToolbar)
             // Add ids to this that we don't want to have a toolbar back button
             setupNavigationToolbar()
+            setNavigationIcon(R.drawable.ic_back_button)
 
             isToolbarInflated = true
         }
@@ -856,10 +861,10 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
                         SessionState.Source.USER_ENTERED,
                         true,
                         mode.isPrivate,
-                        searchEngine = engine.legacy()
+                        searchEngine = engine
                     )
             } else {
-                components.useCases.searchUseCases.defaultSearch.invoke(searchTermOrURL, engine.legacy())
+                components.useCases.searchUseCases.defaultSearch.invoke(searchTermOrURL, engine)
             }
         }
 
diff --git a/app/src/main/java/org/mozilla/fenix/SecureFragment.kt b/app/src/main/java/org/mozilla/fenix/SecureFragment.kt
new file mode 100644
index 000000000..24d2edf3c
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/SecureFragment.kt
@@ -0,0 +1,34 @@
+/* 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/. */
+
+package org.mozilla.fenix
+
+import android.os.Bundle
+import androidx.annotation.LayoutRes
+import androidx.fragment.app.Fragment
+import org.mozilla.fenix.ext.removeSecure
+import org.mozilla.fenix.ext.secure
+
+/**
+ * A [Fragment] implementation that can be used to secure screens displaying sensitive information
+ * by not allowing taking screenshots of their content.
+ *
+ * Fragments displaying such screens should extend [SecureFragment] instead of [Fragment] class.
+ */
+open class SecureFragment(@LayoutRes contentLayoutId: Int) : Fragment(contentLayoutId) {
+
+    constructor() : this(0) {
+        Fragment()
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        this.secure()
+        super.onCreate(savedInstanceState)
+    }
+
+    override fun onDestroy() {
+        this.removeSecure()
+        super.onDestroy()
+    }
+}
diff --git a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
index 0307b146a..6d6d4b7b2 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
@@ -4,11 +4,14 @@
 
 package org.mozilla.fenix.browser
 
+import android.app.KeyguardManager
 import android.content.Context
+import android.content.DialogInterface
 import android.content.Intent
 import android.content.res.Configuration
 import android.os.Build
 import android.os.Bundle
+import android.provider.Settings
 import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
@@ -16,8 +19,9 @@ import android.view.ViewGroup
 import android.view.accessibility.AccessibilityManager
 import androidx.annotation.CallSuper
 import androidx.annotation.VisibleForTesting
+import androidx.appcompat.app.AlertDialog
 import androidx.coordinatorlayout.widget.CoordinatorLayout
-import androidx.core.net.toUri
+import androidx.core.content.getSystemService
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
@@ -65,6 +69,7 @@ import mozilla.components.feature.intent.ext.EXTRA_SESSION_ID
 import mozilla.components.feature.media.fullscreen.MediaSessionFullscreenFeature
 import mozilla.components.feature.privatemode.feature.SecureWindowFeature
 import mozilla.components.feature.prompts.PromptFeature
+import mozilla.components.feature.prompts.PromptFeature.Companion.PIN_REQUEST
 import mozilla.components.feature.prompts.share.ShareDelegate
 import mozilla.components.feature.readerview.ReaderViewFeature
 import mozilla.components.feature.search.SearchFeature
@@ -130,8 +135,11 @@ import mozilla.components.feature.webauthn.WebAuthnFeature
 import mozilla.components.support.base.feature.ActivityResultHandler
 import org.mozilla.fenix.ext.navigateBlockingForAsyncNavGraph
 import mozilla.components.support.ktx.android.view.enterToImmersiveMode
+import mozilla.components.support.ktx.kotlin.getOrigin
 import org.mozilla.fenix.GleanMetrics.PerfStartup
 import org.mozilla.fenix.ext.measureNoInline
+import org.mozilla.fenix.ext.secure
+import org.mozilla.fenix.settings.biometric.BiometricPromptFeature
 import mozilla.components.feature.session.behavior.ToolbarPosition as MozacToolbarPosition
 
 /**
@@ -180,6 +188,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Activit
         ViewBoundFeatureWrapper<MediaSessionFullscreenFeature>()
     private val searchFeature = ViewBoundFeatureWrapper<SearchFeature>()
     private val webAuthnFeature = ViewBoundFeatureWrapper<WebAuthnFeature>()
+    private val biometricPromptFeature = ViewBoundFeatureWrapper<BiometricPromptFeature>()
     private var pipFeature: PictureInPictureFeature? = null
 
     var customTabSessionId: String? = null
@@ -533,6 +542,21 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Activit
             view = view
         )
 
+        biometricPromptFeature.set(
+            feature = BiometricPromptFeature(
+                context = context,
+                fragment = this,
+                onAuthFailure = {
+                    promptsFeature.get()?.onBiometricResult(isAuthenticated = false)
+                },
+                onAuthSuccess = {
+                    promptsFeature.get()?.onBiometricResult(isAuthenticated = true)
+                }
+            ),
+            owner = this,
+            view = view
+        )
+
         promptsFeature.set(
             feature = PromptFeature(
                 activity = activity,
@@ -545,6 +569,9 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Activit
                 isSaveLoginEnabled = {
                     context.settings().shouldPromptToSaveLogins
                 },
+                isCreditCardAutofillEnabled = {
+                    context.settings().shouldAutofillCreditCardDetails
+                },
                 loginExceptionStorage = context.components.core.loginExceptionStorage,
                 shareDelegate = object : ShareDelegate {
                     override fun showShareSheet(
@@ -571,6 +598,15 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Activit
                             NavGraphDirections.actionGlobalSavedLoginsAuthFragment()
                         findNavController().navigateBlockingForAsyncNavGraph(directions)
                     }
+                },
+                creditCardPickerView = creditCardSelectBar,
+                onManageCreditCards = {
+                    val directions =
+                        NavGraphDirections.actionGlobalCreditCardsSettingFragment()
+                    findNavController().navigateBlockingForAsyncNavGraph(directions)
+                },
+                onSelectCreditCard = {
+                    showBiometricPrompt(context)
                 }
             ),
             owner = this,
@@ -722,6 +758,66 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Activit
         initializeEngineView(toolbarHeight)
     }
 
+    /**
+     * Shows a biometric prompt and fallback to prompting for the password.
+     */
+    private fun showBiometricPrompt(context: Context) {
+        if (BiometricPromptFeature.canUseFeature(context)) {
+            biometricPromptFeature.get()
+                ?.requestAuthentication(getString(R.string.credit_cards_biometric_prompt_unlock_message))
+            return
+        }
+
+        // Fallback to prompting for password with the KeyguardManager
+        val manager = context.getSystemService<KeyguardManager>()
+        if (manager?.isKeyguardSecure == true) {
+            showPinVerification(manager)
+        } else {
+            // Warn that the device has not been secured
+            if (context.settings().shouldShowSecurityPinWarning) {
+                showPinDialogWarning(context)
+            } else {
+                promptsFeature.get()?.onBiometricResult(isAuthenticated = true)
+            }
+        }
+    }
+
+    /**
+     * Shows a pin request prompt. This is only used when BiometricPrompt is unavailable.
+     */
+    @Suppress("Deprecation")
+    private fun showPinVerification(manager: KeyguardManager) {
+        val intent = manager.createConfirmDeviceCredentialIntent(
+            getString(R.string.credit_cards_biometric_prompt_message_pin),
+            getString(R.string.credit_cards_biometric_prompt_unlock_message)
+        )
+        requireActivity().startActivityForResult(intent, PIN_REQUEST)
+    }
+
+    /**
+     * Shows a dialog warning about setting up a device lock PIN.
+     */
+    private fun showPinDialogWarning(context: Context) {
+        AlertDialog.Builder(context).apply {
+            setTitle(getString(R.string.credit_cards_warning_dialog_title))
+            setMessage(getString(R.string.credit_cards_warning_dialog_message))
+
+            setNegativeButton(getString(R.string.credit_cards_warning_dialog_later)) { _: DialogInterface, _ ->
+                promptsFeature.get()?.onBiometricResult(isAuthenticated = false)
+            }
+
+            setPositiveButton(getString(R.string.credit_cards_warning_dialog_set_up_now)) { it: DialogInterface, _ ->
+                it.dismiss()
+                promptsFeature.get()?.onBiometricResult(isAuthenticated = false)
+                startActivity(Intent(Settings.ACTION_SECURITY_SETTINGS))
+            }
+
+            create()
+        }.show().secure(activity)
+
+        context.settings().incrementSecureWarningCount()
+    }
+
     @VisibleForTesting
     internal fun expandToolbarOnNavigation(store: BrowserStore) {
         consumeFlow(store) { flow ->
@@ -1089,9 +1185,9 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Activit
     private fun showQuickSettingsDialog() {
         val tab = getCurrentTab() ?: return
         viewLifecycleOwner.lifecycleScope.launch(Main) {
-            val sitePermissions: SitePermissions? = tab.content.url.toUri().host?.let { host ->
-                val storage = requireComponents.core.permissionStorage
-                storage.findSitePermissionsBy(host)
+            val sitePermissions: SitePermissions? = tab.content.url.getOrigin()?.let { origin ->
+            val storage = requireComponents.core.permissionStorage
+                storage.findSitePermissionsBy(origin)
             }
 
             view?.let {
diff --git a/app/src/main/java/org/mozilla/fenix/components/AbstractBinding.kt b/app/src/main/java/org/mozilla/fenix/components/AbstractBinding.kt
deleted file mode 100644
index cdc9fc755..000000000
--- a/app/src/main/java/org/mozilla/fenix/components/AbstractBinding.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-/* 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/. */
-
-package org.mozilla.fenix.components
-
-import androidx.annotation.CallSuper
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.cancel
-import kotlinx.coroutines.flow.Flow
-import mozilla.components.lib.state.Action
-import mozilla.components.lib.state.State
-import mozilla.components.lib.state.Store
-import mozilla.components.lib.state.ext.flowScoped
-import mozilla.components.support.base.feature.LifecycleAwareFeature
-
-/**
- * Helper class for creating small binding classes that are responsible for reacting to state
- * changes.
- *
- * Taken with ♥️ from Focus.
- */
-abstract class AbstractBinding<in S : State>(
-    private val store: Store<S, out Action>
-) : LifecycleAwareFeature {
-    private var scope: CoroutineScope? = null
-
-    @OptIn(ExperimentalCoroutinesApi::class)
-    @CallSuper
-    override fun start() {
-        scope = store.flowScoped { flow ->
-            onState(flow)
-        }
-    }
-
-    @CallSuper
-    override fun stop() {
-        scope?.cancel()
-    }
-
-    abstract suspend fun onState(flow: Flow<S>)
-}
diff --git a/app/src/main/java/org/mozilla/fenix/components/Analytics.kt b/app/src/main/java/org/mozilla/fenix/components/Analytics.kt
index dddf03456..d875dd63d 100644
--- a/app/src/main/java/org/mozilla/fenix/components/Analytics.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/Analytics.kt
@@ -17,12 +17,14 @@ import mozilla.components.service.nimbus.NimbusApi
 import mozilla.components.service.nimbus.NimbusDisabled
 import org.mozilla.fenix.BuildConfig
 import org.mozilla.fenix.Config
+import org.mozilla.fenix.FeatureFlags
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
 import org.mozilla.fenix.ReleaseChannel
 import org.mozilla.fenix.components.metrics.AdjustMetricsService
 import org.mozilla.fenix.components.metrics.GleanMetricsService
 import org.mozilla.fenix.components.metrics.MetricController
+import org.mozilla.fenix.experiments.createNimbus
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.perf.lazyMonitored
@@ -90,7 +92,7 @@ class Analytics(
     val metrics: MetricController by lazyMonitored {
         MetricController.create(
             listOf(
-                GleanMetricsService(context, lazy { context.components.core.store }),
+                GleanMetricsService(context),
                 AdjustMetricsService(context as Application)
             ),
             isDataTelemetryEnabled = { context.settings().isTelemetryEnabled },
@@ -100,8 +102,11 @@ class Analytics(
     }
 
     val experiments: NimbusApi by lazyMonitored {
-        // No experiments for Iceraven
-        NimbusDisabled()
+        if (FeatureFlags.nimbusExperiments) {
+            createNimbus(context, BuildConfig.NIMBUS_ENDPOINT)
+        } else {
+            NimbusDisabled()
+        }
     }
 }
 
diff --git a/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt b/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt
index eaa06cedf..d9cc58bad 100644
--- a/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt
@@ -32,9 +32,11 @@ import mozilla.components.service.fxa.manager.SCOPE_SESSION
 import mozilla.components.service.fxa.manager.SCOPE_SYNC
 import mozilla.components.service.fxa.manager.SyncEnginesStorage
 import mozilla.components.service.fxa.sync.GlobalSyncableStoreProvider
+import mozilla.components.service.sync.autofill.AutofillCreditCardsAddressesStorage
 import mozilla.components.service.sync.logins.SyncableLoginsStorage
 import mozilla.components.support.utils.RunWhenReadyQueue
 import org.mozilla.fenix.Config
+import org.mozilla.fenix.FeatureFlags
 import org.mozilla.fenix.R
 import org.mozilla.fenix.perf.StrictModeManager
 import org.mozilla.fenix.components.metrics.Event
@@ -60,6 +62,7 @@ class BackgroundServices(
     bookmarkStorage: Lazy<PlacesBookmarksStorage>,
     passwordsStorage: Lazy<SyncableLoginsStorage>,
     remoteTabsStorage: Lazy<RemoteTabsStorage>,
+    creditCardsStorage: Lazy<AutofillCreditCardsAddressesStorage>,
     strictMode: StrictModeManager
 ) {
     // Allows executing tasks which depend on the account manager, but do not need to eagerly initialize it.
@@ -91,16 +94,33 @@ class BackgroundServices(
 
     @VisibleForTesting
     val supportedEngines =
-        setOf(SyncEngine.History, SyncEngine.Bookmarks, SyncEngine.Passwords, SyncEngine.Tabs)
-    private val syncConfig = SyncConfig(supportedEngines, PeriodicSyncConfig(periodMinutes = 240)) // four hours
+        setOfNotNull(
+            SyncEngine.History,
+            SyncEngine.Bookmarks,
+            SyncEngine.Passwords,
+            SyncEngine.Tabs,
+            SyncEngine.CreditCards,
+            if (FeatureFlags.addressesFeature) SyncEngine.Addresses else null
+        )
+    private val syncConfig =
+        SyncConfig(supportedEngines, PeriodicSyncConfig(periodMinutes = 240)) // four hours
+
+    private val creditCardKeyProvider by lazyMonitored { creditCardsStorage.value.crypto }
 
     init {
-        /* Make the "history", "bookmark", "passwords", and "tabs" stores accessible to workers
-           spawned by the sync manager. */
+        // Make the "history", "bookmark", "passwords", "tabs", "credit cards" stores
+        // accessible to workers spawned by the sync manager.
         GlobalSyncableStoreProvider.configureStore(SyncEngine.History to historyStorage)
         GlobalSyncableStoreProvider.configureStore(SyncEngine.Bookmarks to bookmarkStorage)
         GlobalSyncableStoreProvider.configureStore(SyncEngine.Passwords to passwordsStorage)
         GlobalSyncableStoreProvider.configureStore(SyncEngine.Tabs to remoteTabsStorage)
+        GlobalSyncableStoreProvider.configureStore(
+            storePair = SyncEngine.CreditCards to creditCardsStorage,
+            keyProvider = lazy { creditCardKeyProvider }
+        )
+        if (FeatureFlags.addressesFeature) {
+            GlobalSyncableStoreProvider.configureStore(SyncEngine.Addresses to creditCardsStorage)
+        }
     }
 
     private val telemetryAccountObserver = TelemetryAccountObserver(
@@ -188,6 +208,7 @@ internal class TelemetryAccountObserver(
     private val metricController: MetricController
 ) : AccountObserver {
     override fun onAuthenticated(account: OAuthAccount, authType: AuthType) {
+        settings.signedInFxaAccount = true
         when (authType) {
             // User signed-in into an existing FxA account.
             AuthType.Signin -> Event.SyncAuthSignIn
@@ -220,5 +241,6 @@ internal class TelemetryAccountObserver(
 
     override fun onLoggedOut() {
         metricController.track(Event.SyncAuthSignOut)
+        settings.signedInFxaAccount = false
     }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/components/Components.kt b/app/src/main/java/org/mozilla/fenix/components/Components.kt
index a9e973a3c..c0073fff9 100644
--- a/app/src/main/java/org/mozilla/fenix/components/Components.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/Components.kt
@@ -23,6 +23,7 @@ import org.mozilla.fenix.BuildConfig
 import org.mozilla.fenix.Config
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
+import org.mozilla.fenix.autofill.AutofillConfirmActivity
 import org.mozilla.fenix.autofill.AutofillUnlockActivity
 import org.mozilla.fenix.components.metrics.AppStartupTelemetry
 import org.mozilla.fenix.ext.components
@@ -58,6 +59,7 @@ class Components(private val context: Context) {
             core.lazyBookmarksStorage,
             core.lazyPasswordsStorage,
             core.lazyRemoteTabsStorage,
+            core.lazyAutofillStorage,
             strictMode
         )
     }
@@ -172,7 +174,7 @@ class Components(private val context: Context) {
             storage = core.passwordsStorage,
             publicSuffixList = publicSuffixList,
             unlockActivity = AutofillUnlockActivity::class.java,
-            confirmActivity = AutofillConfiguration::class.java,
+            confirmActivity = AutofillConfirmActivity::class.java,
             applicationName = context.getString(R.string.app_name),
             httpClient = core.client
         )
diff --git a/app/src/main/java/org/mozilla/fenix/components/Core.kt b/app/src/main/java/org/mozilla/fenix/components/Core.kt
index 837d00ee4..c18624e34 100644
--- a/app/src/main/java/org/mozilla/fenix/components/Core.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/Core.kt
@@ -4,7 +4,7 @@
 
 package org.mozilla.fenix.components
 
-import GeckoProvider
+import org.mozilla.fenix.gecko.GeckoProvider
 import android.content.Context
 import android.content.res.Configuration
 import android.os.Build
@@ -108,6 +108,7 @@ class Core(
             suspendMediaWhenInactive = false,
             forceUserScalableContent = context.settings().forceEnableZoom,
             loginAutofillEnabled = context.settings().shouldAutofillLogins,
+            enterpriseRootsEnabled = context.settings().allowThirdPartyRootCerts,
             clearColor = ContextCompat.getColor(
                 context,
                 R.color.foundation_normal_theme
@@ -119,6 +120,7 @@ class Core(
             defaultSettings,
             GeckoProvider.getOrCreateRuntime(
                 context,
+                lazyAutofillStorage,
                 lazyPasswordsStorage,
                 trackingProtectionPolicyFactory.createTrackingProtectionPolicy()
             )
@@ -154,6 +156,7 @@ class Core(
             context,
             GeckoProvider.getOrCreateRuntime(
                 context,
+                lazyAutofillStorage,
                 lazyPasswordsStorage,
                 trackingProtectionPolicyFactory.createTrackingProtectionPolicy()
             )
@@ -291,7 +294,7 @@ class Core(
     val lazyHistoryStorage = lazyMonitored { PlacesHistoryStorage(context, crashReporter) }
     val lazyBookmarksStorage = lazyMonitored { PlacesBookmarksStorage(context) }
     val lazyPasswordsStorage = lazyMonitored { SyncableLoginsStorage(context, passwordsEncryptionKey) }
-    val lazyAutofillStorage = lazyMonitored { AutofillCreditCardsAddressesStorage(context) }
+    val lazyAutofillStorage = lazyMonitored { AutofillCreditCardsAddressesStorage(context, lazySecurePrefs) }
 
     /**
      * The storage component to sync and persist tabs in a Firefox Sync account.
@@ -390,6 +393,7 @@ class Core(
      * Shared Preferences that encrypt/decrypt using Android KeyStore and lib-dataprotect for 23+
      * only on Nightly/Debug for now, otherwise simply stored.
      * See https://github.com/mozilla-mobile/fenix/issues/8324
+     * Also, this needs revision. See https://github.com/mozilla-mobile/fenix/issues/19155
      */
     private fun getSecureAbove22Preferences() =
         SecureAbove22Preferences(
@@ -398,6 +402,9 @@ class Core(
             forceInsecure = !Config.channel.isNightlyOrDebug
         )
 
+    // Temporary. See https://github.com/mozilla-mobile/fenix/issues/19155
+    private val lazySecurePrefs = lazyMonitored { getSecureAbove22Preferences() }
+
     private val passwordsEncryptionKey by lazyMonitored {
         getSecureAbove22Preferences().getString(PASSWORDS_KEY)
             ?: generateEncryptionKey(KEY_STRENGTH).also {
diff --git a/app/src/main/java/org/mozilla/fenix/components/UseCases.kt b/app/src/main/java/org/mozilla/fenix/components/UseCases.kt
index bd9a4fb21..849a3a973 100644
--- a/app/src/main/java/org/mozilla/fenix/components/UseCases.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/UseCases.kt
@@ -15,7 +15,6 @@ import mozilla.components.feature.downloads.DownloadsUseCases
 import mozilla.components.feature.pwa.WebAppShortcutManager
 import mozilla.components.feature.pwa.WebAppUseCases
 import mozilla.components.feature.search.SearchUseCases
-import mozilla.components.feature.search.ext.toDefaultSearchEngineProvider
 import mozilla.components.feature.session.SessionUseCases
 import mozilla.components.feature.session.SettingsUseCases
 import mozilla.components.feature.session.TrackingProtectionUseCases
@@ -66,7 +65,6 @@ class UseCases(
     val searchUseCases by lazyMonitored {
         SearchUseCases(
             store,
-            store.toDefaultSearchEngineProvider(),
             tabsUseCases
         )
     }
diff --git a/app/src/main/java/org/mozilla/fenix/components/metrics/GleanMetricsService.kt b/app/src/main/java/org/mozilla/fenix/components/metrics/GleanMetricsService.kt
index 7eb8ee48b..74f49ccfa 100644
--- a/app/src/main/java/org/mozilla/fenix/components/metrics/GleanMetricsService.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/metrics/GleanMetricsService.kt
@@ -5,10 +5,6 @@
 package org.mozilla.fenix.components.metrics
 
 import android.content.Context
-import mozilla.components.browser.state.store.BrowserStore
-import mozilla.components.feature.search.ext.legacy
-import mozilla.components.feature.search.ext.waitForSelectedOrDefaultSearchEngine
-import mozilla.components.service.fxa.manager.SyncEnginesStorage
 import mozilla.components.service.glean.Glean
 import mozilla.components.service.glean.private.NoExtraKeys
 import mozilla.components.support.base.log.logger.Logger
@@ -46,12 +42,10 @@ import org.mozilla.fenix.GleanMetrics.Metrics
 import org.mozilla.fenix.GleanMetrics.Onboarding
 import org.mozilla.fenix.GleanMetrics.Pings
 import org.mozilla.fenix.GleanMetrics.Pocket
-import org.mozilla.fenix.GleanMetrics.Preferences
 import org.mozilla.fenix.GleanMetrics.PrivateBrowsingMode
 import org.mozilla.fenix.GleanMetrics.PrivateBrowsingShortcut
 import org.mozilla.fenix.GleanMetrics.ProgressiveWebApp
 import org.mozilla.fenix.GleanMetrics.ReaderMode
-import org.mozilla.fenix.GleanMetrics.SearchDefaultEngine
 import org.mozilla.fenix.GleanMetrics.SearchShortcuts
 import org.mozilla.fenix.GleanMetrics.SearchSuggestions
 import org.mozilla.fenix.GleanMetrics.SearchWidget
@@ -70,11 +64,7 @@ import org.mozilla.fenix.GleanMetrics.TopSites
 import org.mozilla.fenix.GleanMetrics.TrackingProtection
 import org.mozilla.fenix.GleanMetrics.UserSpecifiedSearchEngines
 import org.mozilla.fenix.GleanMetrics.VoiceSearch
-import org.mozilla.fenix.components.toolbar.ToolbarPosition
 import org.mozilla.fenix.ext.components
-import org.mozilla.fenix.ext.settings
-import org.mozilla.fenix.utils.BrowsersCache
-import org.mozilla.fenix.utils.Settings
 
 private class EventWrapper<T : Enum<T>>(
     private val recorder: ((Map<T, String>?) -> Unit),
@@ -855,11 +845,11 @@ private val Event.wrapper: EventWrapper<*>?
         is Event.SyncAuthFromSharedReuse, Event.SyncAuthFromSharedCopy -> null
     }
 
+/**
+ * Service responsible for sending the activation and installation pings.
+ */
 class GleanMetricsService(
-    private val context: Context,
-    private val store: Lazy<BrowserStore>,
-    private val browsersCache: BrowsersCache = BrowsersCache,
-    private val mozillaProductDetector: MozillaProductDetector = MozillaProductDetector
+    private val context: Context
 ) : MetricsService {
     override val type = MetricServiceType.Data
 
@@ -887,181 +877,11 @@ class GleanMetricsService(
             // can handle events being recorded before it's initialized.
             Glean.registerPings(Pings)
 
-            // setStartupMetrics is not a fast function. It does not need to be done before we can consider
-            // ourselves initialized. So, let's do it, well, later.
-            setStartupMetrics(context.settings())
-        }
-    }
-
-    /**
-     * This function is called before the metrics ping is sent.  Part of this function depends on
-     * shared preferences to be updated so the correct value is sent with the metrics ping.
-     *
-     * The reason we're using shared preferences to track some of these values is due to the
-     * limitations of the metrics ping.  Events are only sent in a metrics ping if the user have made
-     * changes between each ping.  However, in some cases we want current values to be sent even if
-     * the user have not changed anything between pings.
-     */
-    internal fun setStartupMetrics(settings: Settings) {
-        setPreferenceMetrics()
-        with(Metrics) {
-            defaultBrowser.set(browsersCache.all(context).isDefaultBrowser)
-            mozillaProductDetector.getMozillaBrowserDefault(context)?.also {
-                defaultMozBrowser.set(it)
-            }
-
-            mozillaProducts.set(mozillaProductDetector.getInstalledMozillaProducts(context))
-
-            adjustCampaign.set(settings.adjustCampaignId)
-            adjustAdGroup.set(settings.adjustAdGroup)
-            adjustCreative.set(settings.adjustCreative)
-            adjustNetwork.set(settings.adjustNetwork)
-
-            searchWidgetInstalled.set(settings.searchWidgetInstalled)
-
-            val openTabsCount = settings.openTabsCount
-            hasOpenTabs.set(openTabsCount > 0)
-            if (openTabsCount > 0) {
-                tabsOpenCount.add(openTabsCount)
-            }
-
-            val topSitesSize = settings.topSitesSize
-            hasTopSites.set(topSitesSize > 0)
-            if (topSitesSize > 0) {
-                topSitesCount.add(topSitesSize)
-            }
-
-            val installedAddonSize = settings.installedAddonsCount
-            Addons.hasInstalledAddons.set(installedAddonSize > 0)
-            if (installedAddonSize > 0) {
-                Addons.installedAddons.set(settings.installedAddonsList.split(','))
-            }
-
-            val enabledAddonSize = settings.enabledAddonsCount
-            Addons.hasEnabledAddons.set(enabledAddonSize > 0)
-            if (enabledAddonSize > 0) {
-                Addons.enabledAddons.set(settings.enabledAddonsList.split(','))
-            }
-
-            val desktopBookmarksSize = settings.desktopBookmarksSize
-            hasDesktopBookmarks.set(desktopBookmarksSize > 0)
-            if (desktopBookmarksSize > 0) {
-                desktopBookmarksCount.add(desktopBookmarksSize)
-            }
-
-            val mobileBookmarksSize = settings.mobileBookmarksSize
-            hasMobileBookmarks.set(mobileBookmarksSize > 0)
-            if (mobileBookmarksSize > 0) {
-                mobileBookmarksCount.add(mobileBookmarksSize)
-            }
-
-            toolbarPosition.set(
-                when (settings.toolbarPosition) {
-                    ToolbarPosition.BOTTOM -> Event.ToolbarPositionChanged.Position.BOTTOM.name
-                    ToolbarPosition.TOP -> Event.ToolbarPositionChanged.Position.TOP.name
-                }
-            )
-
-            tabViewSetting.set(settings.getTabViewPingString())
-            closeTabSetting.set(settings.getTabTimeoutPingString())
-        }
-
-        store.value.waitForSelectedOrDefaultSearchEngine { searchEngine ->
-            if (searchEngine != null) {
-                SearchDefaultEngine.apply {
-                    code.set(searchEngine.id)
-                    name.set(searchEngine.name)
-                    submissionUrl.set(searchEngine.legacy().buildSearchUrl(""))
-                }
-            }
-
             activationPing.checkAndSend()
             installationPing.checkAndSend()
         }
     }
 
-    private fun setPreferenceMetrics() {
-        // We purposefully make all of our preferences the string_list format to make data analysis
-        // simpler. While it makes things like booleans a bit more complicated, it means all our
-        // preferences can be analyzed with the same dashboard and compared.
-        with(Preferences) {
-            showSearchSuggestions.set(context.settings().shouldShowSearchSuggestions.toStringList())
-            remoteDebugging.set(context.settings().isRemoteDebuggingEnabled.toStringList())
-            telemetry.set(context.settings().isTelemetryEnabled.toStringList())
-            searchBrowsingHistory.set(context.settings().shouldShowHistorySuggestions.toStringList())
-            searchBookmarks.set(context.settings().shouldShowBookmarkSuggestions.toStringList())
-            showClipboardSuggestions.set(context.settings().shouldShowClipboardSuggestions.toStringList())
-            showSearchShortcuts.set(context.settings().shouldShowSearchShortcuts.toStringList())
-            openLinksInAPrivateTab.set(context.settings().openLinksInAPrivateTab.toStringList())
-            searchSuggestionsPrivate.set(context.settings().shouldShowSearchSuggestionsInPrivate.toStringList())
-            showVoiceSearch.set(context.settings().shouldShowVoiceSearch.toStringList())
-            openLinksInApp.set(context.settings().openLinksInExternalApp.toStringList())
-
-            val isLoggedIn =
-                context.components.backgroundServices.accountManager.accountProfile() != null
-            sync.set(isLoggedIn.toStringList())
-
-            val syncedItems = SyncEnginesStorage(context).getStatus().entries.filter {
-                it.value
-            }.map { it.key.nativeName }
-
-            syncItems.set(syncedItems)
-
-            val toolbarPositionSelection =
-                if (context.settings().shouldUseFixedTopToolbar) {
-                    "fixed_top"
-                } else if (context.settings().shouldUseBottomToolbar) {
-                    "bottom"
-                } else {
-                    "top"
-                }
-
-            toolbarPosition.set(listOf(toolbarPositionSelection))
-
-            val etpSelection =
-                if (!context.settings().shouldUseTrackingProtection) {
-                    ""
-                } else if (context.settings().useStandardTrackingProtection) {
-                    "standard"
-                } else if (context.settings().useStrictTrackingProtection) {
-                    "strict"
-                } else if (context.settings().useCustomTrackingProtection) {
-                    "custom"
-                } else {
-                    ""
-                }
-
-            trackingProtection.set(listOf(etpSelection))
-
-            val accessibilitySelection = mutableListOf<String>()
-
-            if (context.settings().switchServiceIsEnabled) {
-                accessibilitySelection.add("switch")
-            }
-
-            if (context.settings().touchExplorationIsEnabled) {
-                accessibilitySelection.add("touch exploration")
-            }
-
-            accessibilityServices.set(accessibilitySelection.toList())
-
-            val themeSelection =
-                if (context.settings().shouldUseLightTheme) {
-                    "light"
-                } else if (context.settings().shouldUseDarkTheme) {
-                    "dark"
-                } else if (context.settings().shouldFollowDeviceTheme) {
-                    "system"
-                } else if (context.settings().shouldUseAutoBatteryTheme) {
-                    "battery"
-                } else {
-                    ""
-                }
-
-            theme.set(listOf(themeSelection))
-        }
-    }
-
     override fun stop() {
         Glean.setUploadEnabled(false)
     }
diff --git a/app/src/main/java/org/mozilla/fenix/components/metrics/MetricController.kt b/app/src/main/java/org/mozilla/fenix/components/metrics/MetricController.kt
index f10182b46..c38ebb62d 100644
--- a/app/src/main/java/org/mozilla/fenix/components/metrics/MetricController.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/metrics/MetricController.kt
@@ -20,7 +20,8 @@ import mozilla.components.feature.customtabs.CustomTabsFacts
 import mozilla.components.feature.downloads.facts.DownloadsFacts
 import mozilla.components.feature.findinpage.facts.FindInPageFacts
 import mozilla.components.feature.media.facts.MediaFacts
-import mozilla.components.feature.prompts.dialog.LoginDialogFacts
+import mozilla.components.feature.prompts.facts.LoginDialogFacts
+import mozilla.components.feature.prompts.facts.CreditCardAutofillDialogFacts
 import mozilla.components.feature.pwa.ProgressiveWebAppFacts
 import mozilla.components.feature.syncedtabs.facts.SyncedTabsFacts
 import mozilla.components.feature.top.sites.facts.TopSitesFacts
@@ -161,6 +162,10 @@ internal class ReleaseMetricController(
         Component.FEATURE_PROMPTS to LoginDialogFacts.Items.CANCEL -> Event.LoginDialogPromptCancelled
         Component.FEATURE_PROMPTS to LoginDialogFacts.Items.NEVER_SAVE -> Event.LoginDialogPromptNeverSave
         Component.FEATURE_PROMPTS to LoginDialogFacts.Items.SAVE -> Event.LoginDialogPromptSave
+        Component.FEATURE_PROMPTS to CreditCardAutofillDialogFacts.Items.AUTOFILL_CREDIT_CARD_SUCCESS -> {
+            settings.creditCardsAutofilledCount += 1
+            null
+        }
 
         Component.FEATURE_FINDINPAGE to FindInPageFacts.Items.CLOSE -> Event.FindInPageClosed
         Component.FEATURE_FINDINPAGE to FindInPageFacts.Items.INPUT -> Event.FindInPageSearchCommitted
@@ -223,7 +228,7 @@ internal class ReleaseMetricController(
             metadata?.get("enabled")?.let { enabledAddons ->
                 if (enabledAddons is List<*>) {
                     settings.enabledAddonsCount = enabledAddons.size
-                    settings.enabledAddonsList = enabledAddons.joinToString()
+                    settings.enabledAddonsList = enabledAddons.joinToString(",")
                 }
             }
 
diff --git a/app/src/main/java/org/mozilla/fenix/components/metrics/SecurePrefsTelemetry.kt b/app/src/main/java/org/mozilla/fenix/components/metrics/SecurePrefsTelemetry.kt
index 47a34497a..c88841f16 100644
--- a/app/src/main/java/org/mozilla/fenix/components/metrics/SecurePrefsTelemetry.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/metrics/SecurePrefsTelemetry.kt
@@ -9,7 +9,7 @@ import android.os.Build
 import mozilla.components.lib.dataprotect.SecurePrefsReliabilityExperiment
 import mozilla.components.service.nimbus.NimbusApi
 import org.mozilla.fenix.experiments.ExperimentBranch
-import org.mozilla.fenix.experiments.Experiments
+import org.mozilla.fenix.experiments.FeatureId
 import org.mozilla.fenix.ext.withExperiment
 
 /**
@@ -24,7 +24,7 @@ class SecurePrefsTelemetry(
         // The Android Keystore is used to secure the shared prefs only on API 23+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             // These tests should run only if the experiment is live
-            experiments.withExperiment(Experiments.ANDROID_KEYSTORE) { experimentBranch ->
+            experiments.withExperiment(FeatureId.ANDROID_KEYSTORE) { experimentBranch ->
                 // .. and this device is not in the control group.
                 if (experimentBranch == ExperimentBranch.TREATMENT) {
                         SecurePrefsReliabilityExperiment(appContext)()
diff --git a/app/src/main/java/org/mozilla/fenix/components/search/SearchMigration.kt b/app/src/main/java/org/mozilla/fenix/components/search/SearchMigration.kt
index 9d421a82d..acd789d53 100644
--- a/app/src/main/java/org/mozilla/fenix/components/search/SearchMigration.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/search/SearchMigration.kt
@@ -6,9 +6,8 @@ package org.mozilla.fenix.components.search
 
 import android.content.Context
 import android.content.SharedPreferences
-import mozilla.components.browser.search.SearchEngineParser
 import mozilla.components.browser.state.search.SearchEngine
-import mozilla.components.feature.search.ext.migrate
+import mozilla.components.feature.search.ext.parseLegacySearchEngine
 import mozilla.components.feature.search.middleware.SearchMiddleware
 import org.mozilla.fenix.ext.components
 import org.xmlpull.v1.XmlPullParserException
@@ -50,18 +49,17 @@ internal class SearchMigration(
     ): List<SearchEngine> {
         val ids = preferences.getStringSet(PREF_KEY_CUSTOM_SEARCH_ENGINES, emptySet()) ?: emptySet()
 
-        val parser = SearchEngineParser()
-
         return ids.mapNotNull { id ->
             val xml = preferences.getString(id, null)
-            parser.loadSafely(id, xml?.byteInputStream()?.buffered())
+            loadSafely(id, xml?.byteInputStream()?.buffered())
         }
     }
 }
 
-private fun SearchEngineParser.loadSafely(id: String, stream: BufferedInputStream?): SearchEngine? {
+@Suppress("DEPRECATION")
+private fun loadSafely(id: String, stream: BufferedInputStream?): SearchEngine? {
     return try {
-        stream?.let { load(id, it).migrate() }
+        stream?.let { parseLegacySearchEngine(id, it) }
     } catch (e: IOException) {
         null
     } catch (e: XmlPullParserException) {
diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
index a4b4737b8..0cf53913a 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
@@ -41,7 +41,7 @@ import org.mozilla.fenix.R
 import org.mozilla.fenix.browser.browsingmode.BrowsingMode
 import org.mozilla.fenix.components.accounts.FenixAccountManager
 import org.mozilla.fenix.experiments.ExperimentBranch
-import org.mozilla.fenix.experiments.Experiments
+import org.mozilla.fenix.experiments.FeatureId
 import org.mozilla.fenix.ext.asActivity
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.settings
@@ -632,7 +632,7 @@ open class DefaultToolbarMenu(
         val experiments = context.components.analytics.experiments
         val browsers = BrowsersCache.all(context)
 
-        return experiments.withExperiment(Experiments.DEFAULT_BROWSER) { experimentBranch ->
+        return experiments.withExperiment(FeatureId.DEFAULT_BROWSER) { experimentBranch ->
             if (experimentBranch == ExperimentBranch.DEFAULT_BROWSER_TOOLBAR_MENU &&
                 !browsers.isFirefoxDefaultBrowser
             ) {
diff --git a/app/src/main/java/org/mozilla/fenix/downloads/DynamicDownloadDialog.kt b/app/src/main/java/org/mozilla/fenix/downloads/DynamicDownloadDialog.kt
index 8f2b4fa39..df3fd5513 100644
--- a/app/src/main/java/org/mozilla/fenix/downloads/DynamicDownloadDialog.kt
+++ b/app/src/main/java/org/mozilla/fenix/downloads/DynamicDownloadDialog.kt
@@ -106,9 +106,8 @@ class DynamicDownloadDialog(
                     metrics.track(Event.DownloadsItemOpened)
 
                     val fileWasOpened = AbstractFetchDownloadService.openFile(
-                        context = context,
-                        contentType = downloadState.contentType,
-                        filePath = downloadState.filePath
+                        applicationContext = context.applicationContext,
+                        download = downloadState
                     )
 
                     if (!fileWasOpened) {
diff --git a/app/src/main/java/org/mozilla/fenix/experiments/Experiments.kt b/app/src/main/java/org/mozilla/fenix/experiments/Experiments.kt
index 92808c5ff..6f83567f3 100644
--- a/app/src/main/java/org/mozilla/fenix/experiments/Experiments.kt
+++ b/app/src/main/java/org/mozilla/fenix/experiments/Experiments.kt
@@ -4,14 +4,23 @@
 
 package org.mozilla.fenix.experiments
 
-class Experiments {
-    companion object {
-        const val A_A_NIMBUS_VALIDATION = "fenix-nimbus-validation-v3"
-        const val ANDROID_KEYSTORE = "fenix-android-keystore"
-        const val DEFAULT_BROWSER = "fenix-default-browser"
-    }
+/**
+ * Enums to identify features in the app. These will likely grow and shrink depending
+ * on the experiments we want to perform.
+ *
+ * @property jsonName the kebab-case version of the feature id as represented in the Nimbus
+ * experiment JSON.
+ */
+enum class FeatureId(val jsonName: String) {
+    NIMBUS_VALIDATION("nimbus-validation"),
+    ANDROID_KEYSTORE("fenix-android-keystore"),
+    DEFAULT_BROWSER("fenix-default-browser")
 }
 
+/**
+ * Experiment branches are becoming less interesting, though we collect some well
+ * defined ones here.
+ */
 class ExperimentBranch {
     companion object {
         const val TREATMENT = "treatment"
diff --git a/app/src/main/java/org/mozilla/fenix/experiments/NimbusSetup.kt b/app/src/main/java/org/mozilla/fenix/experiments/NimbusSetup.kt
index 4362056cc..9933439e7 100644
--- a/app/src/main/java/org/mozilla/fenix/experiments/NimbusSetup.kt
+++ b/app/src/main/java/org/mozilla/fenix/experiments/NimbusSetup.kt
@@ -15,6 +15,7 @@ import mozilla.components.service.nimbus.NimbusDisabled
 import mozilla.components.service.nimbus.NimbusServerSettings
 import mozilla.components.support.base.log.logger.Logger
 import org.mozilla.fenix.BuildConfig
+import org.mozilla.fenix.R
 import org.mozilla.fenix.components.isSentryEnabled
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.settings
@@ -66,6 +67,10 @@ fun createNimbus(context: Context, url: String?): NimbusApi =
                 globalUserParticipation = enabled
             }
 
+            if (url.isNullOrBlank()) {
+                setExperimentsLocally(R.raw.initial_experiments)
+            }
+
             // We may have downloaded experiments on a previous run, so let's start using them
             // now. We didn't do this earlier, so as to make getExperimentBranch and friends returns
             // the same thing throughout the session. This call does its work on the db thread.
diff --git a/app/src/main/java/org/mozilla/fenix/ext/Activity.kt b/app/src/main/java/org/mozilla/fenix/ext/Activity.kt
index 6469a4c88..f38afd406 100644
--- a/app/src/main/java/org/mozilla/fenix/ext/Activity.kt
+++ b/app/src/main/java/org/mozilla/fenix/ext/Activity.kt
@@ -12,9 +12,12 @@ import android.app.role.RoleManager
 import android.content.Intent
 import android.os.Build
 import android.provider.Settings
+import androidx.annotation.DrawableRes
+import androidx.appcompat.app.AppCompatActivity
 import androidx.core.os.bundleOf
 import org.mozilla.fenix.BrowserDirection
 import org.mozilla.fenix.HomeActivity
+import org.mozilla.fenix.R
 import org.mozilla.fenix.settings.SupportUtils
 
 /**
@@ -108,6 +111,20 @@ private fun Activity.navigateToDefaultBrowserAppsSettings() {
     }
 }
 
+/**
+ * Sets the icon for the back (up) navigation button.
+ * @param icon The resource id of the icon.
+ */
+fun Activity.setNavigationIcon(
+    @DrawableRes icon: Int
+) {
+    (this as? AppCompatActivity)?.supportActionBar?.let {
+        it.setDisplayHomeAsUpEnabled(true)
+        it.setHomeAsUpIndicator(icon)
+        it.setHomeActionContentDescription(R.string.action_bar_up_description)
+    }
+}
+
 const val REQUEST_CODE_BROWSER_ROLE = 1
 const val SETTINGS_SELECT_OPTION_KEY = ":settings:fragment_args_key"
 const val SETTINGS_SHOW_FRAGMENT_ARGS = ":settings:show_fragment_args"
diff --git a/app/src/main/java/org/mozilla/fenix/ext/Fragment.kt b/app/src/main/java/org/mozilla/fenix/ext/Fragment.kt
index 1eb2cb27b..2d08a0bd8 100644
--- a/app/src/main/java/org/mozilla/fenix/ext/Fragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/ext/Fragment.kt
@@ -4,6 +4,7 @@
 
 package org.mozilla.fenix.ext
 
+import android.view.WindowManager
 import androidx.annotation.IdRes
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AppCompatActivity
@@ -35,6 +36,7 @@ fun Fragment.getPreferenceKey(@StringRes resourceId: Int): String = getString(re
  */
 fun Fragment.showToolbar(title: String) {
     (requireActivity() as AppCompatActivity).title = title
+    activity?.setNavigationIcon(R.drawable.ic_back_button)
     (activity as NavHostActivity).getSupportActionBarAndInflateIfNecessary().show()
 }
 
@@ -58,15 +60,29 @@ fun Fragment.hideToolbar() {
 }
 
 /**
- * Pops the backstack to force users to re-auth if they put the app in the background and return to it
- * while being inside the saved logins flow
- *
- * Does nothing if the user is currently navigating to any of the [destinations] given as a parameter
+ * Pops the backstack to force users to re-auth if they put the app in the background and return to
+ * it while being inside a secured flow (e.g. logins or credit cards).
  *
+ * Does nothing if the user is currently navigating to any of the [destinations] given as a
+ * parameter.
  */
-fun Fragment.redirectToReAuth(destinations: List<Int>, currentDestination: Int?) {
+fun Fragment.redirectToReAuth(
+    destinations: List<Int>,
+    currentDestination: Int?,
+    currentLocation: Int
+) {
     if (currentDestination !in destinations) {
-        findNavController().popBackStack(R.id.savedLoginsAuthFragment, false)
+        when (currentLocation) {
+            R.id.loginDetailFragment,
+            R.id.editLoginFragment,
+            R.id.savedLoginsFragment -> {
+                findNavController().popBackStack(R.id.savedLoginsAuthFragment, false)
+            }
+            R.id.creditCardEditorFragment,
+            R.id.creditCardsManagementFragment -> {
+                findNavController().popBackStack(R.id.creditCardsSettingFragment, false)
+            }
+        }
     }
 }
 
@@ -89,3 +105,21 @@ fun Fragment.breadcrumb(
         )
     )
 }
+
+/**
+ * Sets the [WindowManager.LayoutParams.FLAG_SECURE] flag for the current activity window.
+ */
+fun Fragment.secure() {
+    this.activity?.window?.addFlags(
+        WindowManager.LayoutParams.FLAG_SECURE
+    )
+}
+
+/**
+ * Clears the [WindowManager.LayoutParams.FLAG_SECURE] flag for the current activity window.
+ */
+fun Fragment.removeSecure() {
+    this.activity?.window?.clearFlags(
+        WindowManager.LayoutParams.FLAG_SECURE
+    )
+}
diff --git a/app/src/main/java/org/mozilla/fenix/ext/Nimbus.kt b/app/src/main/java/org/mozilla/fenix/ext/Nimbus.kt
index e1ab7fa39..a218be948 100644
--- a/app/src/main/java/org/mozilla/fenix/ext/Nimbus.kt
+++ b/app/src/main/java/org/mozilla/fenix/ext/Nimbus.kt
@@ -6,37 +6,105 @@ package org.mozilla.fenix.ext
 
 import mozilla.components.service.nimbus.NimbusApi
 import mozilla.components.support.base.log.logger.Logger
-import org.mozilla.fenix.FeatureFlags
+import org.mozilla.experiments.nimbus.Variables
+import org.mozilla.fenix.experiments.FeatureId
 
 /**
- * Gets the branch of the given `experimentId` and transforms it with given closure.
+ * Gets the branch name of an experiment acting on the feature given `featureId`, and transforms it
+ * with given closure.
  *
- * If we're enrolled in the experiment, the transform is passed the branch id/slug as a `String`.
+ * You are probably looking for `withVariables`.
+ *
+ * If we're enrolled in an experiment, the transform is passed the branch id/slug as a `String`.
  *
  * If we're not enrolled in the experiment, or the experiment is not valid then the transform
  * is passed a `null`.
  */
+fun <T> NimbusApi.withExperiment(featureId: FeatureId, transform: (String?) -> T): T {
+    return transform(withExperiment(featureId))
+}
+
+/**
+ * The synonym for [getExperimentBranch] to complement [withExperiment(String, (String?) -> T))].
+ *
+ * Short-hand for ` org.mozilla.experiments.nimbus.NimbusApi.getExperimentBranch`.
+ */
 @Suppress("TooGenericExceptionCaught")
-fun <T> NimbusApi.withExperiment(experimentId: String, transform: (String?) -> T): T {
-    val branch = if (FeatureFlags.nimbusExperiments) {
-        try {
-            getExperimentBranch(experimentId)
-        } catch (e: Throwable) {
-            Logger.error("Failed to getExperimentBranch($experimentId)", e)
-            null
-        }
-    } else {
+fun NimbusApi.withExperiment(featureId: FeatureId) =
+    try {
+        getExperimentBranch(featureId.jsonName)
+    } catch (e: Throwable) {
+        Logger.error("Failed to getExperimentBranch(${featureId.jsonName})", e)
         null
     }
-    return transform(branch)
-}
 
 /**
- * The degenerate case of `withExperiment(String, (String?) -> T))`, with an identity transform.
+ * Get the variables needed to configure the feature given by `featureId`.
+ *
+ * @param featureId The feature id that identifies the feature under experiment.
+ *
+ * @param sendExposureEvent Passing `true` to this parameter will record the exposure event
+ *      automatically if the client is enrolled in an experiment for the given [featureId].
+ *      Passing `false` here indicates that the application will manually record the exposure
+ *      event by calling the `sendExposureEvent` function at the time of the exposure to the
+ *      feature.
+ *
+ * See [sendExposureEvent] for more information on manually recording the event.
+ *
+ * @return a [Variables] object used to configure the feature.
+ */
+fun NimbusApi.getVariables(featureId: FeatureId, sendExposureEvent: Boolean = true) =
+    getVariables(featureId.jsonName, sendExposureEvent)
+
+/**
+ * A synonym for `getVariables(featureId, sendExposureEvent)`.
+ *
+ * This exists as a complement to the `withVariable(featureId, sendExposureEvent, transform)` method.
  *
- * Short-hand for `mozilla.components.service.nimbus.NimbusApi.getExperimentBranch`.
+ * @param featureId the id of the feature as it appears in `Experimenter`
+ * @param sendExposureEvent by default `true`. This logs an event that the user was exposed to an experiment
+ *      involving this feature.
+ * @return a `Variables` object providing typed accessors to a remotely configured JSON object.
  */
-fun NimbusApi.withExperiment(experimentId: String) =
-    this.withExperiment(experimentId, ::identity)
+fun NimbusApi.withVariables(featureId: FeatureId, sendExposureEvent: Boolean = true) =
+    getVariables(featureId, sendExposureEvent)
 
-private fun <T> identity(value: T) = value
+/**
+ * Get a `Variables` object for this feature and use that to configure the feature itself or a
+ * more type safe configuration object.
+ *
+ * @param featureId the id of the feature as it appears in `Experimenter`
+ * @param sendExposureEvent by default `true`. This logs an event that the user was exposed to an experiment
+ *      involving this feature.
+ */
+fun <T> NimbusApi.withVariables(featureId: FeatureId, sendExposureEvent: Boolean = true, transform: (Variables) -> T) =
+    transform(getVariables(featureId, sendExposureEvent))
+
+/**
+ * Records the `exposure` event in telemetry.
+ *
+ * This is a manual function to accomplish the same purpose as passing `true` as the
+ * `sendExposureEvent` property of the `getVariables` function. It is intended to be used
+ * when requesting feature variables must occur at a different time than the actual user's
+ * exposure to the feature within the app.
+ *
+ * - Examples:
+ *     - If the `Variables` are needed at a different time than when the exposure to the feature
+ *         actually happens, such as constructing a menu happening at a different time than the
+ *         user seeing the menu.
+ *     - If `getVariables` is required to be called multiple times for the same feature and it is
+ *         desired to only record the exposure once, such as if `getVariables` were called
+ *         with every keystroke.
+ *
+ * In the case where the use of this function is required, then the `getVariables` function
+ * should be called with `false` so that the exposure event is not recorded when the variables
+ * are fetched.
+ *
+ * This function is safe to call even when there is no active experiment for the feature. The SDK
+ * will ensure that an event is only recorded for active experiments.
+ *
+ *  @param featureId string representing the id of the feature for which to record the exposure
+ *     event.
+ */
+fun NimbusApi.recordExposureEvent(featureId: FeatureId) =
+    recordExposureEvent(featureId.jsonName)
diff --git a/app/src/geckoBeta/java/org/mozilla/fenix/engine/GeckoProvider.kt b/app/src/main/java/org/mozilla/fenix/gecko/GeckoProvider.kt
similarity index 77%
rename from app/src/geckoBeta/java/org/mozilla/fenix/engine/GeckoProvider.kt
rename to app/src/main/java/org/mozilla/fenix/gecko/GeckoProvider.kt
index 4fbd61291..efec1dc26 100644
--- a/app/src/geckoBeta/java/org/mozilla/fenix/engine/GeckoProvider.kt
+++ b/app/src/main/java/org/mozilla/fenix/gecko/GeckoProvider.kt
@@ -2,20 +2,25 @@
  * 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/. */
 
+package org.mozilla.fenix.gecko
+
 import android.content.Context
-import mozilla.components.browser.engine.gecko.autofill.GeckoLoginDelegateWrapper
+import mozilla.components.browser.engine.gecko.autofill.GeckoAutocompleteStorageDelegate
 import mozilla.components.browser.engine.gecko.ext.toContentBlockingSetting
 import mozilla.components.browser.engine.gecko.glean.GeckoAdapter
 import mozilla.components.concept.engine.EngineSession.TrackingProtectionPolicy
+import mozilla.components.concept.storage.CreditCardsAddressesStorage
 import mozilla.components.concept.storage.LoginsStorage
 import mozilla.components.lib.crash.handler.CrashHandlerService
+import mozilla.components.service.sync.autofill.GeckoCreditCardsAddressesStorageDelegate
 import mozilla.components.service.sync.logins.GeckoLoginStorageDelegate
 import org.mozilla.fenix.Config
 import org.mozilla.fenix.ext.components
+import org.mozilla.fenix.ext.settings
 import org.mozilla.geckoview.ContentBlocking
+import org.mozilla.geckoview.ContentBlocking.SafeBrowsingProvider
 import org.mozilla.geckoview.GeckoRuntime
 import org.mozilla.geckoview.GeckoRuntimeSettings
-import org.mozilla.geckoview.ContentBlocking.SafeBrowsingProvider
 
 object GeckoProvider {
     private var runtime: GeckoRuntime? = null
@@ -27,11 +32,13 @@ object GeckoProvider {
     @Synchronized
     fun getOrCreateRuntime(
         context: Context,
-        storage: Lazy<LoginsStorage>,
+        autofillStorage: Lazy<CreditCardsAddressesStorage>,
+        loginStorage: Lazy<LoginsStorage>,
         trackingProtectionPolicy: TrackingProtectionPolicy
     ): GeckoRuntime {
         if (runtime == null) {
-            runtime = createRuntime(context, storage, trackingProtectionPolicy)
+            runtime =
+                createRuntime(context, autofillStorage, loginStorage, trackingProtectionPolicy)
         }
 
         return runtime!!
@@ -39,7 +46,8 @@ object GeckoProvider {
 
     private fun createRuntime(
         context: Context,
-        storage: Lazy<LoginsStorage>,
+        autofillStorage: Lazy<CreditCardsAddressesStorage>,
+        loginStorage: Lazy<LoginsStorage>,
         policy: TrackingProtectionPolicy
     ): GeckoRuntime {
         val builder = GeckoRuntimeSettings.Builder()
@@ -48,8 +56,8 @@ object GeckoProvider {
             .crashHandler(CrashHandlerService::class.java)
             .telemetryDelegate(GeckoAdapter())
             .contentBlocking(policy.toContentBlockingSetting())
-            .aboutConfigEnabled(true)
             .debugLogging(Config.channel.isDebug)
+            .aboutConfigEnabled(true)
             .build()
 
         val settings = context.components.settings
@@ -82,9 +90,13 @@ object GeckoProvider {
         }
 
         val geckoRuntime = GeckoRuntime.create(context, runtimeSettings)
-        val loginStorageDelegate = GeckoLoginStorageDelegate(storage)
-        @Suppress("Deprecation")
-        geckoRuntime.loginStorageDelegate = GeckoLoginDelegateWrapper(loginStorageDelegate)
+
+        geckoRuntime.autocompleteStorageDelegate = GeckoAutocompleteStorageDelegate(
+            GeckoCreditCardsAddressesStorageDelegate(autofillStorage) {
+                context.settings().shouldAutofillCreditCardDetails
+            },
+            GeckoLoginStorageDelegate(loginStorage)
+        )
 
         return geckoRuntime
     }
diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt b/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt
index cf89bd2bb..4184f59db 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt
@@ -27,11 +27,10 @@ import org.mozilla.fenix.FeatureFlags
 import org.mozilla.fenix.FeatureFlags.tabsTrayRewrite
 import org.mozilla.fenix.R
 import org.mozilla.fenix.components.accounts.FenixAccountManager
-import org.mozilla.fenix.experiments.ExperimentBranch
-import org.mozilla.fenix.experiments.Experiments
+import org.mozilla.fenix.experiments.FeatureId
 import org.mozilla.fenix.ext.components
+import org.mozilla.fenix.ext.getVariables
 import org.mozilla.fenix.ext.settings
-import org.mozilla.fenix.ext.withExperiment
 import org.mozilla.fenix.theme.ThemeManager
 import org.mozilla.fenix.whatsnew.WhatsNew
 
@@ -142,23 +141,9 @@ class HomeMenu(
             onItemTapped.invoke(Item.Bookmarks)
         }
 
-        // We want to validate that the Nimbus experiments library is working, from the android UI
-        // all the way back to the data science backend. We're not testing the user's preference
-        // or response, we're end-to-end testing the experiments platform.
-        // So here, we're running multiple identical branches with the same treatment, and if the
-        // user isn't targeted, then we get still get the same treatment.
-        // The `let` block is degenerate here, but left here so as to document the form of how experiments
-        // are implemented here.
-        val historyIcon = experiments.withExperiment(Experiments.A_A_NIMBUS_VALIDATION) {
-            when (it) {
-                ExperimentBranch.A1 -> R.drawable.ic_history
-                ExperimentBranch.A2 -> R.drawable.ic_history
-                else -> R.drawable.ic_history
-            }
-        }
         val historyItem = BrowserMenuImageText(
             context.getString(R.string.library_history),
-            historyIcon,
+            R.drawable.ic_history,
             primaryTextColor
         ) {
             onItemTapped.invoke(Item.History)
@@ -172,9 +157,11 @@ class HomeMenu(
             onItemTapped.invoke(Item.Extensions)
         }
 
+        // Use nimbus to set the icon and title.
+        val variables = experiments.getVariables(FeatureId.NIMBUS_VALIDATION)
         val settingsItem = BrowserMenuImageText(
-            context.getString(R.string.browser_menu_settings),
-            R.drawable.ic_settings,
+            variables.getText("settings-title") ?: context.getString(R.string.browser_menu_settings),
+            variables.getDrawableResource("settings-icon") ?: R.drawable.ic_settings,
             primaryTextColor
         ) {
             onItemTapped.invoke(Item.Settings)
@@ -252,23 +239,9 @@ class HomeMenu(
             onItemTapped.invoke(Item.Bookmarks)
         }
 
-        // We want to validate that the Nimbus experiments library is working, from the android UI
-        // all the way back to the data science backend. We're not testing the user's preference
-        // or response, we're end-to-end testing the experiments platform.
-        // So here, we're running multiple identical branches with the same treatment, and if the
-        // user isn't targeted, then we get still get the same treatment.
-        // The `let` block is degenerate here, but left here so as to document the form of how experiments
-        // are implemented here.
-        val historyIcon = experiments.withExperiment(Experiments.A_A_NIMBUS_VALIDATION) {
-            when (it) {
-                ExperimentBranch.A1 -> R.drawable.ic_history
-                ExperimentBranch.A2 -> R.drawable.ic_history
-                else -> R.drawable.ic_history
-            }
-        }
         val historyItem = BrowserMenuImageText(
             context.getString(R.string.library_history),
-            historyIcon,
+            R.drawable.ic_history,
             primaryTextColor
         ) {
             onItemTapped.invoke(Item.History)
@@ -310,9 +283,11 @@ class HomeMenu(
             onItemTapped.invoke(Item.Help)
         }
 
+        // Use nimbus to set the icon and title.
+        val variables = experiments.getVariables(FeatureId.NIMBUS_VALIDATION)
         val settingsItem = BrowserMenuImageText(
-            context.getString(R.string.browser_menu_settings),
-            R.drawable.ic_settings,
+            variables.getText("settings-title") ?: context.getString(R.string.browser_menu_settings),
+            variables.getDrawableResource("settings-icon") ?: R.drawable.ic_settings,
             primaryTextColor
         ) {
             onItemTapped.invoke(Item.Settings)
diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TopSitePagerViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TopSitePagerViewHolder.kt
index 36ed91467..b77b4e232 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TopSitePagerViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TopSitePagerViewHolder.kt
@@ -45,6 +45,10 @@ class TopSitePagerViewHolder(
         view.top_sites_pager.apply {
             adapter = topSitesPagerAdapter
             registerOnPageChangeCallback(topSitesPageChangeCallback)
+            // Retain one more TopSites pages to ensure a new layout request will measure the first page also.
+            // Otherwise the second page with 3 TopSites will have the entire ViewPager only show
+            // the first row of TopSites, hiding half of those shown on the first page.
+            offscreenPageLimit = 1
         }
     }
 
diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/topsites/TopSiteItemViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/topsites/TopSiteItemViewHolder.kt
index 5ee55eb98..7ca0da2ca 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/topsites/TopSiteItemViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/topsites/TopSiteItemViewHolder.kt
@@ -11,6 +11,7 @@ import android.view.View
 import android.widget.PopupWindow
 import androidx.appcompat.content.res.AppCompatResources.getDrawable
 import kotlinx.android.synthetic.main.top_site_item.*
+import kotlinx.android.synthetic.main.top_site_item.view.*
 import mozilla.components.browser.menu.BrowserMenuBuilder
 import mozilla.components.browser.menu.item.SimpleBrowserMenuItem
 import mozilla.components.feature.top.sites.TopSite
@@ -64,10 +65,11 @@ class TopSiteItemViewHolder(
     fun bind(topSite: TopSite) {
         top_site_title.text = topSite.title
 
-        pin_indicator.visibility = if (topSite.type == PINNED || topSite.type == DEFAULT) {
-            View.VISIBLE
+        if (topSite.type == PINNED || topSite.type == DEFAULT) {
+            val pinIndicator = getDrawable(itemView.context, R.drawable.ic_new_pin)
+            top_site_title.setCompoundDrawablesWithIntrinsicBounds(pinIndicator, null, null, null)
         } else {
-            View.GONE
+            top_site_title.setCompoundDrawablesWithIntrinsicBounds(null, null, null, null)
         }
 
         when (topSite.url) {
@@ -91,6 +93,11 @@ class TopSiteItemViewHolder(
         this.topSite = topSite
     }
 
+    fun bind(topSitePayload: TopSitesAdapter.TopSitePayload) {
+        itemView.top_site_title.text = topSitePayload.newTitle
+        topSite = topSite.copy(title = topSitePayload.newTitle)
+    }
+
     private fun onTouchEvent(
         v: View,
         event: MotionEvent,
diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/topsites/TopSitesAdapter.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/topsites/TopSitesAdapter.kt
index 78bf438d0..551908699 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/topsites/TopSitesAdapter.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/topsites/TopSitesAdapter.kt
@@ -40,7 +40,7 @@ class TopSitesAdapter(
                     holder.bind((payloads[0] as TopSite))
                 }
                 is TopSitePayload -> {
-                    holder.itemView.top_site_title.text = (payloads[0] as TopSitePayload).newTitle
+                    holder.bind(payloads[0] as TopSitePayload)
                 }
             }
         }
diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/topsites/TopSitesPagerAdapter.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/topsites/TopSitesPagerAdapter.kt
index c960dc69f..e60cc4cd6 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/topsites/TopSitesPagerAdapter.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/topsites/TopSitesPagerAdapter.kt
@@ -12,6 +12,7 @@ import kotlinx.android.synthetic.main.component_top_sites.view.*
 import mozilla.components.feature.top.sites.TopSite
 import org.mozilla.fenix.home.sessioncontrol.AdapterItem
 import org.mozilla.fenix.home.sessioncontrol.TopSiteInteractor
+import org.mozilla.fenix.home.sessioncontrol.viewholders.TopSitePagerViewHolder.Companion.TOP_SITES_PER_PAGE
 import org.mozilla.fenix.home.sessioncontrol.viewholders.TopSiteViewHolder
 
 class TopSitesPagerAdapter(
@@ -36,7 +37,10 @@ class TopSitesPagerAdapter(
                 val adapter = holder.itemView.top_sites_list.adapter as TopSitesAdapter
                 val payload = payloads[0] as AdapterItem.TopSitePagerPayload
                 for (item in payload.changed) {
-                    adapter.notifyItemChanged(item.first, item.second)
+                    adapter.notifyItemChanged(
+                        item.first % TOP_SITES_PER_PAGE,
+                        TopSitesAdapter.TopSitePayload(item.second.title)
+                    )
                 }
             }
         }
diff --git a/app/src/main/java/org/mozilla/fenix/library/LibraryPageView.kt b/app/src/main/java/org/mozilla/fenix/library/LibraryPageView.kt
index 4d4adf6e3..183f62abf 100644
--- a/app/src/main/java/org/mozilla/fenix/library/LibraryPageView.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/LibraryPageView.kt
@@ -44,5 +44,7 @@ open class LibraryPageView(
         activity?.title = title
         val toolbar = activity?.findViewById<Toolbar>(R.id.navigationToolbar)
         toolbar?.setToolbarColors(foregroundColor, backgroundColor)
+        toolbar?.setNavigationIcon(R.drawable.ic_back_button)
+        toolbar?.navigationIcon?.setTint(foregroundColor)
     }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkController.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkController.kt
index 3dc18e26d..2f6950e22 100644
--- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkController.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkController.kt
@@ -14,6 +14,7 @@ import kotlinx.coroutines.launch
 import mozilla.appservices.places.BookmarkRoot
 import mozilla.components.concept.engine.prompt.ShareData
 import mozilla.components.concept.storage.BookmarkNode
+import mozilla.components.feature.tabs.TabsUseCases
 import mozilla.components.service.fxa.sync.SyncReason
 import org.mozilla.fenix.BrowserDirection
 import org.mozilla.fenix.HomeActivity
@@ -55,11 +56,13 @@ class DefaultBookmarkController(
     private val scope: CoroutineScope,
     private val store: BookmarkFragmentStore,
     private val sharedViewModel: BookmarksSharedViewModel,
+    private val tabsUseCases: TabsUseCases?,
     private val loadBookmarkNode: suspend (String) -> BookmarkNode?,
     private val showSnackbar: (String) -> Unit,
     private val deleteBookmarkNodes: (Set<BookmarkNode>, Event) -> Unit,
     private val deleteBookmarkFolder: (Set<BookmarkNode>) -> Unit,
-    private val invokePendingDeletion: () -> Unit
+    private val invokePendingDeletion: () -> Unit,
+    private val showTabTray: () -> Unit
 ) : BookmarkController {
 
     private val resources: Resources = activity.resources
@@ -70,7 +73,7 @@ class DefaultBookmarkController(
     }
 
     override fun handleBookmarkTapped(item: BookmarkNode) {
-        openInNewTab(item.url!!, true, BrowserDirection.FromBookmarks, activity.browsingModeManager.mode)
+        openInNewTabAndShow(item.url!!, true, BrowserDirection.FromBookmarks, activity.browsingModeManager.mode)
     }
 
     override fun handleBookmarkExpand(folder: BookmarkNode) {
@@ -126,7 +129,8 @@ class DefaultBookmarkController(
     }
 
     override fun handleOpeningBookmark(item: BookmarkNode, mode: BrowsingMode) {
-        openInNewTab(item.url!!, true, BrowserDirection.FromBookmarks, mode)
+        openInNewTab(item.url!!, mode)
+        showTabTray()
     }
 
     override fun handleBookmarkDeletion(nodes: Set<BookmarkNode>, eventType: Event) {
@@ -169,7 +173,7 @@ class DefaultBookmarkController(
         }
     }
 
-    private fun openInNewTab(
+    private fun openInNewTabAndShow(
         searchTermOrURL: String,
         newTab: Boolean,
         from: BrowserDirection,
@@ -182,6 +186,18 @@ class DefaultBookmarkController(
         }
     }
 
+    private fun openInNewTab(
+        url: String,
+        mode: BrowsingMode
+    ) {
+        invokePendingDeletion.invoke()
+        activity.browsingModeManager.mode = BrowsingMode.fromBoolean(mode == BrowsingMode.Private)
+        tabsUseCases?.let { tabsUseCases ->
+            val addTab = if (mode == BrowsingMode.Private) tabsUseCases.addPrivateTab else tabsUseCases.addTab
+            addTab.invoke(url)
+        }
+    }
+
     private fun navigateToGivenDirection(directions: NavDirections) {
         invokePendingDeletion.invoke()
         navController.nav(R.id.bookmarkFragment, directions)
diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt
index 4b93a4f31..e7a1a8475 100644
--- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt
@@ -92,11 +92,13 @@ class BookmarkFragment : LibraryPageFragment<BookmarkNode>(), UserInteractionHan
                 scope = viewLifecycleOwner.lifecycleScope,
                 store = bookmarkStore,
                 sharedViewModel = sharedViewModel,
+                tabsUseCases = activity?.components?.useCases?.tabsUseCases,
                 loadBookmarkNode = ::loadBookmarkNode,
                 showSnackbar = ::showSnackBarWithText,
                 deleteBookmarkNodes = ::deleteMulti,
                 deleteBookmarkFolder = ::showRemoveFolderDialog,
-                invokePendingDeletion = ::invokePendingDeletion
+                invokePendingDeletion = ::invokePendingDeletion,
+                showTabTray = ::showTabTray
             ),
             metrics = metrics!!
         )
@@ -243,7 +245,7 @@ class BookmarkFragment : LibraryPageFragment<BookmarkNode>(), UserInteractionHan
 
     private fun showTabTray() {
         invokePendingDeletion()
-        navigateToBookmarkFragment(BookmarkFragmentDirections.actionGlobalTabTrayDialogFragment())
+        navigateToBookmarkFragment(BookmarkFragmentDirections.actionGlobalTabsTrayFragment())
     }
 
     private fun navigateToBookmarkFragment(directions: NavDirections) {
diff --git a/app/src/main/java/org/mozilla/fenix/library/downloads/DownloadFragment.kt b/app/src/main/java/org/mozilla/fenix/library/downloads/DownloadFragment.kt
index f9687e8ad..2ce209b92 100644
--- a/app/src/main/java/org/mozilla/fenix/library/downloads/DownloadFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/downloads/DownloadFragment.kt
@@ -98,12 +98,13 @@ class DownloadFragment : LibraryPageFragment<DownloadItem>(), UserInteractionHan
             .sortedByDescending { it.createdTime } // sort from newest to oldest
             .map {
                 DownloadItem(
-                    it.id,
-                    it.fileName,
-                    it.filePath,
-                    it.contentLength?.toString() ?: "0",
-                    it.contentType,
-                    it.status
+                    id = it.id,
+                    url = it.url,
+                    fileName = it.fileName,
+                    filePath = it.filePath,
+                    size = it.contentLength?.toString() ?: "0",
+                    contentType = it.contentType,
+                    status = it.status
                 )
             }.filter {
                 it.status == DownloadState.Status.COMPLETED
@@ -249,10 +250,21 @@ class DownloadFragment : LibraryPageFragment<DownloadItem>(), UserInteractionHan
 
         mode?.let { (activity as HomeActivity).browsingModeManager.mode = it }
         context?.let {
+            val contentLength = if (item.size.isNotEmpty()) {
+                item.size.toLong()
+            } else {
+                0L
+            }
             AbstractFetchDownloadService.openFile(
-                context = it,
-                contentType = item.contentType,
-                filePath = item.filePath
+                applicationContext = it.applicationContext,
+                download = DownloadState(
+                    id = item.id,
+                    url = item.url,
+                    fileName = item.fileName,
+                    contentType = item.contentType,
+                    status = item.status,
+                    contentLength = contentLength
+                )
             )
         }
 
diff --git a/app/src/main/java/org/mozilla/fenix/library/downloads/DownloadFragmentStore.kt b/app/src/main/java/org/mozilla/fenix/library/downloads/DownloadFragmentStore.kt
index a122262de..106009ec6 100644
--- a/app/src/main/java/org/mozilla/fenix/library/downloads/DownloadFragmentStore.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/downloads/DownloadFragmentStore.kt
@@ -12,13 +12,16 @@ import mozilla.components.lib.state.Store
 /**
  * Class representing a downloads entry
  * @property id Unique id of the download item
+ * @property url The full url to the content that should be downloaded
  * @property fileName File name of the download item
  * @property filePath Full path of the download item
  * @property size The size in bytes of the download item
  * @property contentType The type of file the download is
+ * @property status The status that represents every state that a download can be in
  */
 data class DownloadItem(
     val id: String,
+    val url: String,
     val fileName: String?,
     val filePath: String,
     val size: String,
diff --git a/app/src/main/java/org/mozilla/fenix/library/history/HistoryController.kt b/app/src/main/java/org/mozilla/fenix/library/history/HistoryController.kt
index 8d9114a43..41d734c8e 100644
--- a/app/src/main/java/org/mozilla/fenix/library/history/HistoryController.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/history/HistoryController.kt
@@ -21,7 +21,8 @@ import org.mozilla.fenix.ext.navigateBlockingForAsyncNavGraph
 
 @Suppress("TooManyFunctions")
 interface HistoryController {
-    fun handleOpen(item: HistoryItem, mode: BrowsingMode? = null)
+    fun handleOpen(item: HistoryItem)
+    fun handleOpenInNewTab(item: HistoryItem, mode: BrowsingMode)
     fun handleSelect(item: HistoryItem)
     fun handleDeselect(item: HistoryItem)
     fun handleBackPressed(): Boolean
@@ -42,15 +43,20 @@ class DefaultHistoryController(
     private val snackbar: FenixSnackbar,
     private val clipboardManager: ClipboardManager,
     private val scope: CoroutineScope,
-    private val openToBrowser: (item: HistoryItem, mode: BrowsingMode?) -> Unit,
+    private val openToBrowser: (item: HistoryItem) -> Unit,
+    private val openInNewTab: (item: HistoryItem, mode: BrowsingMode) -> Unit,
     private val displayDeleteAll: () -> Unit,
     private val invalidateOptionsMenu: () -> Unit,
     private val deleteHistoryItems: (Set<HistoryItem>) -> Unit,
     private val syncHistory: suspend () -> Unit,
     private val metrics: MetricController
 ) : HistoryController {
-    override fun handleOpen(item: HistoryItem, mode: BrowsingMode?) {
-        openToBrowser(item, mode)
+    override fun handleOpen(item: HistoryItem) {
+        openToBrowser(item)
+    }
+
+    override fun handleOpenInNewTab(item: HistoryItem, mode: BrowsingMode) {
+        openInNewTab(item, mode)
     }
 
     override fun handleSelect(item: HistoryItem) {
diff --git a/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt b/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt
index 7d96b91b7..8eac22ccd 100644
--- a/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt
@@ -80,22 +80,23 @@ class HistoryFragment : LibraryPageFragment<HistoryItem>(), UserInteractionHandl
             )
         }
         val historyController: HistoryController = DefaultHistoryController(
-            historyStore,
-            findNavController(),
-            resources,
-            FenixSnackbar.make(
+            store = historyStore,
+            navController = findNavController(),
+            resources = resources,
+            snackbar = FenixSnackbar.make(
                 view = view,
                 duration = FenixSnackbar.LENGTH_LONG,
                 isDisplayedWithBrowserToolbar = false
             ),
-            activity?.getSystemService(CLIPBOARD_SERVICE) as ClipboardManager,
-            lifecycleScope,
-            ::openItem,
-            ::displayDeleteAllDialog,
-            ::invalidateOptionsMenu,
-            ::deleteHistoryItems,
-            ::syncHistory,
-            requireComponents.analytics.metrics
+            clipboardManager = activity?.getSystemService(CLIPBOARD_SERVICE) as ClipboardManager,
+            scope = lifecycleScope,
+            openToBrowser = ::openItem,
+            openInNewTab = ::openItemAndShowTray,
+            displayDeleteAll = ::displayDeleteAllDialog,
+            invalidateOptionsMenu = ::invalidateOptionsMenu,
+            deleteHistoryItems = ::deleteHistoryItems,
+            syncHistory = ::syncHistory,
+            metrics = requireComponents.analytics.metrics
         )
         historyInteractor = HistoryInteractor(
             historyController
@@ -104,6 +105,7 @@ class HistoryFragment : LibraryPageFragment<HistoryItem>(), UserInteractionHandl
             view.historyLayout,
             historyInteractor
         )
+        showToolbar(getString(R.string.library_history))
 
         return view
     }
@@ -160,7 +162,6 @@ class HistoryFragment : LibraryPageFragment<HistoryItem>(), UserInteractionHandl
 
     override fun onResume() {
         super.onResume()
-        showToolbar(getString(R.string.library_history))
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
@@ -216,7 +217,7 @@ class HistoryFragment : LibraryPageFragment<HistoryItem>(), UserInteractionHandl
         invokePendingDeletion()
         findNavController().nav(
             R.id.historyFragment,
-            HistoryFragmentDirections.actionGlobalTabTrayDialogFragment()
+            HistoryFragmentDirections.actionGlobalTabsTrayFragment()
         )
     }
 
@@ -247,14 +248,8 @@ class HistoryFragment : LibraryPageFragment<HistoryItem>(), UserInteractionHandl
         _historyView = null
     }
 
-    private fun openItem(item: HistoryItem, mode: BrowsingMode? = null) {
-        when (mode?.isPrivate) {
-            true -> requireComponents.analytics.metrics.track(Event.HistoryOpenedInPrivateTab)
-            false -> requireComponents.analytics.metrics.track(Event.HistoryOpenedInNewTab)
-            null -> requireComponents.analytics.metrics.track(Event.HistoryItemOpened)
-        }
-
-        mode?.let { (activity as HomeActivity).browsingModeManager.mode = it }
+    private fun openItem(item: HistoryItem) {
+        requireComponents.analytics.metrics.track(Event.HistoryItemOpened)
 
         (activity as HomeActivity).openToBrowserAndLoad(
             searchTermOrURL = item.url,
@@ -263,6 +258,22 @@ class HistoryFragment : LibraryPageFragment<HistoryItem>(), UserInteractionHandl
         )
     }
 
+    private fun openItemAndShowTray(item: HistoryItem, mode: BrowsingMode) {
+        when (mode.isPrivate) {
+            true -> requireComponents.analytics.metrics.track(Event.HistoryOpenedInPrivateTab)
+            false -> requireComponents.analytics.metrics.track(Event.HistoryOpenedInNewTab)
+        }
+
+        val homeActivity = activity as HomeActivity
+        homeActivity.browsingModeManager.mode = mode
+        homeActivity.components.useCases.tabsUseCases.let { tabsUseCases ->
+            val addTab = if (mode == BrowsingMode.Private) tabsUseCases.addPrivateTab else tabsUseCases.addTab
+            addTab.invoke(item.url)
+        }
+
+        showTabTray()
+    }
+
     private fun displayDeleteAllDialog() {
         activity?.let { activity ->
             AlertDialog.Builder(activity).apply {
diff --git a/app/src/main/java/org/mozilla/fenix/library/history/HistoryInteractor.kt b/app/src/main/java/org/mozilla/fenix/library/history/HistoryInteractor.kt
index 2c8b9056e..e7792e827 100644
--- a/app/src/main/java/org/mozilla/fenix/library/history/HistoryInteractor.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/history/HistoryInteractor.kt
@@ -43,11 +43,11 @@ class HistoryInteractor(
     }
 
     override fun onOpenInNormalTab(item: HistoryItem) {
-        historyController.handleOpen(item, BrowsingMode.Normal)
+        historyController.handleOpenInNewTab(item, BrowsingMode.Normal)
     }
 
     override fun onOpenInPrivateTab(item: HistoryItem) {
-        historyController.handleOpen(item, BrowsingMode.Private)
+        historyController.handleOpenInNewTab(item, BrowsingMode.Private)
     }
 
     override fun onDeleteAll() {
diff --git a/app/src/main/java/org/mozilla/fenix/nimbus/NimbusBranchesFragment.kt b/app/src/main/java/org/mozilla/fenix/nimbus/NimbusBranchesFragment.kt
new file mode 100644
index 000000000..235b3f27b
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/nimbus/NimbusBranchesFragment.kt
@@ -0,0 +1,94 @@
+/* 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/. */
+
+package org.mozilla.fenix.nimbus
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
+import androidx.navigation.fragment.navArgs
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.launch
+import mozilla.components.lib.state.ext.consumeFrom
+import mozilla.components.support.base.log.logger.Logger
+import org.mozilla.fenix.R
+import org.mozilla.fenix.components.StoreProvider
+import org.mozilla.fenix.ext.components
+import org.mozilla.fenix.ext.showToolbar
+import org.mozilla.fenix.nimbus.controller.NimbusBranchesController
+import org.mozilla.fenix.nimbus.view.NimbusBranchesView
+
+/**
+ * A fragment to show the branches of a Nimbus experiment.
+ */
+@Suppress("TooGenericExceptionCaught")
+class NimbusBranchesFragment : Fragment() {
+
+    private lateinit var nimbusBranchesStore: NimbusBranchesStore
+    private lateinit var nimbusBranchesView: NimbusBranchesView
+    private lateinit var controller: NimbusBranchesController
+
+    private val args by navArgs<NimbusBranchesFragmentArgs>()
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        val view =
+            inflater.inflate(R.layout.mozac_service_nimbus_experiment_details, container, false)
+
+        nimbusBranchesStore = StoreProvider.get(this) {
+            NimbusBranchesStore(NimbusBranchesState(branches = emptyList()))
+        }
+
+        controller = NimbusBranchesController(
+            nimbusBranchesStore = nimbusBranchesStore,
+            experiments = requireContext().components.analytics.experiments,
+            experimentId = args.experimentId
+        )
+
+        nimbusBranchesView =
+            NimbusBranchesView(view.findViewById(R.id.nimbus_experiment_branches_list), controller)
+
+        loadExperimentBranches()
+
+        return view
+    }
+
+    @ExperimentalCoroutinesApi
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        consumeFrom(nimbusBranchesStore) { state ->
+            nimbusBranchesView.update(state)
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        showToolbar(args.experimentName)
+    }
+
+    private fun loadExperimentBranches() {
+        lifecycleScope.launch(Dispatchers.IO) {
+            try {
+                val experiments = requireContext().components.analytics.experiments
+                val branches = experiments.getExperimentBranches(args.experimentId) ?: emptyList()
+                val selectedBranch = experiments.getExperimentBranch(args.experimentId) ?: ""
+
+                nimbusBranchesStore.dispatch(
+                    NimbusBranchesAction.UpdateBranches(
+                        branches,
+                        selectedBranch
+                    )
+                )
+            } catch (e: Throwable) {
+                Logger.error("Failed to getActiveExperiments()", e)
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/org/mozilla/fenix/nimbus/NimbusBranchesStore.kt b/app/src/main/java/org/mozilla/fenix/nimbus/NimbusBranchesStore.kt
new file mode 100644
index 000000000..c378686ff
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/nimbus/NimbusBranchesStore.kt
@@ -0,0 +1,79 @@
+/* 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/. */
+
+package org.mozilla.fenix.nimbus
+
+import mozilla.components.lib.state.Action
+import mozilla.components.lib.state.State
+import mozilla.components.lib.state.Store
+import org.mozilla.experiments.nimbus.Branch
+
+/**
+ * The [Store] for holding the [NimbusBranchesState] and applying [NimbusBranchesAction]s.
+ */
+class NimbusBranchesStore(initialState: NimbusBranchesState) :
+    Store<NimbusBranchesState, NimbusBranchesAction>(
+        initialState, ::nimbusBranchesFragmentStateReducer
+    )
+
+/**
+ * The state for [NimbusBranchesFragment].
+ *
+ * @property branches The list of [Branch]s to display in the branches list.
+ * @property selectedBranch The selected [Branch] slug for a Nimbus experiment.
+ * @property isLoading True if the branches are still being loaded from storage, otherwise false.
+ */
+data class NimbusBranchesState(
+    val branches: List<Branch>,
+    val selectedBranch: String = "",
+    val isLoading: Boolean = true
+) : State
+
+/**
+ * Actions to dispatch through the [NimbusBranchesStore] to modify the [NimbusBranchesState]
+ * through the [nimbusBranchesFragmentStateReducer].
+ */
+sealed class NimbusBranchesAction : Action {
+    /**
+     * Updates the list of Nimbus branches and selected branch.
+     *
+     * @param branches The list of [Branch]s to display in the branches list.
+     * @param selectedBranch The selected [Branch] slug for a Nimbus experiment.
+     */
+    data class UpdateBranches(val branches: List<Branch>, val selectedBranch: String) :
+        NimbusBranchesAction()
+
+    /**
+     * Updates the selected branch.
+     *
+     * @param selectedBranch The selected [Branch] slug for a Nimbus experiment.
+     */
+    data class UpdateSelectedBranch(val selectedBranch: String) : NimbusBranchesAction()
+}
+
+/**
+ * Reduces the Nimbus branches state from the current state with the provided [action] to
+ * be performed.
+ *
+ * @param state The current Nimbus branches state.
+ * @param action The action to be performed on the state.
+ * @return the new [NimbusBranchesState] with the [action] executed.
+ */
+private fun nimbusBranchesFragmentStateReducer(
+    state: NimbusBranchesState,
+    action: NimbusBranchesAction
+): NimbusBranchesState {
+    return when (action) {
+        is NimbusBranchesAction.UpdateBranches -> {
+            state.copy(
+                branches = action.branches,
+                selectedBranch = action.selectedBranch,
+                isLoading = false
+            )
+        }
+        is NimbusBranchesAction.UpdateSelectedBranch -> {
+            state.copy(selectedBranch = action.selectedBranch)
+        }
+    }
+}
diff --git a/app/src/main/java/org/mozilla/fenix/nimbus/NimbusDetailsFragment.kt b/app/src/main/java/org/mozilla/fenix/nimbus/NimbusDetailsFragment.kt
deleted file mode 100644
index 7caf576bd..000000000
--- a/app/src/main/java/org/mozilla/fenix/nimbus/NimbusDetailsFragment.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-/* 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/. */
-
-package org.mozilla.fenix.nimbus
-
-import android.os.Bundle
-import android.view.View
-import androidx.fragment.app.Fragment
-import androidx.navigation.fragment.navArgs
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import mozilla.components.service.nimbus.ui.NimbusDetailAdapter
-import org.mozilla.fenix.R
-import org.mozilla.fenix.ext.showToolbar
-
-/**
- * A fragment to show the details of a Nimbus experiment.
- */
-class NimbusDetailsFragment : Fragment(R.layout.mozac_service_nimbus_experiment_details) {
-
-    private val args by navArgs<NimbusDetailsFragmentArgs>()
-    private var adapter: NimbusDetailAdapter? = null
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        bindRecyclerView(view)
-    }
-
-    override fun onResume() {
-        super.onResume()
-        showToolbar(args.experiment)
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        // Letting go of the resources to avoid memory leak.
-        adapter = null
-    }
-
-    private fun bindRecyclerView(view: View) {
-        val recyclerView = view.findViewById<RecyclerView>(R.id.nimbus_experiment_branches_list)
-        recyclerView.layoutManager = LinearLayoutManager(requireContext())
-
-        val shouldRefresh = adapter != null
-
-        // Dummy data until we have the appropriate Nimbus API.
-        val branches = listOf(
-            "Control",
-            "Treatment"
-        )
-
-        if (!shouldRefresh) {
-            adapter = NimbusDetailAdapter(branches)
-        }
-
-        recyclerView.adapter = adapter
-    }
-}
diff --git a/app/src/main/java/org/mozilla/fenix/nimbus/NimbusExperimentsFragment.kt b/app/src/main/java/org/mozilla/fenix/nimbus/NimbusExperimentsFragment.kt
index 4a8ec904f..30820dac2 100644
--- a/app/src/main/java/org/mozilla/fenix/nimbus/NimbusExperimentsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/nimbus/NimbusExperimentsFragment.kt
@@ -22,6 +22,7 @@ import org.mozilla.fenix.R
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.runIfFragmentIsAttached
 import org.mozilla.fenix.ext.showToolbar
+import org.mozilla.fenix.nimbus.view.NimbusExperimentsView
 
 /**
  * Fragment use for managing Nimbus experiments.
@@ -60,7 +61,7 @@ class NimbusExperimentsFragment : Fragment(R.layout.mozac_service_nimbus_experim
         lifecycleScope.launch(IO) {
             try {
                 val experiments =
-                    requireContext().components.analytics.experiments.getActiveExperiments()
+                    requireContext().components.analytics.experiments.getAvailableExperiments()
 
                 lifecycleScope.launch(Main) {
                     runIfFragmentIsAttached {
@@ -72,7 +73,7 @@ class NimbusExperimentsFragment : Fragment(R.layout.mozac_service_nimbus_experim
                         }
 
                         view.findViewById<TextView>(R.id.nimbus_experiments_empty_message).isVisible =
-                            false
+                            experiments.isEmpty()
                         recyclerView.adapter = adapter
                     }
                 }
diff --git a/app/src/main/java/org/mozilla/fenix/nimbus/controller/NimbusBranchesController.kt b/app/src/main/java/org/mozilla/fenix/nimbus/controller/NimbusBranchesController.kt
new file mode 100644
index 000000000..0916e26df
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/nimbus/controller/NimbusBranchesController.kt
@@ -0,0 +1,32 @@
+/* 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/. */
+
+package org.mozilla.fenix.nimbus.controller
+
+import mozilla.components.service.nimbus.NimbusApi
+import mozilla.components.service.nimbus.ui.NimbusBranchesAdapterDelegate
+import org.mozilla.experiments.nimbus.Branch
+import org.mozilla.fenix.nimbus.NimbusBranchesAction
+import org.mozilla.fenix.nimbus.NimbusBranchesStore
+
+/**
+ * [NimbusBranchesFragment] controller. This implements [NimbusBranchesAdapterDelegate] to handle
+ * interactions with a Nimbus branch item.
+ *
+ * @param nimbusBranchesStore An instance of [NimbusBranchesStore] for dispatching
+ * [NimbusBranchesAction]s.
+ * @param experiments An instance of [NimbusApi] for interacting with the Nimbus experiments.
+ * @param experimentId The string experiment-id or "slug" for a Nimbus experiment.
+ */
+class NimbusBranchesController(
+    private val nimbusBranchesStore: NimbusBranchesStore,
+    private val experiments: NimbusApi,
+    private val experimentId: String
+) : NimbusBranchesAdapterDelegate {
+
+    override fun onBranchItemClicked(branch: Branch) {
+        experiments.optInWithBranch(experimentId, branch.slug)
+        nimbusBranchesStore.dispatch(NimbusBranchesAction.UpdateSelectedBranch(branch.slug))
+    }
+}
diff --git a/app/src/main/java/org/mozilla/fenix/nimbus/view/NimbusBranchesView.kt b/app/src/main/java/org/mozilla/fenix/nimbus/view/NimbusBranchesView.kt
new file mode 100644
index 000000000..5fdb59137
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/nimbus/view/NimbusBranchesView.kt
@@ -0,0 +1,36 @@
+/* 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/. */
+
+package org.mozilla.fenix.nimbus.view
+
+import android.view.ViewGroup
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import kotlinx.android.extensions.LayoutContainer
+import mozilla.components.service.nimbus.ui.NimbusBranchAdapter
+import org.mozilla.fenix.nimbus.NimbusBranchesState
+import org.mozilla.fenix.nimbus.controller.NimbusBranchesController
+
+/**
+ * View used for managing a Nimbus experiment's branches.
+ */
+class NimbusBranchesView(
+    override val containerView: ViewGroup,
+    val controller: NimbusBranchesController
+) : LayoutContainer {
+
+    private val nimbusAdapter = NimbusBranchAdapter(controller)
+
+    init {
+        val recyclerView: RecyclerView = containerView as RecyclerView
+        recyclerView.apply {
+            adapter = nimbusAdapter
+            layoutManager = LinearLayoutManager(containerView.context)
+        }
+    }
+
+    fun update(state: NimbusBranchesState) {
+        nimbusAdapter.updateData(state.branches, state.selectedBranch)
+    }
+}
diff --git a/app/src/main/java/org/mozilla/fenix/nimbus/NimbusExperimentsView.kt b/app/src/main/java/org/mozilla/fenix/nimbus/view/NimbusExperimentsView.kt
similarity index 65%
rename from app/src/main/java/org/mozilla/fenix/nimbus/NimbusExperimentsView.kt
rename to app/src/main/java/org/mozilla/fenix/nimbus/view/NimbusExperimentsView.kt
index 1bc6e030f..643a0b3a8 100644
--- a/app/src/main/java/org/mozilla/fenix/nimbus/NimbusExperimentsView.kt
+++ b/app/src/main/java/org/mozilla/fenix/nimbus/view/NimbusExperimentsView.kt
@@ -2,12 +2,13 @@
  * 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/. */
 
-package org.mozilla.fenix.nimbus
+package org.mozilla.fenix.nimbus.view
 
 import androidx.navigation.NavController
 import mozilla.components.service.nimbus.ui.NimbusExperimentsAdapterDelegate
-import org.mozilla.experiments.nimbus.EnrolledExperiment
+import org.mozilla.experiments.nimbus.AvailableExperiment
 import org.mozilla.fenix.ext.navigateBlockingForAsyncNavGraph
+import org.mozilla.fenix.nimbus.NimbusExperimentsFragmentDirections
 
 /**
  * View used for managing Nimbus experiments.
@@ -16,10 +17,11 @@ class NimbusExperimentsView(
     private val navController: NavController
 ) : NimbusExperimentsAdapterDelegate {
 
-    override fun onExperimentItemClicked(experiment: EnrolledExperiment) {
+    override fun onExperimentItemClicked(experiment: AvailableExperiment) {
         val directions =
-            NimbusExperimentsFragmentDirections.actionNimbusExperimentsFragmentToNimbusDetailsFragment(
-                experiment.userFacingName
+            NimbusExperimentsFragmentDirections.actionNimbusExperimentsFragmentToNimbusBranchesFragment(
+                experimentId = experiment.slug,
+                experimentName = experiment.userFacingName
             )
 
         navController.navigateBlockingForAsyncNavGraph(directions)
diff --git a/app/src/main/java/org/mozilla/fenix/perf/StartupTimelineStateMachine.kt b/app/src/main/java/org/mozilla/fenix/perf/StartupTimelineStateMachine.kt
index 806b42768..85236cde2 100644
--- a/app/src/main/java/org/mozilla/fenix/perf/StartupTimelineStateMachine.kt
+++ b/app/src/main/java/org/mozilla/fenix/perf/StartupTimelineStateMachine.kt
@@ -25,8 +25,6 @@ object StartupTimelineStateMachine {
      * The states the application passes through during startup. We define these states to help us
      * better understand Android startup. Note that these states are not 100% correlated to the
      * cold/warm/hot states Google Play Vitals uses.
-     *
-     * TODO: link to extensive documentation on cold/warm/hot states when completed.
      */
     sealed class StartupState {
         /** The state when the application is starting up but is not in memory. */
diff --git a/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt b/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt
index 2f1296adf..99912d989 100644
--- a/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt
@@ -554,7 +554,7 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler {
     private fun updateClipboardSuggestion(searchState: SearchFragmentState, clipboardUrl: String?) {
         val shouldShowView = searchState.showClipboardSuggestions &&
                 searchState.query.isEmpty() &&
-                !clipboardUrl.isNullOrEmpty()
+                !clipboardUrl.isNullOrEmpty() && !searchState.showSearchShortcuts
 
         fill_link_from_clipboard.isVisible = shouldShowView
         fill_link_divider.isVisible = shouldShowView
diff --git a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt
index dee2033e5..0f0a0b5d6 100644
--- a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt
+++ b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt
@@ -9,7 +9,6 @@ import androidx.core.graphics.BlendModeColorFilterCompat.createBlendModeColorFil
 import androidx.core.graphics.BlendModeCompat.SRC_IN
 import androidx.core.graphics.drawable.toBitmap
 import mozilla.components.browser.awesomebar.BrowserAwesomeBar
-import mozilla.components.browser.search.DefaultSearchEngineProvider
 import mozilla.components.browser.state.search.SearchEngine
 import mozilla.components.browser.state.state.searchEngines
 import mozilla.components.concept.awesomebar.AwesomeBar
@@ -21,8 +20,6 @@ import mozilla.components.feature.awesomebar.provider.SearchEngineSuggestionProv
 import mozilla.components.feature.awesomebar.provider.SearchSuggestionProvider
 import mozilla.components.feature.awesomebar.provider.SessionSuggestionProvider
 import mozilla.components.feature.search.SearchUseCases
-import mozilla.components.feature.search.ext.legacy
-import mozilla.components.feature.search.ext.toDefaultSearchEngineProvider
 import mozilla.components.feature.session.SessionUseCases
 import mozilla.components.feature.syncedtabs.DeviceIndicators
 import mozilla.components.feature.syncedtabs.SyncedTabsStorageSuggestionProvider
@@ -34,7 +31,6 @@ import org.mozilla.fenix.browser.browsingmode.BrowsingMode
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.search.SearchEngineSource
 import org.mozilla.fenix.search.SearchFragmentState
-import mozilla.components.browser.search.SearchEngine as LegacySearchEngine
 
 /**
  * View that contains and configures the BrowserAwesomeBar
@@ -70,7 +66,7 @@ class AwesomeBarView(
     private val searchUseCase = object : SearchUseCases.SearchUseCase {
         override fun invoke(
             searchTerms: String,
-            searchEngine: mozilla.components.browser.search.SearchEngine?,
+            searchEngine: SearchEngine?,
             parentSessionId: String?
         ) {
             interactor.onSearchTermsTapped(searchTerms)
@@ -80,7 +76,7 @@ class AwesomeBarView(
     private val shortcutSearchUseCase = object : SearchUseCases.SearchUseCase {
         override fun invoke(
             searchTerms: String,
-            searchEngine: mozilla.components.browser.search.SearchEngine?,
+            searchEngine: SearchEngine?,
             parentSessionId: String?
         ) {
             interactor.onSearchTermsTapped(searchTerms)
@@ -151,7 +147,7 @@ class AwesomeBarView(
         defaultSearchSuggestionProvider =
             SearchSuggestionProvider(
                 context = activity,
-                defaultSearchEngineProvider = components.core.store.toDefaultSearchEngineProvider(),
+                store = components.core.store,
                 searchUseCase = searchUseCase,
                 fetchClient = components.core.client,
                 mode = SearchSuggestionProvider.Mode.MULTIPLE_SUGGESTIONS,
@@ -168,7 +164,7 @@ class AwesomeBarView(
 
         defaultSearchActionProvider =
             SearchActionProvider(
-                defaultSearchEngineProvider = components.core.store.toDefaultSearchEngineProvider(),
+                store = components.core.store,
                 searchUseCase = searchUseCase,
                 icon = searchBitmap,
                 showDescription = false
@@ -330,17 +326,13 @@ class AwesomeBarView(
 
             listOf(
                 SearchActionProvider(
-                    defaultSearchEngineProvider = object : DefaultSearchEngineProvider {
-                        override fun getDefaultSearchEngine(): LegacySearchEngine? =
-                            engine.legacy()
-                        override suspend fun retrieveDefaultSearchEngine(): LegacySearchEngine? =
-                            engine.legacy()
-                    },
+                    searchEngine = engine,
+                    store = components.core.store,
                     searchUseCase = shortcutSearchUseCase,
                     icon = searchBitmap
                 ),
                 SearchSuggestionProvider(
-                    engine.legacy(),
+                    engine,
                     shortcutSearchUseCase,
                     components.core.client,
                     limit = 3,
diff --git a/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt
index 4b965904b..f15dd9d45 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt
@@ -5,10 +5,12 @@
 package org.mozilla.fenix.settings
 
 import android.os.Bundle
+import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.SwitchPreference
 import org.mozilla.fenix.FeatureFlags
 import org.mozilla.fenix.R
+import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.ext.showToolbar
 
@@ -28,16 +30,22 @@ class SecretSettingsFragment : PreferenceFragmentCompat() {
             onPreferenceChangeListener = SharedPreferenceUpdater()
         }
 
-        requirePreference<SwitchPreference>(R.string.pref_key_show_credit_cards_feature).apply {
-            isVisible = FeatureFlags.creditCardsFeature
-            isChecked = context.settings().creditCardsFeature
-            onPreferenceChangeListener = SharedPreferenceUpdater()
-        }
-
         requirePreference<SwitchPreference>(R.string.pref_key_new_tabs_tray).apply {
             isVisible = FeatureFlags.tabsTrayRewrite
             isChecked = context.settings().tabsTrayRewrite
             onPreferenceChangeListener = SharedPreferenceUpdater()
         }
+
+        requirePreference<SwitchPreference>(R.string.pref_key_allow_third_party_root_certs).apply {
+            isVisible = true
+            isChecked = context.settings().allowThirdPartyRootCerts
+            onPreferenceChangeListener = object : SharedPreferenceUpdater() {
+                override fun onPreferenceChange(preference: Preference, newValue: Any?): Boolean {
+                    context.components.core.engine.settings.enterpriseRootsEnabled =
+                        newValue as Boolean
+                    return super.onPreferenceChange(preference, newValue)
+                }
+            }
+        }
     }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
index 518bc3f4f..af76d9945 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
@@ -37,11 +37,12 @@ import mozilla.components.concept.sync.Profile
 import mozilla.components.support.ktx.android.view.showKeyboard
 import org.mozilla.fenix.BrowserDirection
 import org.mozilla.fenix.Config
+import org.mozilla.fenix.FeatureFlags
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
 import org.mozilla.fenix.components.metrics.Event
 import org.mozilla.fenix.experiments.ExperimentBranch
-import org.mozilla.fenix.experiments.Experiments
+import org.mozilla.fenix.experiments.FeatureId
 import org.mozilla.fenix.ext.application
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.getPreferenceKey
@@ -51,6 +52,7 @@ import org.mozilla.fenix.ext.navigateToNotificationsSettings
 import org.mozilla.fenix.ext.requireComponents
 import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.ext.REQUEST_CODE_BROWSER_ROLE
+import org.mozilla.fenix.ext.getVariables
 import org.mozilla.fenix.ext.openSetDefaultBrowserOption
 import org.mozilla.fenix.ext.showToolbar
 import org.mozilla.fenix.ext.withExperiment
@@ -160,7 +162,13 @@ class SettingsFragment : PreferenceFragmentCompat() {
     override fun onResume() {
         super.onResume()
 
-        showToolbar(getString(R.string.settings_title))
+        // Use nimbus to set the title, and a trivial addition
+        val experiments = requireContext().components.analytics.experiments
+        val variables = experiments.getVariables(FeatureId.NIMBUS_VALIDATION)
+        val title = variables.getText("settings-title") ?: getString(R.string.settings_title)
+        val suffix = variables.getString("settings-title-punctuation") ?: ""
+
+        showToolbar("$title$suffix")
 
         // Account UI state is updated as part of `onCreate`. To not do it twice in a row, we only
         // update it here if we're not going through the `onCreate->onStart->onResume` lifecycle chain.
@@ -439,7 +447,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
         with(requireContext().settings()) {
             findPreference<Preference>(
                 getPreferenceKey(R.string.pref_key_credit_cards)
-            )?.isVisible = creditCardsFeature
+            )?.isVisible = FeatureFlags.creditCardsFeature
             findPreference<Preference>(
                 getPreferenceKey(R.string.pref_key_nimbus_experiments)
             )?.isVisible = showSecretDebugMenuThisSession
@@ -588,7 +596,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
 
     private fun isDefaultBrowserExperimentBranch(): Boolean {
         val experiments = context?.components?.analytics?.experiments
-        return experiments?.withExperiment(Experiments.DEFAULT_BROWSER) { experimentBranch ->
+        return experiments?.withExperiment(FeatureId.DEFAULT_BROWSER) { experimentBranch ->
             (experimentBranch == ExperimentBranch.DEFAULT_BROWSER_SETTINGS_MENU)
         } == true
     }
diff --git a/app/src/main/java/org/mozilla/fenix/settings/SyncPreference.kt b/app/src/main/java/org/mozilla/fenix/settings/SyncPreference.kt
new file mode 100644
index 000000000..411936074
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/settings/SyncPreference.kt
@@ -0,0 +1,50 @@
+/* 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/. */
+
+package org.mozilla.fenix.settings
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import androidx.appcompat.widget.SwitchCompat
+import androidx.preference.PreferenceViewHolder
+import androidx.preference.SwitchPreferenceCompat
+import org.mozilla.fenix.R
+
+/**
+ * Variation of [SwitchPreferenceCompat] that uses a custom widgetLayoutResource in order to implement
+ * visibility changes to it.
+ * */
+class SyncPreference @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null
+) : SwitchPreferenceCompat(context, attrs) {
+
+    private var switchView: SwitchCompat? = null
+
+    /**
+     * Whether or not switch's toggle widget is visible.
+     * */
+    var isSwitchWidgetVisible: Boolean = false
+
+    init {
+        widgetLayoutResource = R.layout.preference_sync
+    }
+
+    /**
+     * Updates the switch state.
+     * */
+    internal fun setSwitchCheckedState(isChecked: Boolean) {
+        switchView?.isChecked = isChecked
+    }
+
+    override fun onBindViewHolder(holder: PreferenceViewHolder) {
+        super.onBindViewHolder(holder)
+
+        switchView = holder.findViewById(R.id.switch_widget) as SwitchCompat?
+
+        switchView?.isChecked = isChecked
+        switchView?.visibility = if (isSwitchWidgetVisible) View.VISIBLE else View.INVISIBLE
+    }
+}
diff --git a/app/src/main/java/org/mozilla/fenix/settings/SyncPreferenceView.kt b/app/src/main/java/org/mozilla/fenix/settings/SyncPreferenceView.kt
index 578d1eea3..e117a1a11 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SyncPreferenceView.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/SyncPreferenceView.kt
@@ -5,7 +5,6 @@
 package org.mozilla.fenix.settings
 
 import androidx.lifecycle.LifecycleOwner
-import androidx.preference.Preference
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
 import mozilla.components.concept.sync.AccountObserver
@@ -14,33 +13,33 @@ import mozilla.components.concept.sync.OAuthAccount
 import mozilla.components.service.fxa.SyncEngine
 import mozilla.components.service.fxa.manager.FxaAccountManager
 import mozilla.components.service.fxa.manager.SyncEnginesStorage
-import org.mozilla.fenix.R
 
 /**
  * A view to help manage the sync preference in the "Logins and passwords" and "Credit cards"
  * settings. The provided [syncPreference] is used to navigate to the different fragments
- * that manages the sync account authentication. A summary status will be also added
+ * that manages the sync account authentication. A toggle will be also added
  * depending on the sync account status.
  *
- * @param syncPreference The sync [Preference] to update and handle navigation.
+ * @param syncPreference The sync [SyncPreference] to update and handle navigation.
  * @param lifecycleOwner View lifecycle owner used to determine when to cancel UI jobs.
  * @param accountManager An instance of [FxaAccountManager].
  * @param syncEngine The sync engine that will be used for the sync status lookup.
+ * @param loggedOffTitle Text label for the setting when user is not logged in.
+ * @param loggedInTitle Text label for the setting when user is logged in.
  * @param onSignInToSyncClicked A callback executed when the [syncPreference] is clicked with a
  * preference status of "Sign in to Sync".
- * @param onSyncStatusClicked A callback executed when the [syncPreference] is clicked with a
- * preference status of "On" or "Off".
  * @param onReconnectClicked A callback executed when the [syncPreference] is clicked with a
  * preference status of "Reconnect".
  */
 @Suppress("LongParameterList")
 class SyncPreferenceView(
-    private val syncPreference: Preference,
+    private val syncPreference: SyncPreference,
     lifecycleOwner: LifecycleOwner,
     accountManager: FxaAccountManager,
     private val syncEngine: SyncEngine,
+    private val loggedOffTitle: String,
+    private val loggedInTitle: String,
     private val onSignInToSyncClicked: () -> Unit = {},
-    private val onSyncStatusClicked: () -> Unit = {},
     private val onReconnectClicked: () -> Unit = {}
 ) {
 
@@ -70,49 +69,54 @@ class SyncPreferenceView(
     }
 
     /**
-     * Shows the current status of the sync preference ("On"/"Off") for the logged in user.
+     * Shows a switch toggle for the sync preference when the user is logged in.
      */
     private fun updateSyncPreferenceStatus() {
         syncPreference.apply {
+            isSwitchWidgetVisible = true
+
             val syncEnginesStatus = SyncEnginesStorage(context).getStatus()
-            val loginsSyncStatus = syncEnginesStatus.getOrElse(syncEngine) { false }
+            val syncStatus = syncEnginesStatus.getOrElse(syncEngine) { false }
 
-            summary = context.getString(
-                if (loginsSyncStatus) R.string.preferences_passwords_sync_logins_on
-                else R.string.preferences_passwords_sync_logins_off
-            )
+            title = loggedInTitle
+            isChecked = syncStatus
 
-            setOnPreferenceClickListener {
-                onSyncStatusClicked()
+            setOnPreferenceChangeListener { _, newValue ->
+                SyncEnginesStorage(context).setStatus(syncEngine, newValue as Boolean)
+                setSwitchCheckedState(newValue)
                 true
             }
         }
     }
 
     /**
-     * Display that the user can "Sign in to Sync" when the user is logged off.
+     * Display that the user can sync across devices when the user is logged off.
      */
     private fun updateSyncPreferenceNeedsLogin() {
         syncPreference.apply {
-            summary = context.getString(R.string.preferences_passwords_sync_logins_sign_in)
+            isSwitchWidgetVisible = false
+
+            title = loggedOffTitle
 
-            setOnPreferenceClickListener {
+            setOnPreferenceChangeListener { _, _ ->
                 onSignInToSyncClicked()
-                true
+                false
             }
         }
     }
 
     /**
-     * Displays that the user needs to "Reconnect" to fix their account problems with sync.
+     * Displays the logged off title to prompt the user to to re-authenticate their sync account.
      */
     private fun updateSyncPreferenceNeedsReauth() {
         syncPreference.apply {
-            summary = context.getString(R.string.preferences_passwords_sync_logins_reconnect)
+            isSwitchWidgetVisible = false
 
-            setOnPreferenceClickListener {
+            title = loggedOffTitle
+
+            setOnPreferenceChangeListener { _, _ ->
                 onReconnectClicked()
-                true
+                false
             }
         }
     }
diff --git a/app/src/main/java/org/mozilla/fenix/settings/about/AboutFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/about/AboutFragment.kt
index ba1d7a886..beb70564e 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/about/AboutFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/about/AboutFragment.kt
@@ -25,6 +25,7 @@ import org.mozilla.fenix.crashes.CrashListActivity
 import org.mozilla.fenix.ext.navigateBlockingForAsyncNavGraph
 import org.mozilla.fenix.ext.requireComponents
 import org.mozilla.fenix.ext.settings
+import org.mozilla.fenix.ext.showToolbar
 import org.mozilla.fenix.settings.SupportUtils
 import org.mozilla.fenix.settings.about.AboutItemType.LICENSING_INFO
 import org.mozilla.fenix.settings.about.AboutItemType.PRIVACY_NOTICE
@@ -53,7 +54,7 @@ class AboutFragment : Fragment(), AboutPageListener {
         appName = getString(R.string.app_name)
         headerAppName =
             if (Config.channel.isRelease) getString(R.string.daylight_app_name) else appName
-        activity?.title = getString(R.string.preferences_about, appName)
+        showToolbar(getString(R.string.preferences_about, appName))
 
         return rootView
     }
diff --git a/app/src/main/java/org/mozilla/fenix/settings/account/AccountSettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/account/AccountSettingsFragment.kt
index 655d76e65..6c36b9ff8 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/account/AccountSettingsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/account/AccountSettingsFragment.kt
@@ -35,6 +35,7 @@ import mozilla.components.service.fxa.sync.SyncReason
 import mozilla.components.service.fxa.sync.SyncStatusObserver
 import mozilla.components.service.fxa.sync.getLastSynced
 import mozilla.components.support.ktx.android.content.getColorFromAttr
+import org.mozilla.fenix.FeatureFlags
 import org.mozilla.fenix.R
 import org.mozilla.fenix.components.FenixSnackbar
 import org.mozilla.fenix.components.StoreProvider
@@ -164,44 +165,40 @@ class AccountSettingsFragment : PreferenceFragmentCompat() {
         updateSyncEngineStates()
         setDisabledWhileSyncing(accountManager.isSyncActive())
 
-        fun updateSyncEngineState(context: Context, engine: SyncEngine, newState: Boolean) {
-            SyncEnginesStorage(context).setStatus(engine, newState)
-            viewLifecycleOwner.lifecycleScope.launch {
-                context.components.backgroundServices.accountManager.syncNow(SyncReason.EngineChange)
-            }
-        }
-
         fun SyncEngine.prefId(): Int = when (this) {
             SyncEngine.History -> R.string.pref_key_sync_history
             SyncEngine.Bookmarks -> R.string.pref_key_sync_bookmarks
             SyncEngine.Passwords -> R.string.pref_key_sync_logins
             SyncEngine.Tabs -> R.string.pref_key_sync_tabs
+            SyncEngine.CreditCards -> R.string.pref_key_sync_credit_cards
+            SyncEngine.Addresses -> R.string.pref_key_sync_address
             else -> throw IllegalStateException("Accessing internal sync engines")
         }
 
-        listOf(SyncEngine.History, SyncEngine.Bookmarks, SyncEngine.Tabs).forEach {
+        listOf(
+            SyncEngine.History,
+            SyncEngine.Bookmarks,
+            SyncEngine.Tabs,
+            SyncEngine.Addresses
+        ).forEach {
             requirePreference<CheckBoxPreference>(it.prefId()).apply {
                 setOnPreferenceChangeListener { _, newValue ->
-                    updateSyncEngineState(context, it, newValue as Boolean)
+                    updateSyncEngineState(it, newValue as Boolean)
                     true
                 }
             }
         }
 
-        // 'Passwords' listener is special, since we also display a pin protection warning.
-        requirePreference<CheckBoxPreference>(SyncEngine.Passwords.prefId()).apply {
-            setOnPreferenceChangeListener { _, newValue ->
-                val manager =
-                    activity?.getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
-                if (manager.isKeyguardSecure ||
-                    newValue == false ||
-                    !context.settings().shouldShowSecurityPinWarningSync
-                ) {
-                    updateSyncEngineState(context, SyncEngine.Passwords, newValue as Boolean)
-                } else {
-                    showPinDialogWarning(newValue as Boolean)
+        // 'Passwords' and 'Credit card' listeners are special, since we also display a pin protection warning.
+        listOf(
+            SyncEngine.Passwords,
+            SyncEngine.CreditCards
+        ).forEach {
+            requirePreference<CheckBoxPreference>(it.prefId()).apply {
+                setOnPreferenceChangeListener { _, newValue ->
+                    updateSyncEngineStateWithPinWarning(it, newValue as Boolean)
+                    true
                 }
-                true
             }
         }
 
@@ -218,7 +215,57 @@ class AccountSettingsFragment : PreferenceFragmentCompat() {
         )
     }
 
-    private fun showPinDialogWarning(newValue: Boolean) {
+    /**
+     * Prompts the user if they do not have a password/pin set up to secure their device, and
+     * updates the state of the sync engine with the new checkbox value.
+     *
+     * Currently used for logins and credit cards.
+     *
+     * @param syncEngine the sync engine whose preference has changed.
+     * @param newValue the value denoting whether or not to sync the specified preference.
+     */
+    private fun updateSyncEngineStateWithPinWarning(
+        syncEngine: SyncEngine,
+        newValue: Boolean
+    ) {
+        val manager = activity?.getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
+
+        if (manager.isKeyguardSecure ||
+            !newValue ||
+            !requireContext().settings().shouldShowSecurityPinWarningSync
+        ) {
+            updateSyncEngineState(syncEngine, newValue)
+        } else {
+            showPinDialogWarning(syncEngine, newValue)
+        }
+    }
+
+    /**
+     * Updates the sync engine status with the new state of the preference and triggers a sync
+     * event.
+     *
+     * @param engine the sync engine whose preference has changed.
+     * @param newValue the new value of the sync preference, where true indicates sync for that
+     * preference and false indicates not synced.
+     */
+    private fun updateSyncEngineState(engine: SyncEngine, newValue: Boolean) {
+        SyncEnginesStorage(requireContext()).setStatus(engine, newValue)
+        viewLifecycleOwner.lifecycleScope.launch {
+            requireContext().components.backgroundServices.accountManager.syncNow(SyncReason.EngineChange)
+        }
+    }
+
+    /**
+     * Creates and shows a warning dialog that prompts the user to create a pin/password to
+     * secure their device when none is detected. The user has the option to continue with
+     * updating their sync preferences (updates the [SyncEngine] state) or navigating to
+     * device security settings to create a pin/password.
+     *
+     * @param syncEngine the sync engine whose preference has changed.
+     * @param newValue the new value of the sync preference, where true indicates sync for that
+     * preference and false indicates not synced.
+     */
+    private fun showPinDialogWarning(syncEngine: SyncEngine, newValue: Boolean) {
         context?.let {
             AlertDialog.Builder(it).apply {
                 setTitle(getString(R.string.logins_warning_dialog_title))
@@ -227,11 +274,7 @@ class AccountSettingsFragment : PreferenceFragmentCompat() {
                 )
 
                 setNegativeButton(getString(R.string.logins_warning_dialog_later)) { _: DialogInterface, _ ->
-                    SyncEnginesStorage(context).setStatus(SyncEngine.Passwords, newValue)
-                    // Use fragment's lifecycle; the view may be gone by the time dialog is interacted with.
-                    lifecycleScope.launch {
-                        context.components.backgroundServices.accountManager.syncNow(SyncReason.EngineChange)
-                    }
+                    updateSyncEngineState(syncEngine, newValue)
                 }
 
                 setPositiveButton(getString(R.string.logins_warning_dialog_set_up_now)) { it: DialogInterface, _ ->
@@ -247,12 +290,20 @@ class AccountSettingsFragment : PreferenceFragmentCompat() {
         }
     }
 
+    /**
+     * Updates the status of all [SyncEngine] states.
+     */
     private fun updateSyncEngineStates() {
         val syncEnginesStatus = SyncEnginesStorage(requireContext()).getStatus()
         requirePreference<CheckBoxPreference>(R.string.pref_key_sync_bookmarks).apply {
             isEnabled = syncEnginesStatus.containsKey(SyncEngine.Bookmarks)
             isChecked = syncEnginesStatus.getOrElse(SyncEngine.Bookmarks) { true }
         }
+        requirePreference<CheckBoxPreference>(R.string.pref_key_sync_credit_cards).apply {
+            isVisible = FeatureFlags.creditCardsFeature
+            isEnabled = syncEnginesStatus.containsKey(SyncEngine.CreditCards)
+            isChecked = syncEnginesStatus.getOrElse(SyncEngine.CreditCards) { true }
+        }
         requirePreference<CheckBoxPreference>(R.string.pref_key_sync_history).apply {
             isEnabled = syncEnginesStatus.containsKey(SyncEngine.History)
             isChecked = syncEnginesStatus.getOrElse(SyncEngine.History) { true }
@@ -265,8 +316,17 @@ class AccountSettingsFragment : PreferenceFragmentCompat() {
             isEnabled = syncEnginesStatus.containsKey(SyncEngine.Tabs)
             isChecked = syncEnginesStatus.getOrElse(SyncEngine.Tabs) { true }
         }
+        requirePreference<CheckBoxPreference>(R.string.pref_key_sync_address).apply {
+            isVisible = FeatureFlags.addressesFeature
+            isEnabled = syncEnginesStatus.containsKey(SyncEngine.Addresses)
+            isChecked = syncEnginesStatus.getOrElse(SyncEngine.Addresses) { true }
+        }
     }
 
+    /**
+     * Manual sync triggered by the user. This also checks account authentication and refreshes the
+     * device list.
+     */
     private fun syncNow() {
         viewLifecycleOwner.lifecycleScope.launch {
             requireComponents.analytics.metrics.track(Event.SyncAccountSyncNow)
@@ -281,8 +341,13 @@ class AccountSettingsFragment : PreferenceFragmentCompat() {
         }
     }
 
-    private fun syncDeviceName(newValue: String): Boolean {
-        if (newValue.trim().isEmpty()) {
+    /**
+     * Takes a non-empty value and sets the device name. May fail due to authentication.
+     *
+     * @param newDeviceName the new name of the device. Cannot be an empty string.
+     */
+    private fun syncDeviceName(newDeviceName: String): Boolean {
+        if (newDeviceName.trim().isEmpty()) {
             return false
         }
         // This may fail, and we'll have a disparity in the UI until `updateDeviceName` is called.
@@ -290,7 +355,7 @@ class AccountSettingsFragment : PreferenceFragmentCompat() {
             context?.let {
                 accountManager.authenticatedAccount()
                     ?.deviceConstellation()
-                    ?.setDeviceName(newValue, it)
+                    ?.setDeviceName(newDeviceName, it)
             }
         }
         return true
@@ -409,6 +474,5 @@ class AccountSettingsFragment : PreferenceFragmentCompat() {
 
     companion object {
         private const val DEVICE_NAME_MAX_LENGTH = 128
-        private const val DEVICE_NAME_EDIT_TEXT_MIN_HEIGHT_DP = 48
     }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/settings/advanced/LocaleViewHolders.kt b/app/src/main/java/org/mozilla/fenix/settings/advanced/LocaleViewHolders.kt
index 3163e9fe3..35cc659bf 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/advanced/LocaleViewHolders.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/advanced/LocaleViewHolders.kt
@@ -77,7 +77,7 @@ class LocaleViewHolder(
             "ca" to "Català",
             "cak" to "Kaqchikel",
             "ceb" to "Cebuano",
-            "co" to "Corsu, ",
+            "co" to "Corsu",
             "cs" to "čeština",
             "cy" to "Cymraeg",
             "da" to "dansk",
@@ -99,7 +99,7 @@ class LocaleViewHolder(
             "gn" to "Avañe'ẽ",
             "gu-IN" to "ગુજરાતી",
             "he" to "עברית",
-            "hi-IN" to "हिन्दी ",
+            "hi-IN" to "हिन्दी",
             "hil" to "Ilonggo",
             "hr" to "hrvatski jezik",
             "hsb" to "Hornjoserbsce",
@@ -216,7 +216,7 @@ class LocaleViewHolder(
             "it" to "Italian",
             "ja" to "Japanese",
             "ka" to "Georgian",
-            "kab" to "Kabyle ",
+            "kab" to "Kabyle",
             "kk" to "Kazakh",
             "kmr" to "Kurmanji Kurdish",
             "kn" to "Kannada",
@@ -230,7 +230,7 @@ class LocaleViewHolder(
             "ms" to "Malay",
             "my" to "Burmese",
             "nb-NO" to "Norwegian Bokmål",
-            "ne-NP" to "Nepali ",
+            "ne-NP" to "Nepali",
             "nl" to "Dutch, Flemish",
             "nn-NO" to "Norwegian Nynorsk",
             "nv" to "Navajo, Navaho",
diff --git a/app/src/main/java/org/mozilla/fenix/settings/biometric/BiometricPromptPreferenceFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/biometric/BiometricPromptPreferenceFragment.kt
new file mode 100644
index 000000000..7470d50e2
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/settings/biometric/BiometricPromptPreferenceFragment.kt
@@ -0,0 +1,120 @@
+/* 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/. */
+
+package org.mozilla.fenix.settings.biometric
+
+import android.app.Activity.RESULT_OK
+import android.app.KeyguardManager
+import android.content.Context
+import android.content.Intent
+import android.view.View
+import androidx.core.content.getSystemService
+import androidx.preference.Preference
+import androidx.preference.PreferenceFragmentCompat
+import mozilla.components.support.base.feature.ViewBoundFeatureWrapper
+import org.mozilla.fenix.ext.settings
+import org.mozilla.fenix.settings.requirePreference
+
+/**
+ * Helper for creating and implementing the [BiometricPromptFeature]. Currently used
+ * for logins and credit cards.
+ */
+abstract class BiometricPromptPreferenceFragment : PreferenceFragmentCompat() {
+
+    private val biometricPromptFeature = ViewBoundFeatureWrapper<BiometricPromptFeature>()
+
+    /**
+     * Gets the string to be used for [BiometricPromptFeature.requestAuthentication] prompting to
+     * unlock the device.
+     */
+    abstract fun unlockMessage(): String
+
+    /**
+     * Navigate when authentication is successful.
+     */
+    abstract fun navigateOnSuccess()
+
+    /**
+     * Shows a dialog warning to set up a pin/password when the device is not secured. This is
+     * only used when BiometricPrompt is unavailable on the device.
+     */
+    abstract fun showPinDialogWarning(context: Context)
+
+    /**
+     * Toggle preferences to enable or disable navigation during authentication flows.
+     *
+     * @param prefList a list of [Preference]s to toggle.
+     * @param enabled whether or not the preferences should be enabled.
+     */
+    fun togglePrefsEnabled(prefList: List<Int>, enabled: Boolean) {
+        for (preference in prefList) {
+            requirePreference<Preference>(preference).isEnabled = enabled
+        }
+    }
+
+    /**
+     * Creates a prompt to verify the device's pin/password and start activity based on the result.
+     * This is only used when BiometricPrompt is unavailable on the device.
+     */
+    @Suppress("Deprecation")
+    abstract fun showPinVerification(manager: KeyguardManager)
+
+    /**
+     * Sets the biometric prompt feature.
+     *
+     * @param view the view that the prompt will be associate with.
+     * @param prefList a list of [Preference]s to toggle.
+     */
+    fun setBiometricPrompt(view: View, prefList: List<Int>) {
+        biometricPromptFeature.set(
+            feature = BiometricPromptFeature(
+                context = requireContext(),
+                fragment = this,
+                onAuthFailure = {
+                    togglePrefsEnabled(prefList, true)
+                },
+                onAuthSuccess = ::navigateOnSuccess
+            ),
+            owner = this,
+            view = view
+        )
+    }
+
+    /**
+     * Use [BiometricPromptFeature] or [KeyguardManager] to confirm device security.
+     *
+     * @param prefList a list of [Preference]s to disable while authentication is happening.
+     */
+    fun verifyCredentialsOrShowSetupWarning(context: Context, prefList: List<Int>) {
+        // Use the BiometricPrompt if available
+        if (BiometricPromptFeature.canUseFeature(context)) {
+            togglePrefsEnabled(prefList, false)
+            biometricPromptFeature.get()?.requestAuthentication(unlockMessage())
+            return
+        }
+
+        // Fallback to prompting for password with the KeyguardManager
+        val manager = context.getSystemService<KeyguardManager>()
+        if (manager?.isKeyguardSecure == true) {
+            showPinVerification(manager)
+        } else {
+            // Warn that the device has not been secured
+            if (context.settings().shouldShowSecurityPinWarning) {
+                showPinDialogWarning(context)
+            } else {
+                navigateOnSuccess()
+            }
+        }
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        if (requestCode == PIN_REQUEST && resultCode == RESULT_OK) {
+            navigateOnSuccess()
+        }
+    }
+
+    companion object {
+        const val PIN_REQUEST = 303
+    }
+}
diff --git a/app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardEditorFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardEditorFragment.kt
index 91b9ac8ce..c47f874a2 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardEditorFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardEditorFragment.kt
@@ -9,15 +9,14 @@ import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
-import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
-import kotlinx.android.synthetic.main.fragment_credit_card_editor.*
-import mozilla.components.concept.storage.UpdatableCreditCardFields
-import mozilla.components.support.ktx.android.view.hideKeyboard
 import org.mozilla.fenix.R
+import org.mozilla.fenix.SecureFragment
 import org.mozilla.fenix.ext.components
+import org.mozilla.fenix.ext.redirectToReAuth
+import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.ext.showToolbar
 import org.mozilla.fenix.settings.creditcards.controller.DefaultCreditCardEditorController
 import org.mozilla.fenix.settings.creditcards.interactor.CreditCardEditorInteractor
@@ -27,7 +26,11 @@ import org.mozilla.fenix.settings.creditcards.view.CreditCardEditorView
 /**
  * Display a credit card editor for adding and editing a credit card.
  */
-class CreditCardEditorFragment : Fragment(R.layout.fragment_credit_card_editor) {
+class CreditCardEditorFragment : SecureFragment(R.layout.fragment_credit_card_editor) {
+
+    private lateinit var creditCardEditorState: CreditCardEditorState
+    private lateinit var creditCardEditorView: CreditCardEditorView
+    private lateinit var menu: Menu
 
     private val args by navArgs<CreditCardEditorFragmentArgs>()
 
@@ -50,48 +53,53 @@ class CreditCardEditorFragment : Fragment(R.layout.fragment_credit_card_editor)
             showToolbar(getString(R.string.credit_cards_edit_card))
         }
 
+        val storage = requireContext().components.core.autofillStorage
         interactor = DefaultCreditCardEditorInteractor(
             controller = DefaultCreditCardEditorController(
-                storage = requireContext().components.core.autofillStorage,
+                storage = storage,
                 lifecycleScope = lifecycleScope,
-                navController = findNavController()
+                navController = findNavController(),
+                settings = requireContext().settings()
             )
         )
 
-        val creditCardEditorState =
-            args.creditCard?.toCreditCardEditorState() ?: getInitialCreditCardEditorState()
-        CreditCardEditorView(view, interactor).bind(creditCardEditorState)
+        creditCardEditorState =
+            args.creditCard?.toCreditCardEditorState(storage) ?: getInitialCreditCardEditorState()
+        creditCardEditorView = CreditCardEditorView(view, interactor)
+        creditCardEditorView.bind(creditCardEditorState)
+    }
+
+    /**
+     * Close any open dialogs or menus and reauthenticate if the fragment is paused and
+     * the user is not navigating to [CreditCardsManagementFragment].
+     */
+    override fun onPause() {
+        menu.close()
+
+        redirectToReAuth(
+            listOf(R.id.creditCardsManagementFragment),
+            findNavController().currentDestination?.id,
+            R.id.creditCardEditorFragment
+        )
+
+        super.onPause()
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         inflater.inflate(R.menu.credit_card_editor, menu)
+        this.menu = menu
 
         menu.findItem(R.id.delete_credit_card_button).isVisible = isEditing
     }
 
+    @Suppress("MagicNumber")
     override fun onOptionsItemSelected(item: MenuItem): Boolean = when (item.itemId) {
         R.id.delete_credit_card_button -> {
             args.creditCard?.let { interactor.onDeleteCardButtonClicked(it.guid) }
             true
         }
         R.id.save_credit_card_button -> {
-            view?.hideKeyboard()
-
-            val creditCard = args.creditCard
-            val creditCardFields = UpdatableCreditCardFields(
-                billingName = name_on_card_input.text.toString(),
-                cardNumber = card_number_input.text.toString(),
-                expiryMonth = (expiry_month_drop_down.selectedItemPosition + 1).toLong(),
-                expiryYear = expiry_year_drop_down.selectedItem.toString().toLong(),
-                cardType = CARD_TYPE_PLACEHOLDER
-            )
-
-            if (creditCard != null) {
-                interactor.onUpdateCreditCard(creditCard.guid, creditCardFields)
-            } else {
-                interactor.onSaveCreditCard(creditCardFields)
-            }
-
+            creditCardEditorView.saveCreditCard(creditCardEditorState)
             true
         }
         else -> false
@@ -100,9 +108,5 @@ class CreditCardEditorFragment : Fragment(R.layout.fragment_credit_card_editor)
     companion object {
         // Number of years to show in the expiry year dropdown.
         const val NUMBER_OF_YEARS_TO_SHOW = 10
-
-        // Placeholder for the card type. This will be replaced when we can identify the card type.
-        // This is dependent on https://github.com/mozilla-mobile/android-components/issues/9813.
-        const val CARD_TYPE_PLACEHOLDER = ""
     }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardEditorState.kt b/app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardEditorState.kt
index ed9c62747..f3fc4c0c3 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardEditorState.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardEditorState.kt
@@ -5,6 +5,7 @@
 package org.mozilla.fenix.settings.creditcards
 
 import mozilla.components.concept.storage.CreditCard
+import mozilla.components.service.sync.autofill.AutofillCreditCardsAddressesStorage
 import org.mozilla.fenix.settings.creditcards.CreditCardEditorFragment.Companion.NUMBER_OF_YEARS_TO_SHOW
 import java.util.Calendar
 
@@ -30,7 +31,10 @@ data class CreditCardEditorState(
 /**
  * Returns a [CreditCardEditorState] from the given [CreditCard].
  */
-fun CreditCard.toCreditCardEditorState(): CreditCardEditorState {
+fun CreditCard.toCreditCardEditorState(storage: AutofillCreditCardsAddressesStorage): CreditCardEditorState {
+    val crypto = storage.getCreditCardCrypto()
+    val key = crypto.key()
+    val cardNumber = crypto.decrypt(key, encryptedCardNumber)?.number ?: ""
     val startYear = expiryYear.toInt()
     val endYear = startYear + NUMBER_OF_YEARS_TO_SHOW
 
diff --git a/app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardsManagementFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardsManagementFragment.kt
index be0ceaffa..e54f42e2a 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardsManagementFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardsManagementFragment.kt
@@ -8,7 +8,6 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import kotlinx.android.synthetic.main.fragment_saved_cards.view.*
@@ -17,8 +16,10 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.launch
 import mozilla.components.lib.state.ext.consumeFrom
 import org.mozilla.fenix.R
+import org.mozilla.fenix.SecureFragment
 import org.mozilla.fenix.components.StoreProvider
 import org.mozilla.fenix.ext.components
+import org.mozilla.fenix.ext.redirectToReAuth
 import org.mozilla.fenix.ext.showToolbar
 import org.mozilla.fenix.settings.creditcards.controller.DefaultCreditCardsManagementController
 import org.mozilla.fenix.settings.creditcards.interactor.CreditCardsManagementInteractor
@@ -28,7 +29,7 @@ import org.mozilla.fenix.settings.creditcards.view.CreditCardsManagementView
 /**
  * Displays a list of saved credit cards.
  */
-class CreditCardsManagementFragment : Fragment() {
+class CreditCardsManagementFragment : SecureFragment() {
 
     private lateinit var creditCardsStore: CreditCardsFragmentStore
     private lateinit var interactor: CreditCardsManagementInteractor
@@ -61,6 +62,11 @@ class CreditCardsManagementFragment : Fragment() {
     @ExperimentalCoroutinesApi
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         consumeFrom(creditCardsStore) { state ->
+            if (!state.isLoading && state.creditCards.isEmpty()) {
+                findNavController().popBackStack()
+                return@consumeFrom
+            }
+
             creditCardsView.update(state)
         }
     }
@@ -70,6 +76,20 @@ class CreditCardsManagementFragment : Fragment() {
         showToolbar(getString(R.string.credit_cards_saved_cards))
     }
 
+    /**
+     * When the fragment is paused, navigate back to the settings page to reauthenticate.
+     */
+    override fun onPause() {
+        // Don't redirect if the user is navigating to the credit card editor fragment.
+        redirectToReAuth(
+            listOf(R.id.creditCardEditorFragment),
+            findNavController().currentDestination?.id,
+            R.id.creditCardsManagementFragment
+        )
+
+        super.onPause()
+    }
+
     /**
      * Fetches all the credit cards from the autofill storage and updates the
      * [CreditCardsFragmentStore] with the list of credit cards.
diff --git a/app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardsSettingFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardsSettingFragment.kt
index bcb197137..8838c57de 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardsSettingFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardsSettingFragment.kt
@@ -4,27 +4,115 @@
 
 package org.mozilla.fenix.settings.creditcards
 
+import android.app.KeyguardManager
+import android.content.Context
+import android.content.DialogInterface
+import android.content.Intent
 import android.os.Bundle
+import android.provider.Settings
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.annotation.VisibleForTesting
+import androidx.appcompat.app.AlertDialog
+import androidx.lifecycle.lifecycleScope
+import androidx.navigation.NavController
 import androidx.navigation.fragment.findNavController
 import androidx.preference.Preference
-import androidx.preference.PreferenceFragmentCompat
+import androidx.preference.SwitchPreference
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import mozilla.components.lib.state.ext.consumeFrom
 import mozilla.components.service.fxa.SyncEngine
+import org.mozilla.fenix.NavGraphDirections
 import org.mozilla.fenix.R
-import org.mozilla.fenix.ext.getPreferenceKey
+import org.mozilla.fenix.components.StoreProvider
 import org.mozilla.fenix.ext.navigateBlockingForAsyncNavGraph
 import org.mozilla.fenix.ext.requireComponents
+import org.mozilla.fenix.ext.settings
+import org.mozilla.fenix.ext.runIfFragmentIsAttached
+import org.mozilla.fenix.ext.secure
 import org.mozilla.fenix.ext.showToolbar
+import org.mozilla.fenix.settings.SharedPreferenceUpdater
 import org.mozilla.fenix.settings.SyncPreferenceView
+import org.mozilla.fenix.settings.biometric.BiometricPromptFeature
+import org.mozilla.fenix.settings.biometric.BiometricPromptPreferenceFragment
 import org.mozilla.fenix.settings.requirePreference
 
 /**
  * "Credit cards" settings fragment displays a list of settings related to autofilling, adding and
- * syncing credit cards.
+ * syncing credit cards. Authentication for saved credit cards uses [BiometricPromptFeature]
+ * or [KeyguardManager].
  */
-class CreditCardsSettingFragment : PreferenceFragmentCompat() {
+@SuppressWarnings("TooManyFunctions")
+class CreditCardsSettingFragment : BiometricPromptPreferenceFragment() {
+
+    private lateinit var creditCardsStore: CreditCardsFragmentStore
+    private var isCreditCardsListLoaded: Boolean = false
+
+    /**
+     * List of preferences to be enabled or disabled during authentication.
+     */
+    private val creditCardPreferences: List<Int> = listOf(
+        R.string.pref_key_credit_cards_save_and_autofill_cards,
+        R.string.pref_key_credit_cards_sync_cards_across_devices,
+        R.string.pref_key_credit_cards_manage_cards
+    )
+
+    override fun unlockMessage() = getString(R.string.credit_cards_biometric_prompt_message)
+
+    override fun navigateOnSuccess() {
+        runIfFragmentIsAttached {
+            viewLifecycleOwner.lifecycleScope.launch(Dispatchers.Main) {
+                // Workaround for likely biometric library bug
+                // https://github.com/mozilla-mobile/fenix/issues/8438
+                delay(SHORT_DELAY_MS)
+                navigateToCreditCardManagementFragment()
+            }
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        creditCardsStore = StoreProvider.get(this) {
+            CreditCardsFragmentStore(CreditCardsListState(creditCards = emptyList()))
+        }
+        loadCreditCards()
+    }
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         setPreferencesFromResource(R.xml.credit_cards_preferences, rootKey)
+
+        requirePreference<SwitchPreference>(R.string.pref_key_credit_cards_save_and_autofill_cards).apply {
+            isChecked = context.settings().shouldAutofillCreditCardDetails
+            onPreferenceChangeListener = SharedPreferenceUpdater()
+        }
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        loadCreditCards()
+        return super.onCreateView(inflater, container, savedInstanceState)
+    }
+
+    @ExperimentalCoroutinesApi
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        consumeFrom(creditCardsStore) { state ->
+            updateCardManagementPreference(state.creditCards.isNotEmpty(), findNavController())
+        }
+
+        setBiometricPrompt(view, creditCardPreferences)
+    }
+
+    override fun onPause() {
+        super.onPause()
+        isCreditCardsListLoaded = false
     }
 
     override fun onResume() {
@@ -36,42 +124,126 @@ class CreditCardsSettingFragment : PreferenceFragmentCompat() {
             syncPreference = requirePreference(R.string.pref_key_credit_cards_sync_cards_across_devices),
             lifecycleOwner = viewLifecycleOwner,
             accountManager = requireComponents.backgroundServices.accountManager,
-            syncEngine = SyncEngine.Passwords,
+            syncEngine = SyncEngine.CreditCards,
+            loggedOffTitle = requireContext()
+                .getString(R.string.preferences_credit_cards_sync_cards_across_devices),
+            loggedInTitle = requireContext()
+                .getString(R.string.preferences_credit_cards_sync_cards),
             onSignInToSyncClicked = {
-                val directions =
-                    CreditCardsSettingFragmentDirections.actionCreditCardsSettingFragmentToTurnOnSyncFragment()
-                findNavController().navigateBlockingForAsyncNavGraph(directions)
-            },
-            onSyncStatusClicked = {
-                val directions =
-                    CreditCardsSettingFragmentDirections.actionGlobalAccountSettingsFragment()
-                findNavController().navigateBlockingForAsyncNavGraph(directions)
+                findNavController().navigateBlockingForAsyncNavGraph(
+                    NavGraphDirections.actionGlobalTurnOnSync()
+                )
             },
             onReconnectClicked = {
-                val directions =
+                findNavController().navigateBlockingForAsyncNavGraph(
                     CreditCardsSettingFragmentDirections.actionGlobalAccountProblemFragment()
-                findNavController().navigateBlockingForAsyncNavGraph(directions)
+                )
             }
         )
+
+        togglePrefsEnabled(creditCardPreferences, true)
     }
 
-    @Suppress("MaxLineLength")
-    override fun onPreferenceTreeClick(preference: Preference): Boolean {
-        when (preference.key) {
-            getPreferenceKey(R.string.pref_key_credit_cards_add_credit_card) -> {
-                val directions =
+    /**
+     * Updates preferences visibility depending on credit cards being already saved or not.
+     */
+    @VisibleForTesting
+    internal fun updateCardManagementPreference(
+        hasCreditCards: Boolean,
+        navController: NavController
+    ) {
+        val manageSavedCardsPreference =
+            requirePreference<Preference>(R.string.pref_key_credit_cards_manage_cards)
+
+        if (hasCreditCards) {
+            manageSavedCardsPreference.icon = null
+            manageSavedCardsPreference.title =
+                getString(R.string.preferences_credit_cards_manage_saved_cards)
+        } else {
+            manageSavedCardsPreference.setIcon(R.drawable.ic_new)
+            manageSavedCardsPreference.title =
+                getString(R.string.preferences_credit_cards_add_credit_card)
+        }
+
+        manageSavedCardsPreference.setOnPreferenceClickListener {
+            if (hasCreditCards) {
+                verifyCredentialsOrShowSetupWarning(requireContext(), creditCardPreferences)
+            } else {
+                navController.navigateBlockingForAsyncNavGraph(
                     CreditCardsSettingFragmentDirections
                         .actionCreditCardsSettingFragmentToCreditCardEditorFragment()
-                findNavController().navigateBlockingForAsyncNavGraph(directions)
+                )
             }
-            getPreferenceKey(R.string.pref_key_credit_cards_manage_saved_cards) -> {
-                val directions =
-                    CreditCardsSettingFragmentDirections
-                        .actionCreditCardsSettingFragmentToCreditCardsManagementFragment()
-                findNavController().navigateBlockingForAsyncNavGraph(directions)
+            super.onPreferenceTreeClick(it)
+        }
+    }
+
+    /**
+     * Fetches all the credit cards from autofillStorage and updates the [CreditCardsListState]
+     * with the list of credit cards.
+     */
+    private fun loadCreditCards() {
+        if (isCreditCardsListLoaded) {
+            return
+        }
+
+        lifecycleScope.launch(Dispatchers.IO) {
+            val creditCards = requireComponents.core.autofillStorage.getAllCreditCards()
+            lifecycleScope.launch(Dispatchers.Main) {
+                creditCardsStore.dispatch(CreditCardsAction.UpdateCreditCards(creditCards))
             }
         }
 
-        return super.onPreferenceTreeClick(preference)
+        isCreditCardsListLoaded = true
+    }
+
+    /**
+     * Shows a dialog warning to set up a pin/password when the device is not secured. This is
+     * only used when BiometricPrompt is unavailable on the device.
+     */
+    override fun showPinDialogWarning(context: Context) {
+        AlertDialog.Builder(context).apply {
+            setTitle(getString(R.string.credit_cards_warning_dialog_title))
+            setMessage(getString(R.string.credit_cards_warning_dialog_message))
+
+            setNegativeButton(getString(R.string.credit_cards_warning_dialog_later)) { _: DialogInterface, _ ->
+                navigateToCreditCardManagementFragment()
+            }
+
+            setPositiveButton(getString(R.string.credit_cards_warning_dialog_set_up_now)) { it: DialogInterface, _ ->
+                it.dismiss()
+                val intent = Intent(Settings.ACTION_SECURITY_SETTINGS)
+                startActivity(intent)
+            }
+
+            create()
+        }.show().secure(activity)
+        context.settings().incrementSecureWarningCount()
+    }
+
+    /**
+     * Shows a prompt to verify the device's pin/password and start activity based on the result.
+     * This is only used when BiometricPrompt is unavailable on the device.
+     *
+     * @param manager The device [KeyguardManager]
+     */
+    @Suppress("Deprecation")
+    override fun showPinVerification(manager: KeyguardManager) {
+        val intent = manager.createConfirmDeviceCredentialIntent(
+            getString(R.string.credit_cards_biometric_prompt_message_pin),
+            getString(R.string.credit_cards_biometric_prompt_message)
+        )
+        startActivityForResult(intent, BiometricPromptPreferenceFragment.PIN_REQUEST)
+    }
+
+    private fun navigateToCreditCardManagementFragment() {
+        val directions =
+            CreditCardsSettingFragmentDirections
+                .actionCreditCardsSettingFragmentToCreditCardsManagementFragment()
+        findNavController().navigateBlockingForAsyncNavGraph(directions)
+    }
+
+    companion object {
+        const val SHORT_DELAY_MS = 100L
     }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/settings/creditcards/String.kt b/app/src/main/java/org/mozilla/fenix/settings/creditcards/String.kt
new file mode 100644
index 000000000..0702b6c5f
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/settings/creditcards/String.kt
@@ -0,0 +1,57 @@
+/* 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/. */
+
+package org.mozilla.fenix.settings.creditcards
+
+import androidx.annotation.VisibleForTesting
+import mozilla.components.support.utils.creditCardIIN
+
+// Number of last digits to be shown when credit card number is obfuscated.
+private const val LAST_VISIBLE_DIGITS_COUNT = 4
+
+/**
+ * Strips characters other than digits from a string.
+ * Used to strip a credit card number user input of spaces and separators.
+ */
+fun String.toCreditCardNumber(): String {
+    return this.filter { it.isDigit() }
+}
+
+/**
+ * Returns the last 4 digits from a formatted credit card number string.
+ */
+fun String.last4Digits(): String {
+    return this.takeLast(LAST_VISIBLE_DIGITS_COUNT)
+}
+
+/**
+ * Returns true if the provided string is a valid credit card by checking if it has a matching
+ * credit card issuer network passes the Luhn Algorithm, and false otherwise.
+ */
+fun String.validateCreditCardNumber(): Boolean {
+    val creditCardNumber = this.toCreditCardNumber()
+
+    if (creditCardNumber != this || creditCardNumber.creditCardIIN() == null) {
+        return false
+    }
+
+    return luhnAlgorithmValidation(creditCardNumber)
+}
+
+/**
+ * Implementation of Luhn Algorithm validation (https://en.wikipedia.org/wiki/Luhn_algorithm)
+ */
+@Suppress("MagicNumber")
+@VisibleForTesting
+internal fun luhnAlgorithmValidation(creditCardNumber: String): Boolean {
+    var checksum = 0
+    val reversedCardNumber = creditCardNumber.reversed()
+
+    for (index in reversedCardNumber.indices) {
+        val digit = Character.getNumericValue(reversedCardNumber[index])
+        checksum += if (index % 2 == 0) digit else (digit * 2).let { (it / 10) + (it % 10) }
+    }
+
+    return (checksum % 10) == 0
+}
diff --git a/app/src/main/java/org/mozilla/fenix/settings/creditcards/controller/CreditCardEditorController.kt b/app/src/main/java/org/mozilla/fenix/settings/creditcards/controller/CreditCardEditorController.kt
index bfa6ca66b..71e8175ec 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/creditcards/controller/CreditCardEditorController.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/creditcards/controller/CreditCardEditorController.kt
@@ -9,10 +9,12 @@ import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import mozilla.components.concept.storage.NewCreditCardFields
 import mozilla.components.concept.storage.UpdatableCreditCardFields
 import mozilla.components.service.sync.autofill.AutofillCreditCardsAddressesStorage
 import org.mozilla.fenix.settings.creditcards.CreditCardEditorFragment
 import org.mozilla.fenix.settings.creditcards.interactor.CreditCardEditorInteractor
+import org.mozilla.fenix.utils.Settings
 
 /**
  * [CreditCardEditorFragment] controller. An interface that handles the view manipulation of the
@@ -33,7 +35,7 @@ interface CreditCardEditorController {
     /**
      * @see [CreditCardEditorInteractor.onSaveCreditCard]
      */
-    fun handleSaveCreditCard(creditCardFields: UpdatableCreditCardFields)
+    fun handleSaveCreditCard(creditCardFields: NewCreditCardFields)
 
     /**
      * @see [CreditCardEditorInteractor.onUpdateCreditCard]
@@ -48,12 +50,14 @@ interface CreditCardEditorController {
  * credit cards.
  * @param lifecycleScope [CoroutineScope] scope to launch coroutines.
  * @param navController [NavController] used for navigation.
+ * @param settings [Settings] application settings.
  * @param ioDispatcher [CoroutineDispatcher] used for executing async tasks. Defaults to [Dispatchers.IO].
  */
 class DefaultCreditCardEditorController(
     private val storage: AutofillCreditCardsAddressesStorage,
     private val lifecycleScope: CoroutineScope,
     private val navController: NavController,
+    private val settings: Settings,
     private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO
 ) : CreditCardEditorController {
 
@@ -62,6 +66,8 @@ class DefaultCreditCardEditorController(
     }
 
     override fun handleDeleteCreditCard(guid: String) {
+        settings.creditCardsDeletedCount += 1
+
         lifecycleScope.launch(ioDispatcher) {
             storage.deleteCreditCard(guid)
 
@@ -71,7 +77,9 @@ class DefaultCreditCardEditorController(
         }
     }
 
-    override fun handleSaveCreditCard(creditCardFields: UpdatableCreditCardFields) {
+    override fun handleSaveCreditCard(creditCardFields: NewCreditCardFields) {
+        settings.creditCardsSavedCount += 1
+
         lifecycleScope.launch(ioDispatcher) {
             storage.addCreditCard(creditCardFields)
 
diff --git a/app/src/main/java/org/mozilla/fenix/settings/creditcards/controller/CreditCardsManagementController.kt b/app/src/main/java/org/mozilla/fenix/settings/creditcards/controller/CreditCardsManagementController.kt
index bcc0906a0..9e7416802 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/creditcards/controller/CreditCardsManagementController.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/creditcards/controller/CreditCardsManagementController.kt
@@ -21,6 +21,11 @@ interface CreditCardsManagementController {
      * @see [CreditCardsManagementInteractor.onSelectCreditCard]
      */
     fun handleCreditCardClicked(creditCard: CreditCard)
+
+    /**
+     * @see [CreditCardsManagementInteractor.onAddCreditCardClick]
+     */
+    fun handleAddCreditCardClicked()
 }
 
 /**
@@ -31,6 +36,14 @@ class DefaultCreditCardsManagementController(
 ) : CreditCardsManagementController {
 
     override fun handleCreditCardClicked(creditCard: CreditCard) {
+        navigateToCreditCardEditor(creditCard)
+    }
+
+    override fun handleAddCreditCardClicked() {
+        navigateToCreditCardEditor()
+    }
+
+    private fun navigateToCreditCardEditor(creditCard: CreditCard? = null) {
         navController.navigateBlockingForAsyncNavGraph(
             CreditCardsManagementFragmentDirections
                 .actionCreditCardsManagementFragmentToCreditCardEditorFragment(
diff --git a/app/src/main/java/org/mozilla/fenix/settings/creditcards/interactor/CreditCardEditorInteractor.kt b/app/src/main/java/org/mozilla/fenix/settings/creditcards/interactor/CreditCardEditorInteractor.kt
index 2633c57fe..9a4a3b1bc 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/creditcards/interactor/CreditCardEditorInteractor.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/creditcards/interactor/CreditCardEditorInteractor.kt
@@ -4,6 +4,7 @@
 
 package org.mozilla.fenix.settings.creditcards.interactor
 
+import mozilla.components.concept.storage.NewCreditCardFields
 import mozilla.components.concept.storage.UpdatableCreditCardFields
 import org.mozilla.fenix.settings.creditcards.controller.CreditCardEditorController
 
@@ -30,9 +31,9 @@ interface CreditCardEditorInteractor {
      * Saves the provided credit card field into the credit card storage. Called when a user
      * taps on the save menu item or "Save" button.
      *
-     * @param creditCardFields A [UpdatableCreditCardFields] record to add.
+     * @param creditCardFields A [NewCreditCardFields] record to add.
      */
-    fun onSaveCreditCard(creditCardFields: UpdatableCreditCardFields)
+    fun onSaveCreditCard(creditCardFields: NewCreditCardFields)
 
     /**
      * Updates the provided credit card with the new credit card fields. Called when a user
@@ -62,7 +63,7 @@ class DefaultCreditCardEditorInteractor(
         controller.handleDeleteCreditCard(guid)
     }
 
-    override fun onSaveCreditCard(creditCardFields: UpdatableCreditCardFields) {
+    override fun onSaveCreditCard(creditCardFields: NewCreditCardFields) {
         controller.handleSaveCreditCard(creditCardFields)
     }
 
diff --git a/app/src/main/java/org/mozilla/fenix/settings/creditcards/interactor/CreditCardsManagementInteractor.kt b/app/src/main/java/org/mozilla/fenix/settings/creditcards/interactor/CreditCardsManagementInteractor.kt
index 251d9de8c..63286d219 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/creditcards/interactor/CreditCardsManagementInteractor.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/creditcards/interactor/CreditCardsManagementInteractor.kt
@@ -19,6 +19,12 @@ interface CreditCardsManagementInteractor {
      * @param creditCard The selected [CreditCard] to edit.
      */
     fun onSelectCreditCard(creditCard: CreditCard)
+
+    /**
+     * Navigates to the credit card editor to add a new credit card. Called when a user
+     * taps on 'Add credit card' button.
+     */
+    fun onAddCreditCardClick()
 }
 
 /**
@@ -34,4 +40,8 @@ class DefaultCreditCardsManagementInteractor(
     override fun onSelectCreditCard(creditCard: CreditCard) {
         controller.handleCreditCardClicked(creditCard)
     }
+
+    override fun onAddCreditCardClick() {
+        controller.handleAddCreditCardClicked()
+    }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/settings/creditcards/view/CreditCardEditorView.kt b/app/src/main/java/org/mozilla/fenix/settings/creditcards/view/CreditCardEditorView.kt
index adf19410c..8ea9d2fc4 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/creditcards/view/CreditCardEditorView.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/creditcards/view/CreditCardEditorView.kt
@@ -4,17 +4,25 @@
 
 package org.mozilla.fenix.settings.creditcards.view
 
-import android.R
 import android.view.View
 import android.widget.ArrayAdapter
+import androidx.annotation.VisibleForTesting
 import kotlinx.android.extensions.LayoutContainer
 import kotlinx.android.synthetic.main.fragment_credit_card_editor.*
+import mozilla.components.concept.storage.CreditCardNumber
+import mozilla.components.concept.storage.NewCreditCardFields
 import mozilla.components.concept.storage.UpdatableCreditCardFields
+import mozilla.components.support.ktx.android.content.getColorFromAttr
 import mozilla.components.support.ktx.android.view.hideKeyboard
+import mozilla.components.support.utils.creditCardIIN
+import org.mozilla.fenix.R
 import org.mozilla.fenix.ext.toEditable
-import org.mozilla.fenix.settings.creditcards.CreditCardEditorFragment.Companion.CARD_TYPE_PLACEHOLDER
+import org.mozilla.fenix.settings.creditcards.CreditCardEditorFragment
 import org.mozilla.fenix.settings.creditcards.CreditCardEditorState
 import org.mozilla.fenix.settings.creditcards.interactor.CreditCardEditorInteractor
+import org.mozilla.fenix.settings.creditcards.last4Digits
+import org.mozilla.fenix.settings.creditcards.toCreditCardNumber
+import org.mozilla.fenix.settings.creditcards.validateCreditCardNumber
 import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Locale
@@ -46,21 +54,7 @@ class CreditCardEditorView(
         }
 
         save_button.setOnClickListener {
-            containerView.hideKeyboard()
-
-            val creditCardFields = UpdatableCreditCardFields(
-                billingName = name_on_card_input.text.toString(),
-                cardNumber = card_number_input.text.toString(),
-                expiryMonth = (expiry_month_drop_down.selectedItemPosition + 1).toLong(),
-                expiryYear = expiry_year_drop_down.selectedItem.toString().toLong(),
-                cardType = CARD_TYPE_PLACEHOLDER
-            )
-
-            if (state.isEditing) {
-                interactor.onUpdateCreditCard(state.guid, creditCardFields)
-            } else {
-                interactor.onSaveCreditCard(creditCardFields)
-            }
+            saveCreditCard(state)
         }
 
         card_number_input.text = state.cardNumber.toEditable()
@@ -70,6 +64,64 @@ class CreditCardEditorView(
         bindExpiryYearDropDown(state.expiryYears)
     }
 
+    /**
+     * Saves a new credit card or updates an existing one with data from the user input.
+     *
+     * @param state The state of the [CreditCardEditorFragment] containing the edited credit card
+     * information.
+     */
+    internal fun saveCreditCard(state: CreditCardEditorState) {
+        containerView.hideKeyboard()
+
+        if (validateCreditCard()) {
+            val cardNumber = card_number_input.text.toString().toCreditCardNumber()
+
+            if (state.isEditing) {
+                val fields = UpdatableCreditCardFields(
+                    billingName = name_on_card_input.text.toString(),
+                    cardNumber = CreditCardNumber.Plaintext(cardNumber),
+                    cardNumberLast4 = cardNumber.last4Digits(),
+                    expiryMonth = (expiry_month_drop_down.selectedItemPosition + 1).toLong(),
+                    expiryYear = expiry_year_drop_down.selectedItem.toString().toLong(),
+                    cardType = cardNumber.creditCardIIN()?.creditCardIssuerNetwork?.name ?: ""
+                )
+                interactor.onUpdateCreditCard(state.guid, fields)
+            } else {
+                val fields = NewCreditCardFields(
+                    billingName = name_on_card_input.text.toString(),
+                    plaintextCardNumber = CreditCardNumber.Plaintext(cardNumber),
+                    cardNumberLast4 = cardNumber.last4Digits(),
+                    expiryMonth = (expiry_month_drop_down.selectedItemPosition + 1).toLong(),
+                    expiryYear = expiry_year_drop_down.selectedItem.toString().toLong(),
+                    cardType = cardNumber.creditCardIIN()?.creditCardIssuerNetwork?.name ?: ""
+                )
+                interactor.onSaveCreditCard(fields)
+            }
+        }
+    }
+
+    /**
+     * Validates the credit card information entered by the user.
+     *
+     * @return true if the credit card is valid, false otherwise.
+     */
+    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    internal fun validateCreditCard(): Boolean {
+        var isValid = true
+
+        if (card_number_input.text.toString().validateCreditCardNumber()) {
+            card_number_layout.error = null
+            card_number_title.setTextColor(containerView.context.getColorFromAttr(R.attr.primaryText))
+        } else {
+            card_number_layout.error =
+                containerView.context.getString(R.string.credit_cards_number_validation_error_message)
+            card_number_title.setTextColor(containerView.context.getColorFromAttr(R.attr.destructive))
+            isValid = false
+        }
+
+        return isValid
+    }
+
     /**
      * Setup the expiry month dropdown by formatting and populating it with the months in a calendar
      * year, and set the selection to the provided expiry month.
@@ -78,7 +130,10 @@ class CreditCardEditorView(
      */
     private fun bindExpiryMonthDropDown(expiryMonth: Int) {
         val adapter =
-            ArrayAdapter<String>(containerView.context, R.layout.simple_spinner_dropdown_item)
+            ArrayAdapter<String>(
+                containerView.context,
+                android.R.layout.simple_spinner_dropdown_item
+            )
         val dateFormat = SimpleDateFormat("MMMM (MM)", Locale.getDefault())
 
         val calendar = Calendar.getInstance()
@@ -101,7 +156,10 @@ class CreditCardEditorView(
      */
     private fun bindExpiryYearDropDown(expiryYears: Pair<Int, Int>) {
         val adapter =
-            ArrayAdapter<String>(containerView.context, R.layout.simple_spinner_dropdown_item)
+            ArrayAdapter<String>(
+                containerView.context,
+                android.R.layout.simple_spinner_dropdown_item
+            )
         val (startYear, endYear) = expiryYears
 
         for (year in startYear until endYear) {
diff --git a/app/src/main/java/org/mozilla/fenix/settings/creditcards/view/CreditCardItemViewHolder.kt b/app/src/main/java/org/mozilla/fenix/settings/creditcards/view/CreditCardItemViewHolder.kt
index b5d18ebe0..0e733bfb1 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/creditcards/view/CreditCardItemViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/creditcards/view/CreditCardItemViewHolder.kt
@@ -7,6 +7,7 @@ package org.mozilla.fenix.settings.creditcards.view
 import android.view.View
 import kotlinx.android.synthetic.main.credit_card_list_item.*
 import mozilla.components.concept.storage.CreditCard
+import mozilla.components.support.utils.creditCardIssuerNetwork
 import org.mozilla.fenix.R
 import org.mozilla.fenix.settings.creditcards.interactor.CreditCardsManagementInteractor
 import org.mozilla.fenix.utils.view.ViewHolder
@@ -23,7 +24,9 @@ class CreditCardItemViewHolder(
 ) : ViewHolder(view) {
 
     fun bind(creditCard: CreditCard) {
-        credit_card_number.text = creditCard.cardNumber
+        credit_card_logo.setImageResource(creditCard.cardType.creditCardIssuerNetwork().icon)
+
+        credit_card_number.text = creditCard.obfuscatedCardNumber
 
         bindCreditCardExpiryDate(creditCard)
 
diff --git a/app/src/main/java/org/mozilla/fenix/settings/creditcards/view/CreditCardsManagementView.kt b/app/src/main/java/org/mozilla/fenix/settings/creditcards/view/CreditCardsManagementView.kt
index 8bc175076..42b40634d 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/creditcards/view/CreditCardsManagementView.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/creditcards/view/CreditCardsManagementView.kt
@@ -31,6 +31,8 @@ class CreditCardsManagementView(
             adapter = creditCardsAdapter
             layoutManager = LinearLayoutManager(containerView.context)
         }
+
+        add_credit_card_button.setOnClickListener { interactor.onAddCreditCardClick() }
     }
 
     /**
diff --git a/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/EditLoginFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/EditLoginFragment.kt
index 36b5844db..9a60a4674 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/EditLoginFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/EditLoginFragment.kt
@@ -266,7 +266,8 @@ class EditLoginFragment : Fragment(R.layout.fragment_edit_login) {
     override fun onPause() {
         redirectToReAuth(
             listOf(R.id.loginDetailFragment),
-            findNavController().currentDestination?.id
+            findNavController().currentDestination?.id,
+            R.id.editLoginFragment
         )
         super.onPause()
     }
diff --git a/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/LoginDetailFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/LoginDetailFragment.kt
index 3826179c0..3daa239f0 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/LoginDetailFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/LoginDetailFragment.kt
@@ -131,7 +131,8 @@ class LoginDetailFragment : Fragment(R.layout.fragment_login_detail) {
         menu.close()
         redirectToReAuth(
             listOf(R.id.editLoginFragment, R.id.savedLoginsFragment),
-            findNavController().currentDestination?.id
+            findNavController().currentDestination?.id,
+            R.id.loginDetailFragment
         )
         super.onPause()
     }
diff --git a/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/SavedLoginsAuthFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/SavedLoginsAuthFragment.kt
index f92d070d4..a16664790 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/SavedLoginsAuthFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/SavedLoginsAuthFragment.kt
@@ -53,7 +53,7 @@ class SavedLoginsAuthFragment : PreferenceFragmentCompat() {
      * https://github.com/mozilla-mobile/fenix/issues/12312
      */
     private fun togglePrefsEnabledWhileAuthenticating(enabled: Boolean) {
-        requirePreference<Preference>(R.string.pref_key_password_sync_logins).isEnabled = enabled
+        requirePreference<Preference>(R.string.pref_key_sync_logins).isEnabled = enabled
         requirePreference<Preference>(R.string.pref_key_save_logins_settings).isEnabled = enabled
         requirePreference<Preference>(R.string.pref_key_saved_logins).isEnabled = enabled
     }
@@ -124,20 +124,19 @@ class SavedLoginsAuthFragment : PreferenceFragmentCompat() {
         }
 
         SyncPreferenceView(
-            syncPreference = requirePreference(R.string.pref_key_password_sync_logins),
+            syncPreference = requirePreference(R.string.pref_key_sync_logins),
             lifecycleOwner = viewLifecycleOwner,
             accountManager = requireComponents.backgroundServices.accountManager,
             syncEngine = SyncEngine.Passwords,
+            loggedOffTitle = requireContext()
+                .getString(R.string.preferences_passwords_sync_logins_across_devices),
+            loggedInTitle = requireContext()
+                .getString(R.string.preferences_passwords_sync_logins),
             onSignInToSyncClicked = {
                 val directions =
                     SavedLoginsAuthFragmentDirections.actionSavedLoginsAuthFragmentToTurnOnSyncFragment()
                 findNavController().navigateBlockingForAsyncNavGraph(directions)
             },
-            onSyncStatusClicked = {
-                val directions =
-                    SavedLoginsAuthFragmentDirections.actionGlobalAccountSettingsFragment()
-                findNavController().navigateBlockingForAsyncNavGraph(directions)
-            },
             onReconnectClicked = {
                 val directions =
                     SavedLoginsAuthFragmentDirections.actionGlobalAccountProblemFragment()
@@ -189,7 +188,7 @@ class SavedLoginsAuthFragment : PreferenceFragmentCompat() {
             }
             create()
         }.show().secure(activity)
-        context.settings().incrementShowLoginsSecureWarningCount()
+        context.settings().incrementSecureWarningCount()
     }
 
     @Suppress("Deprecation") // This is only used when BiometricPrompt is unavailable
diff --git a/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/SavedLoginsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/SavedLoginsFragment.kt
index 5cc4fbce1..3a3c4f6d9 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/SavedLoginsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/SavedLoginsFragment.kt
@@ -148,7 +148,11 @@ class SavedLoginsFragment : Fragment() {
         sortLoginsMenuRoot.setOnClickListener(null)
         setHasOptionsMenu(false)
 
-        redirectToReAuth(listOf(R.id.loginDetailFragment), findNavController().currentDestination?.id)
+        redirectToReAuth(
+            listOf(R.id.loginDetailFragment),
+            findNavController().currentDestination?.id,
+            R.id.savedLoginsFragment
+        )
         super.onPause()
     }
 
diff --git a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsController.kt b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsController.kt
index c8dbe8ac4..2bacc065d 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsController.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsController.kt
@@ -6,7 +6,6 @@ package org.mozilla.fenix.settings.quicksettings
 
 import android.content.Context
 import androidx.annotation.VisibleForTesting
-import androidx.core.net.toUri
 import androidx.navigation.NavController
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
@@ -17,6 +16,7 @@ import mozilla.components.feature.session.SessionUseCases.ReloadUrlUseCase
 import mozilla.components.feature.sitepermissions.SitePermissions
 import mozilla.components.feature.tabs.TabsUseCases.AddNewTabUseCase
 import mozilla.components.support.base.feature.OnNeedToRequestPermissions
+import mozilla.components.support.ktx.kotlin.getOrigin
 import org.mozilla.fenix.components.PermissionStorage
 import org.mozilla.fenix.ext.navigateBlockingForAsyncNavGraph
 import org.mozilla.fenix.settings.PhoneFeature
@@ -141,7 +141,7 @@ class DefaultQuickSettingsController(
 
         sitePermissions = if (permissions == null) {
             val tab = browserStore.state.findTabOrCustomTab(sessionId)
-            val origin = requireNotNull(tab?.content?.url?.toUri()?.host) {
+            val origin = requireNotNull(tab?.content?.url?.getOrigin()) {
                 "An origin is required to change a autoplay settings from the door hanger"
             }
             val sitePermissions =
diff --git a/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineFragment.kt
index 41d648b57..b519d9c5d 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineFragment.kt
@@ -5,6 +5,7 @@
 package org.mozilla.fenix.settings.search
 
 import android.os.Bundle
+import androidx.core.content.edit
 import androidx.navigation.fragment.findNavController
 import androidx.preference.CheckBoxPreference
 import androidx.preference.Preference
@@ -18,6 +19,7 @@ import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.ext.showToolbar
 import org.mozilla.fenix.settings.SharedPreferenceUpdater
 import org.mozilla.fenix.settings.requirePreference
+import org.mozilla.gecko.search.SearchWidgetProvider
 
 class SearchEngineFragment : PreferenceFragmentCompat() {
 
@@ -83,7 +85,16 @@ class SearchEngineFragment : PreferenceFragmentCompat() {
         showSyncedTabsSuggestions.onPreferenceChangeListener = SharedPreferenceUpdater()
         showClipboardSuggestions.onPreferenceChangeListener = SharedPreferenceUpdater()
         searchSuggestionsInPrivatePreference.onPreferenceChangeListener = SharedPreferenceUpdater()
-        showVoiceSearchPreference.onPreferenceChangeListener = SharedPreferenceUpdater()
+        showVoiceSearchPreference.onPreferenceChangeListener = object : Preference.OnPreferenceChangeListener {
+            override fun onPreferenceChange(preference: Preference, newValue: Any?): Boolean {
+                val newBooleanValue = newValue as? Boolean ?: return false
+                requireContext().settings().preferences.edit {
+                    putBoolean(preference.key, newBooleanValue)
+                }
+                SearchWidgetProvider.updateAllWidgets(requireContext())
+                return true
+            }
+        }
         autocompleteURLsPreference.onPreferenceChangeListener = SharedPreferenceUpdater()
 
         searchSuggestionsPreference.setOnPreferenceClickListener {
diff --git a/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/Extensions.kt b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/Extensions.kt
index 4f459f84e..dd31f5feb 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/Extensions.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/Extensions.kt
@@ -6,8 +6,8 @@ package org.mozilla.fenix.settings.sitepermissions
 
 import android.view.View
 import android.widget.TextView
-import androidx.core.net.toUri
 import androidx.core.text.HtmlCompat
+import mozilla.components.support.ktx.kotlin.getOrigin
 import org.mozilla.fenix.R
 import org.mozilla.fenix.components.Components
 import org.mozilla.fenix.settings.PhoneFeature
@@ -23,7 +23,7 @@ import org.mozilla.fenix.settings.PhoneFeature
 internal fun Components.tryReloadTabBy(origin: String) {
     core.store.state.tabs
         .sortedByDescending { it.lastAccess }
-        .find { it.content.url.toUri().host == origin }
+        .find { it.content.url.getOrigin() == origin }
         ?.let {
             useCases.sessionUseCases.reload(it.id)
         }
diff --git a/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsDetailsExceptionsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsDetailsExceptionsFragment.kt
index 49b7cdb43..76d0774f3 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsDetailsExceptionsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsDetailsExceptionsFragment.kt
@@ -18,6 +18,7 @@ import kotlinx.coroutines.Dispatchers.Main
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import mozilla.components.feature.sitepermissions.SitePermissions
+import mozilla.components.support.ktx.kotlin.stripDefaultPort
 import org.mozilla.fenix.R
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.navigateBlockingForAsyncNavGraph
@@ -55,7 +56,7 @@ class SitePermissionsDetailsExceptionsFragment : PreferenceFragmentCompat() {
 
     override fun onResume() {
         super.onResume()
-        showToolbar(sitePermissions.origin)
+        showToolbar(sitePermissions.origin.stripDefaultPort())
         viewLifecycleOwner.lifecycleScope.launch(Main) {
             sitePermissions =
                 requireNotNull(requireComponents.core.permissionStorage.findSitePermissionsBy(sitePermissions.origin))
diff --git a/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsExceptionsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsExceptionsFragment.kt
index 2b73d4da2..d8bbc1eda 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsExceptionsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsExceptionsFragment.kt
@@ -27,6 +27,7 @@ import androidx.recyclerview.widget.RecyclerView
 import kotlinx.coroutines.Dispatchers.Main
 import kotlinx.coroutines.launch
 import mozilla.components.feature.sitepermissions.SitePermissions
+import mozilla.components.support.ktx.kotlin.stripDefaultPort
 import org.mozilla.fenix.NavHostActivity
 import org.mozilla.fenix.R
 import org.mozilla.fenix.ext.components
@@ -142,9 +143,8 @@ class ExceptionsAdapter(private val clickListener: View.OnClickListener) :
     override fun onBindViewHolder(holder: SitePermissionsViewHolder, position: Int) {
         val sitePermissions = requireNotNull(getItem(position))
         val context = holder.view.context
-
-        context.components.core.icons.loadIntoView(holder.iconView, "https://${sitePermissions.origin}/")
-        holder.siteTextView.text = sitePermissions.origin
+        context.components.core.icons.loadIntoView(holder.iconView, sitePermissions.origin)
+        holder.siteTextView.text = sitePermissions.origin.stripDefaultPort()
         holder.view.tag = sitePermissions
         holder.view.setOnClickListener(clickListener)
     }
diff --git a/app/src/main/java/org/mozilla/fenix/sync/SyncedTabsViewHolder.kt b/app/src/main/java/org/mozilla/fenix/sync/SyncedTabsViewHolder.kt
index 375cec1e6..3b45a1e66 100644
--- a/app/src/main/java/org/mozilla/fenix/sync/SyncedTabsViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/sync/SyncedTabsViewHolder.kt
@@ -87,7 +87,7 @@ sealed class SyncedTabsViewHolder(itemView: View) : RecyclerView.ViewHolder(item
             }
 
             itemView.synced_tabs_group_name.text = device.device.displayName
-            itemView.synced_tabs_group_name.setCompoundDrawablesWithIntrinsicBounds(
+            itemView.synced_tabs_group_name.setCompoundDrawablesRelativeWithIntrinsicBounds(
                 deviceLogoDrawable,
                 0,
                 0,
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/AccessibleNewTabButtonBinding.kt b/app/src/main/java/org/mozilla/fenix/tabstray/AccessibleNewTabButtonBinding.kt
new file mode 100644
index 000000000..9c1c3f4e0
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/AccessibleNewTabButtonBinding.kt
@@ -0,0 +1,94 @@
+/* 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/. */
+
+package org.mozilla.fenix.tabstray
+
+import android.view.View
+import android.widget.ImageButton
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.map
+import mozilla.components.lib.state.helpers.AbstractBinding
+import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifAnyChanged
+import org.mozilla.fenix.R
+import org.mozilla.fenix.tabstray.browser.BrowserTrayInteractor
+import org.mozilla.fenix.utils.Settings
+
+/**
+ * Do not show accessible new tab button when accessibility service is disabled
+ *
+ * This binding is coupled with [FloatingActionButtonBinding].
+ * When [FloatingActionButtonBinding] is visible this should not be visible
+ */
+@OptIn(ExperimentalCoroutinesApi::class)
+class AccessibleNewTabButtonBinding(
+    private val store: TabsTrayStore,
+    private val settings: Settings,
+    private val newTabButton: ImageButton,
+    private val browserTrayInteractor: BrowserTrayInteractor
+) : AbstractBinding<TabsTrayState>(store) {
+
+    override fun start() {
+        if (!settings.accessibilityServicesEnabled) {
+            newTabButton.visibility = View.GONE
+            return
+        }
+        super.start()
+    }
+
+    override suspend fun onState(flow: Flow<TabsTrayState>) {
+        flow.map { it }
+            .ifAnyChanged { state ->
+                arrayOf(
+                    state.selectedPage,
+                    state.syncing
+                )
+            }
+            .collect { state ->
+                setAccessibleNewTabButton(state.selectedPage, state.syncing)
+            }
+    }
+
+    private fun setAccessibleNewTabButton(selectedPage: Page, syncing: Boolean) {
+        when (selectedPage) {
+            Page.NormalTabs -> {
+                newTabButton.apply {
+                    visibility = View.VISIBLE
+                    setImageResource(R.drawable.ic_new)
+                    setOnClickListener {
+                        browserTrayInteractor.onFabClicked(false)
+                    }
+                }
+            }
+            Page.PrivateTabs -> {
+                newTabButton.apply {
+                    visibility = View.VISIBLE
+                    setImageResource(R.drawable.ic_new)
+                    setOnClickListener {
+                        browserTrayInteractor.onFabClicked(true)
+                    }
+                }
+            }
+            Page.SyncedTabs -> {
+                newTabButton.apply {
+                    visibility =
+                        when (syncing) {
+                            true -> View.GONE
+                            false -> View.VISIBLE
+                        }
+
+                    setImageResource(R.drawable.ic_fab_sync)
+                    setOnClickListener {
+                        // Notify the store observers (one of which is the SyncedTabsFeature), that
+                        // a sync was requested.
+                        if (!syncing) {
+                            store.dispatch(TabsTrayAction.SyncNow)
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/CloseOnLastTabBinding.kt b/app/src/main/java/org/mozilla/fenix/tabstray/CloseOnLastTabBinding.kt
index d19958375..4c989709c 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/CloseOnLastTabBinding.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/CloseOnLastTabBinding.kt
@@ -4,6 +4,7 @@
 
 package org.mozilla.fenix.tabstray
 
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.drop
@@ -12,12 +13,13 @@ import mozilla.components.browser.state.selector.normalTabs
 import mozilla.components.browser.state.selector.privateTabs
 import mozilla.components.browser.state.state.BrowserState
 import mozilla.components.browser.state.store.BrowserStore
+import mozilla.components.lib.state.helpers.AbstractBinding
 import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifChanged
-import org.mozilla.fenix.components.AbstractBinding
 
 /**
  * A binding that closes the tabs tray when the last tab is closed.
  */
+@OptIn(ExperimentalCoroutinesApi::class)
 class CloseOnLastTabBinding(
     browserStore: BrowserStore,
     private val tabsTrayStore: TabsTrayStore,
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/FloatingActionButtonBinding.kt b/app/src/main/java/org/mozilla/fenix/tabstray/FloatingActionButtonBinding.kt
index 42d925368..e72e022c5 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/FloatingActionButtonBinding.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/FloatingActionButtonBinding.kt
@@ -4,46 +4,50 @@
 
 package org.mozilla.fenix.tabstray
 
-import androidx.appcompat.content.res.AppCompatResources
 import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.cancel
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.map
-import mozilla.components.lib.state.ext.flowScoped
-import mozilla.components.support.base.feature.LifecycleAwareFeature
+import mozilla.components.lib.state.helpers.AbstractBinding
 import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifAnyChanged
 import org.mozilla.fenix.R
 import org.mozilla.fenix.tabstray.browser.BrowserTrayInteractor
+import org.mozilla.fenix.utils.Settings
 
+/**
+ * Do not show fab when accessibility service is enabled
+ *
+ * This binding is coupled with [AccessibleNewTabButtonBinding].
+ * When [AccessibleNewTabButtonBinding] is visible this should not be visible
+ */
+@OptIn(ExperimentalCoroutinesApi::class)
 class FloatingActionButtonBinding(
     private val store: TabsTrayStore,
+    private val settings: Settings,
     private val actionButton: ExtendedFloatingActionButton,
     private val browserTrayInteractor: BrowserTrayInteractor
-) : LifecycleAwareFeature {
+) : AbstractBinding<TabsTrayState>(store) {
 
-    private var scope: CoroutineScope? = null
-
-    @OptIn(ExperimentalCoroutinesApi::class)
     override fun start() {
-        setFab(store.state.selectedPage, store.state.syncing)
-        scope = store.flowScoped { flow ->
-            flow.map { it }
-                .ifAnyChanged { state ->
-                    arrayOf(
-                        state.selectedPage,
-                        state.syncing
-                    )
-                }
-                .collect { state ->
-                    setFab(state.selectedPage, state.syncing)
-                }
+        if (settings.accessibilityServicesEnabled) {
+            actionButton.hide()
+            return
         }
+        super.start()
     }
 
-    override fun stop() {
-        scope?.cancel()
+    override suspend fun onState(flow: Flow<TabsTrayState>) {
+        flow.map { it }
+            .ifAnyChanged { state ->
+                arrayOf(
+                    state.selectedPage,
+                    state.syncing
+                )
+            }
+            .collect { state ->
+                setFab(state.selectedPage, state.syncing)
+            }
     }
 
     private fun setFab(selectedPage: Page, syncing: Boolean) {
@@ -52,7 +56,7 @@ class FloatingActionButtonBinding(
                 actionButton.apply {
                     shrink()
                     show()
-                    icon = AppCompatResources.getDrawable(context, R.drawable.ic_new)
+                    setIconResource(R.drawable.ic_new)
                     setOnClickListener {
                         browserTrayInteractor.onFabClicked(false)
                     }
@@ -60,10 +64,10 @@ class FloatingActionButtonBinding(
             }
             Page.PrivateTabs -> {
                 actionButton.apply {
-                    text = context.getText(R.string.tab_drawer_fab_content)
+                    setText(R.string.tab_drawer_fab_content)
                     extend()
                     show()
-                    icon = AppCompatResources.getDrawable(context, R.drawable.ic_new)
+                    setIconResource(R.drawable.ic_new)
                     setOnClickListener {
                         browserTrayInteractor.onFabClicked(true)
                     }
@@ -71,11 +75,15 @@ class FloatingActionButtonBinding(
             }
             Page.SyncedTabs -> {
                 actionButton.apply {
-                    text = if (syncing) context.getText(R.string.sync_syncing_in_progress)
-                    else context.getText(R.string.tab_drawer_fab_sync)
+                    setText(
+                        when (syncing) {
+                            true -> R.string.sync_syncing_in_progress
+                            false -> R.string.tab_drawer_fab_sync
+                        }
+                    )
                     extend()
                     show()
-                    icon = AppCompatResources.getDrawable(context, R.drawable.ic_fab_sync)
+                    setIconResource(R.drawable.ic_fab_sync)
                     setOnClickListener {
                         // Notify the store observers (one of which is the SyncedTabsFeature), that
                         // a sync was requested.
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/MenuIntegration.kt b/app/src/main/java/org/mozilla/fenix/tabstray/MenuIntegration.kt
index 2a1630204..15c1a5424 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/MenuIntegration.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/MenuIntegration.kt
@@ -15,11 +15,11 @@ import org.mozilla.fenix.utils.Do
  * A wrapper class that building the tabs tray menu that handles item clicks.
  */
 class MenuIntegration(
-    private val context: Context,
-    private val browserStore: BrowserStore,
-    private val tabsTrayStore: TabsTrayStore,
-    private val tabLayout: TabLayout,
-    private val navigationInteractor: NavigationInteractor
+    @VisibleForTesting internal val context: Context,
+    @VisibleForTesting internal val browserStore: BrowserStore,
+    @VisibleForTesting internal val tabsTrayStore: TabsTrayStore,
+    @VisibleForTesting internal val tabLayout: TabLayout,
+    @VisibleForTesting internal val navigationInteractor: NavigationInteractor
 ) {
     private val tabsTrayItemMenu by lazy {
         TabsTrayMenu(
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/NavigationInteractor.kt b/app/src/main/java/org/mozilla/fenix/tabstray/NavigationInteractor.kt
index c88c42d94..d619eda80 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/NavigationInteractor.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/NavigationInteractor.kt
@@ -7,7 +7,6 @@ package org.mozilla.fenix.tabstray
 import android.content.Context
 import androidx.navigation.NavController
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.launch
 import mozilla.components.browser.state.selector.getNormalOrPrivateTabs
@@ -28,6 +27,7 @@ import org.mozilla.fenix.components.metrics.MetricController
 import org.mozilla.fenix.ext.navigateBlockingForAsyncNavGraph
 import org.mozilla.fenix.home.HomeFragment
 import org.mozilla.fenix.tabstray.ext.getTabSessionState
+import kotlin.coroutines.CoroutineContext
 
 /**
  * An interactor that helps with navigating to different parts of the app from the tabs tray.
@@ -100,10 +100,12 @@ class DefaultNavigationInteractor(
     private val bookmarksUseCase: BookmarksUseCase,
     private val tabsTrayStore: TabsTrayStore,
     private val collectionStorage: TabCollectionStorage,
-    private val accountManager: FxaAccountManager
+    private val accountManager: FxaAccountManager,
+    private val ioDispatcher: CoroutineContext
 ) : NavigationInteractor {
 
     override fun onTabTrayDismissed() {
+        metrics.track(Event.TabsTrayClosed)
         dismissTabTray()
     }
 
@@ -190,14 +192,13 @@ class DefaultNavigationInteractor(
     override fun onSaveToBookmarks(tabs: Collection<Tab>) {
         tabs.forEach { tab ->
             // We don't combine the context with lifecycleScope so that our jobs are not cancelled
-            // if we leave the fragment, i.e. we still want the bookmarks to be added.
-            CoroutineScope(Dispatchers.IO).launch {
+            // if we leave the fragment, i.e. we still want the bookmarks to be added if the
+            // tabs tray closes before the job is done.
+            CoroutineScope(ioDispatcher).launch {
                 bookmarksUseCase.addBookmark(tab.url, tab.title)
             }
         }
 
-        tabsTrayStore.dispatch(TabsTrayAction.ExitSelectMode)
-
         // TODO show successful snackbar here (regardless of operation success).
     }
 
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/TabCounterBinding.kt b/app/src/main/java/org/mozilla/fenix/tabstray/TabCounterBinding.kt
index e6b833c7d..0c50f9b50 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/TabCounterBinding.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/TabCounterBinding.kt
@@ -4,41 +4,31 @@
 
 package org.mozilla.fenix.tabstray
 
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.cancel
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.map
 import mozilla.components.browser.state.selector.normalTabs
 import mozilla.components.browser.state.state.BrowserState
 import mozilla.components.browser.state.store.BrowserStore
-import mozilla.components.lib.state.ext.flowScoped
-import mozilla.components.support.base.feature.LifecycleAwareFeature
+import mozilla.components.lib.state.helpers.AbstractBinding
 import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifChanged
 import mozilla.components.ui.tabcounter.TabCounter
 
 /**
  * Updates the tab counter to the size of [BrowserState.normalTabs].
  */
+@OptIn(ExperimentalCoroutinesApi::class)
 class TabCounterBinding(
     private val store: BrowserStore,
     private val counter: TabCounter
-) : LifecycleAwareFeature {
+) : AbstractBinding<BrowserState>(store) {
 
-    private var scope: CoroutineScope? = null
-
-    @OptIn(ExperimentalCoroutinesApi::class)
-    override fun start() {
-        scope = store.flowScoped { flow ->
-            flow.map { it.normalTabs }
-                .ifChanged()
-                .collect {
-                    counter.setCount(it.size)
-                }
-        }
-    }
-
-    override fun stop() {
-        scope?.cancel()
+    override suspend fun onState(flow: Flow<BrowserState>) {
+        flow.map { it.normalTabs }
+            .ifChanged()
+            .collect {
+                counter.setCount(it.size)
+            }
     }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/TabLayoutMediator.kt b/app/src/main/java/org/mozilla/fenix/tabstray/TabLayoutMediator.kt
index 8e27666f7..4bfeabe2b 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/TabLayoutMediator.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/TabLayoutMediator.kt
@@ -78,7 +78,7 @@ internal class TabLayoutObserver(
             true
         }
 
-        interactor.setCurrentTrayPosition(tab.position, animate)
+        interactor.onTrayPositionSelected(tab.position, animate)
 
         Do exhaustive when (Page.positionToPage(tab.position)) {
             Page.NormalTabs -> metrics.track(Event.TabsTrayNormalModeTapped)
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayController.kt b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayController.kt
index 0999ad47e..138e36ff6 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayController.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayController.kt
@@ -4,37 +4,76 @@
 
 package org.mozilla.fenix.tabstray
 
+import androidx.annotation.VisibleForTesting
 import androidx.navigation.NavController
-import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import mozilla.components.browser.state.selector.findTab
+import mozilla.components.browser.state.selector.getNormalOrPrivateTabs
+import mozilla.components.browser.state.store.BrowserStore
 import mozilla.components.concept.base.profiler.Profiler
-import mozilla.components.service.fxa.manager.FxaAccountManager
+import mozilla.components.concept.tabstray.Tab
+import mozilla.components.feature.tabs.TabsUseCases
+import org.mozilla.fenix.R
 import org.mozilla.fenix.browser.browsingmode.BrowsingMode
 import org.mozilla.fenix.browser.browsingmode.BrowsingModeManager
 import org.mozilla.fenix.components.metrics.Event
 import org.mozilla.fenix.components.metrics.MetricController
 import org.mozilla.fenix.ext.navigateBlockingForAsyncNavGraph
+import org.mozilla.fenix.home.HomeFragment
 import org.mozilla.fenix.tabtray.TabTrayDialogFragmentDirections
 
 interface TabsTrayController {
 
     /**
-     * Called when user clicks the new tab button.
+     * Called to open a new tab.
      */
-    fun onNewTabTapped(isPrivate: Boolean)
+    fun handleOpeningNewTab(isPrivate: Boolean)
+
+    /**
+     * Set the current tray item to the clamped [position].
+     *
+     * @param position The position on the tray to focus.
+     * @param smoothScroll If true, animate the scrolling from the current tab to [position].
+     */
+    fun handleTrayScrollingToPosition(position: Int, smoothScroll: Boolean)
+
+    /**
+     * Navigate from TabsTray to Browser.
+     */
+    fun handleNavigateToBrowser()
+
+    /**
+     * Deletes the [Tab] with the specified [tabId].
+     *
+     * @param tabId The id of the [Tab] to be removed from TabsTray.
+     */
+    fun handleTabDeletion(tabId: String)
+
+    /**
+     * Deletes a list of [tabs].
+     *
+     * @param tabs List of [Tab]s (sessions) to be removed.
+     */
+    fun handleMultipleTabsDeletion(tabs: Collection<Tab>)
 }
 
 class DefaultTabsTrayController(
-    private val store: TabsTrayStore,
+    private val trayStore: TabsTrayStore,
+    private val browserStore: BrowserStore,
     private val browsingModeManager: BrowsingModeManager,
     private val navController: NavController,
+    private val navigateToHomeAndDeleteSession: (String) -> Unit,
     private val profiler: Profiler?,
     private val navigationInteractor: NavigationInteractor,
     private val metrics: MetricController,
-    private val ioScope: CoroutineScope,
-    private val accountManager: FxaAccountManager
+    private val tabsUseCases: TabsUseCases,
+    private val selectTabPosition: (Int, Boolean) -> Unit,
+    private val dismissTray: () -> Unit,
+    private val showUndoSnackbarForTab: (Boolean) -> Unit
+
 ) : TabsTrayController {
 
-    override fun onNewTabTapped(isPrivate: Boolean) {
+    override fun handleOpeningNewTab(isPrivate: Boolean) {
         val startTime = profiler?.getProfilerTime()
         browsingModeManager.mode = BrowsingMode.fromBoolean(isPrivate)
         navController.navigateBlockingForAsyncNavGraph(
@@ -47,7 +86,67 @@ class DefaultTabsTrayController(
         sendNewTabEvent(isPrivate)
     }
 
-    private fun sendNewTabEvent(isPrivateModeSelected: Boolean) {
+    override fun handleTrayScrollingToPosition(position: Int, smoothScroll: Boolean) {
+        selectTabPosition(position, smoothScroll)
+        trayStore.dispatch(TabsTrayAction.PageSelected(Page.positionToPage(position)))
+    }
+
+    /**
+     * Dismisses the tabs tray and navigates to the browser.
+     */
+    override fun handleNavigateToBrowser() {
+        dismissTray()
+
+        if (navController.currentDestination?.id == R.id.browserFragment) {
+            return
+        } else if (!navController.popBackStack(R.id.browserFragment, false)) {
+            navController.navigateBlockingForAsyncNavGraph(R.id.browserFragment)
+        }
+    }
+
+    /**
+     * Deletes the [Tab] with the specified [tabId].
+     *
+     * @param tabId The id of the [Tab] to be removed from TabsTray.
+     * This method has no effect if the tab does not exist.
+     */
+    override fun handleTabDeletion(tabId: String) {
+        val tab = browserStore.state.findTab(tabId)
+
+        tab?.let {
+            if (browserStore.state.getNormalOrPrivateTabs(it.content.private).size != 1) {
+                tabsUseCases.removeTab(tabId)
+                showUndoSnackbarForTab(it.content.private)
+            } else {
+                dismissTabsTrayAndNavigateHome(tabId)
+            }
+        }
+    }
+
+    /**
+     * Deletes a list of [tabs] offering an undo option.
+     *
+     * @param tabs List of [Tab]s (sessions) to be removed. This method has no effect for tabs that do not exist.
+     */
+    @ExperimentalCoroutinesApi
+    override fun handleMultipleTabsDeletion(tabs: Collection<Tab>) {
+        val isPrivate = tabs.any { it.private }
+
+        // If user closes all the tabs from selected tabs page dismiss tray and navigate home.
+        if (tabs.size == browserStore.state.getNormalOrPrivateTabs(isPrivate).size) {
+            dismissTabsTrayAndNavigateHome(
+                if (isPrivate) HomeFragment.ALL_PRIVATE_TABS else HomeFragment.ALL_NORMAL_TABS
+            )
+        } else {
+            tabs.map { it.id }.let {
+                tabsUseCases.removeTabs(it)
+            }
+        }
+        showUndoSnackbarForTab(isPrivate)
+    }
+
+    @VisibleForTesting
+    internal fun sendNewTabEvent(isPrivateModeSelected: Boolean) {
         val eventToSend = if (isPrivateModeSelected) {
             Event.NewPrivateTabTapped
         } else {
@@ -56,4 +155,10 @@ class DefaultTabsTrayController(
 
         metrics.track(eventToSend)
     }
+
+    @VisibleForTesting
+    internal fun dismissTabsTrayAndNavigateHome(sessionId: String) {
+        dismissTray()
+        navigateToHomeAndDeleteSession(sessionId)
+    }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayFragment.kt b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayFragment.kt
index bae954a3b..c067fd0c2 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayFragment.kt
@@ -10,13 +10,15 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.annotation.VisibleForTesting
 import androidx.appcompat.app.AppCompatDialogFragment
 import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.view.isVisible
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import com.google.android.material.bottomsheet.BottomSheetBehavior
-import kotlinx.android.synthetic.main.component_tabstray.view.*
+import com.google.android.material.tabs.TabLayout
 import kotlinx.android.synthetic.main.component_tabstray2.*
 import kotlinx.android.synthetic.main.component_tabstray2.view.*
 import kotlinx.android.synthetic.main.component_tabstray2.view.tab_tray_overflow
@@ -25,15 +27,10 @@ import kotlinx.android.synthetic.main.component_tabstray_fab.*
 import kotlinx.android.synthetic.main.fragment_tab_tray_dialog.*
 import kotlinx.android.synthetic.main.tabs_tray_tab_counter2.*
 import kotlinx.android.synthetic.main.tabstray_multiselect_items.*
-import kotlinx.android.synthetic.main.tabstray_multiselect_items.view.*
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.plus
-import mozilla.components.browser.state.selector.findTab
-import mozilla.components.browser.state.selector.getNormalOrPrivateTabs
 import mozilla.components.browser.state.selector.normalTabs
 import mozilla.components.browser.state.selector.privateTabs
-import mozilla.components.browser.state.state.TabSessionState
-import mozilla.components.concept.tabstray.Tab
+import mozilla.components.browser.state.store.BrowserStore
 import mozilla.components.support.base.feature.ViewBoundFeatureWrapper
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.NavGraphDirections
@@ -50,23 +47,24 @@ import org.mozilla.fenix.tabstray.browser.DefaultBrowserTrayInteractor
 import org.mozilla.fenix.tabstray.browser.SelectionHandleBinding
 import org.mozilla.fenix.tabstray.browser.SelectionBannerBinding
 import org.mozilla.fenix.tabstray.browser.SelectionBannerBinding.VisibilityModifier
-import org.mozilla.fenix.tabstray.ext.getTrayPosition
 import org.mozilla.fenix.tabstray.ext.showWithTheme
 import org.mozilla.fenix.utils.allowUndo
 import kotlin.math.max
 
 @Suppress("TooManyFunctions", "LargeClass")
-class TabsTrayFragment : AppCompatDialogFragment(), TabsTrayInteractor {
+class TabsTrayFragment : AppCompatDialogFragment() {
 
     private var fabView: View? = null
-    private lateinit var tabsTrayStore: TabsTrayStore
+    @VisibleForTesting internal lateinit var tabsTrayStore: TabsTrayStore
     private lateinit var browserTrayInteractor: BrowserTrayInteractor
+    private lateinit var tabsTrayInteractor: TabsTrayInteractor
     private lateinit var tabsTrayController: DefaultTabsTrayController
     private lateinit var behavior: BottomSheetBehavior<ConstraintLayout>
 
     private val tabLayoutMediator = ViewBoundFeatureWrapper<TabLayoutMediator>()
     private val tabCounterBinding = ViewBoundFeatureWrapper<TabCounterBinding>()
     private val floatingActionButtonBinding = ViewBoundFeatureWrapper<FloatingActionButtonBinding>()
+    private val newTabButtonBinding = ViewBoundFeatureWrapper<AccessibleNewTabButtonBinding>()
     private val selectionBannerBinding = ViewBoundFeatureWrapper<SelectionBannerBinding>()
     private val selectionHandleBinding = ViewBoundFeatureWrapper<SelectionHandleBinding>()
     private val tabsTrayCtaBinding = ViewBoundFeatureWrapper<TabsTrayInfoBannerBinding>()
@@ -117,23 +115,30 @@ class TabsTrayFragment : AppCompatDialogFragment(), TabsTrayInteractor {
                 dismissTabTrayAndNavigateHome = ::dismissTabsTrayAndNavigateHome,
                 bookmarksUseCase = requireComponents.useCases.bookmarksUseCases,
                 collectionStorage = requireComponents.core.tabCollectionStorage,
-                accountManager = requireComponents.backgroundServices.accountManager
+                accountManager = requireComponents.backgroundServices.accountManager,
+                ioDispatcher = Dispatchers.IO
             )
 
         tabsTrayController = DefaultTabsTrayController(
-            store = tabsTrayStore,
+            trayStore = tabsTrayStore,
+            browserStore = requireComponents.core.store,
             browsingModeManager = activity.browsingModeManager,
             navController = findNavController(),
+            navigateToHomeAndDeleteSession = ::navigateToHomeAndDeleteSession,
             navigationInteractor = navigationInteractor,
             profiler = requireComponents.core.engine.profiler,
-            accountManager = requireComponents.backgroundServices.accountManager,
             metrics = requireComponents.analytics.metrics,
-            ioScope = lifecycleScope + Dispatchers.IO
+            tabsUseCases = requireComponents.useCases.tabsUseCases,
+            selectTabPosition = ::selectTabPosition,
+            dismissTray = ::dismissTabsTray,
+            showUndoSnackbarForTab = ::showUndoSnackbarForTab
         )
 
+        tabsTrayInteractor = DefaultTabsTrayInteractor(tabsTrayController)
+
         browserTrayInteractor = DefaultBrowserTrayInteractor(
             tabsTrayStore,
-            this@TabsTrayFragment,
+            tabsTrayInteractor,
             tabsTrayController,
             requireComponents.useCases.tabsUseCases.selectTab,
             requireComponents.settings,
@@ -144,7 +149,7 @@ class TabsTrayFragment : AppCompatDialogFragment(), TabsTrayInteractor {
         setupPager(
             view.context,
             tabsTrayStore,
-            this,
+            tabsTrayInteractor,
             browserTrayInteractor,
             navigationInteractor
         )
@@ -184,7 +189,7 @@ class TabsTrayFragment : AppCompatDialogFragment(), TabsTrayInteractor {
         tabLayoutMediator.set(
             feature = TabLayoutMediator(
                 tabLayout = tab_layout,
-                interactor = this,
+                interactor = tabsTrayInteractor,
                 browsingModeManager = activity.browsingModeManager,
                 tabsTrayStore = tabsTrayStore,
                 metrics = requireComponents.analytics.metrics
@@ -204,6 +209,7 @@ class TabsTrayFragment : AppCompatDialogFragment(), TabsTrayInteractor {
         floatingActionButtonBinding.set(
             feature = FloatingActionButtonBinding(
                 store = tabsTrayStore,
+                settings = requireComponents.settings,
                 actionButton = new_tab_button,
                 browserTrayInteractor = browserTrayInteractor
             ),
@@ -211,12 +217,23 @@ class TabsTrayFragment : AppCompatDialogFragment(), TabsTrayInteractor {
             view = view
         )
 
+        newTabButtonBinding.set(
+            feature = AccessibleNewTabButtonBinding(
+                store = tabsTrayStore,
+                settings = requireComponents.settings,
+                newTabButton = tab_tray_new_tab,
+                browserTrayInteractor = browserTrayInteractor
+            ),
+            owner = this,
+            view = view
+        )
+
         selectionBannerBinding.set(
             feature = SelectionBannerBinding(
                 context = requireContext(),
                 store = tabsTrayStore,
                 navInteractor = navigationInteractor,
-                tabsTrayInteractor = this,
+                tabsTrayInteractor = tabsTrayInteractor,
                 containerView = view,
                 backgroundView = topBar,
                 showOnSelectViews = VisibilityModifier(
@@ -247,49 +264,10 @@ class TabsTrayFragment : AppCompatDialogFragment(), TabsTrayInteractor {
         )
     }
 
-    override fun setCurrentTrayPosition(position: Int, smoothScroll: Boolean) {
-        tabsTray.setCurrentItem(position, smoothScroll)
-        tab_layout.getTabAt(position)?.select()
-        tabsTrayStore.dispatch(TabsTrayAction.PageSelected(Page.positionToPage(position)))
-    }
-
-    override fun navigateToBrowser() {
-        dismissTabsTray()
-
-        val navController = findNavController()
-
-        if (navController.currentDestination?.id == R.id.browserFragment) {
-            return
-        }
-
-        if (!navController.popBackStack(R.id.browserFragment, false)) {
-            navController.navigateBlockingForAsyncNavGraph(R.id.browserFragment)
-        }
-    }
-
-    override fun onDeleteTab(tabId: String) {
-        val browserStore = requireComponents.core.store
-        val tab = browserStore.state.findTab(tabId)
-
-        tab?.let {
-            if (browserStore.state.getNormalOrPrivateTabs(it.content.private).size != 1) {
-                requireComponents.useCases.tabsUseCases.removeTab(tabId)
-                showUndoSnackbarForTab(it)
-            } else {
-                dismissTabsTrayAndNavigateHome(tabId)
-            }
-        }
-    }
-
-    override fun onDeleteTabs(tabs: Collection<Tab>) {
-        tabs.forEach {
-            onDeleteTab(it.id)
-        }
-    }
-
-    private fun showUndoSnackbarForTab(removedTab: TabSessionState) {
+    @VisibleForTesting
+    internal fun showUndoSnackbarForTab(isPrivate: Boolean) {
         val snackbarMessage =
-            when (removedTab.content.private) {
+            when (isPrivate) {
                 true -> getString(R.string.snackbar_private_tab_closed)
                 false -> getString(R.string.snackbar_tab_closed)
             }
@@ -300,15 +278,18 @@ class TabsTrayFragment : AppCompatDialogFragment(), TabsTrayInteractor {
             getString(R.string.snackbar_deleted_undo),
             {
                 requireComponents.useCases.tabsUseCases.undo.invoke()
-                tabLayoutMediator.withFeature { it.selectTabAtPosition(removedTab.getTrayPosition()) }
+                tabLayoutMediator.withFeature { it.selectTabAtPosition(
+                    if (isPrivate) Page.PrivateTabs.ordinal else Page.NormalTabs.ordinal
+                ) }
             },
             operation = { },
             elevation = ELEVATION,
-            anchorView = new_tab_button
+            anchorView = if (new_tab_button.isVisible) new_tab_button else null
         )
     }
 
-    private fun setupPager(
+    @VisibleForTesting
+    internal fun setupPager(
         context: Context,
         store: TabsTrayStore,
         trayInteractor: TabsTrayInteractor,
@@ -328,12 +309,13 @@ class TabsTrayFragment : AppCompatDialogFragment(), TabsTrayInteractor {
         }
     }
 
-    private fun setupMenu(view: View, navigationInteractor: NavigationInteractor) {
+    @VisibleForTesting
+    internal fun setupMenu(view: View, navigationInteractor: NavigationInteractor) {
         view.tab_tray_overflow.setOnClickListener { anchor ->
 
             requireComponents.analytics.metrics.track(Event.TabsTrayMenuOpened)
 
-            val menu = MenuIntegration(
+            val menu = getTrayMenu(
                 context = requireContext(),
                 browserStore = requireComponents.core.store,
                 tabsTrayStore = tabsTrayStore,
@@ -345,23 +327,47 @@ class TabsTrayFragment : AppCompatDialogFragment(), TabsTrayInteractor {
         }
     }
 
-    private fun setupBackgroundDismissalListener(block: (View) -> Unit) {
+    @VisibleForTesting
+    internal fun getTrayMenu(
+        context: Context,
+        browserStore: BrowserStore,
+        tabsTrayStore: TabsTrayStore,
+        tabLayout: TabLayout,
+        navigationInteractor: NavigationInteractor
+    ) = MenuIntegration(context, browserStore, tabsTrayStore, tabLayout, navigationInteractor)
+
+    @VisibleForTesting
+    internal fun setupBackgroundDismissalListener(block: (View) -> Unit) {
         tabLayout.setOnClickListener(block)
         handle.setOnClickListener(block)
     }
 
-    private val homeViewModel: HomeScreenViewModel by activityViewModels()
+    @VisibleForTesting
+    internal fun dismissTabsTrayAndNavigateHome(sessionId: String) {
+        navigateToHomeAndDeleteSession(sessionId)
+        dismissTabsTray()
+    }
+
+    internal val homeViewModel: HomeScreenViewModel by activityViewModels()
 
-    private fun dismissTabsTrayAndNavigateHome(sessionId: String) {
+    @VisibleForTesting
+    internal fun navigateToHomeAndDeleteSession(sessionId: String) {
         homeViewModel.sessionToDelete = sessionId
         val directions = NavGraphDirections.actionGlobalHome()
         findNavController().navigateBlockingForAsyncNavGraph(directions)
-        dismissTabsTray()
     }
 
-    private fun dismissTabsTray() {
+    @VisibleForTesting
+    internal fun selectTabPosition(position: Int, smoothScroll: Boolean) {
+        tabsTray.setCurrentItem(position, smoothScroll)
+        tab_layout.getTabAt(position)?.select()
+    }
+
+    @VisibleForTesting
+    internal fun dismissTabsTray() {
+        // This should always be the last thing we do because nothing (e.g. telemetry)
+        // is guaranteed after that.
         dismissAllowingStateLoss()
-        requireComponents.analytics.metrics.track(Event.TabsTrayClosed)
     }
 
     companion object {
@@ -372,6 +378,7 @@ class TabsTrayFragment : AppCompatDialogFragment(), TabsTrayInteractor {
         private const val EXPAND_AT_GRID_SIZE = 3
 
         // Elevation for undo toasts
-        private const val ELEVATION = 80f
+        @VisibleForTesting
+        internal const val ELEVATION = 80f
     }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayInfoBannerBinding.kt b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayInfoBannerBinding.kt
index a1251f37e..be92f2105 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayInfoBannerBinding.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayInfoBannerBinding.kt
@@ -9,16 +9,15 @@ import android.view.View.VISIBLE
 import android.view.ViewGroup
 import androidx.annotation.VisibleForTesting
 import kotlin.math.max
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.cancel
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.map
 import mozilla.components.browser.state.selector.normalTabs
 import mozilla.components.browser.state.selector.privateTabs
+import mozilla.components.browser.state.state.BrowserState
 import mozilla.components.browser.state.store.BrowserStore
-import mozilla.components.lib.state.ext.flowScoped
-import mozilla.components.support.base.feature.LifecycleAwareFeature
+import mozilla.components.lib.state.helpers.AbstractBinding
 import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifChanged
 import org.mozilla.fenix.R
 import org.mozilla.fenix.browser.infobanner.InfoBanner
@@ -26,34 +25,27 @@ import org.mozilla.fenix.components.metrics.Event
 import org.mozilla.fenix.components.metrics.MetricController
 import org.mozilla.fenix.utils.Settings
 
+@OptIn(ExperimentalCoroutinesApi::class)
 class TabsTrayInfoBannerBinding(
     private val context: Context,
-    private val store: BrowserStore,
+    store: BrowserStore,
     private val infoBannerView: ViewGroup,
     private val settings: Settings,
     private val navigationInteractor: NavigationInteractor,
     private val metrics: MetricController?
-) : LifecycleAwareFeature {
-    private var scope: CoroutineScope? = null
+) : AbstractBinding<BrowserState>(store) {
 
     @VisibleForTesting
     internal var banner: InfoBanner? = null
 
-    @ExperimentalCoroutinesApi
-    override fun start() {
-        scope = store.flowScoped { flow ->
-            flow.map { state -> max(state.normalTabs.size, state.privateTabs.size) }
-                .ifChanged()
-                .collect { tabCount ->
-                    if (tabCount >= TAB_COUNT_SHOW_CFR) {
-                        displayInfoBannerIfNeeded(settings)
-                    }
+    override suspend fun onState(flow: Flow<BrowserState>) {
+        flow.map { state -> max(state.normalTabs.size, state.privateTabs.size) }
+            .ifChanged()
+            .collect { tabCount ->
+                if (tabCount >= TAB_COUNT_SHOW_CFR) {
+                    displayInfoBannerIfNeeded(settings)
                 }
-        }
-    }
-
-    override fun stop() {
-        scope?.cancel()
+            }
     }
 
     private fun displayInfoBannerIfNeeded(settings: Settings) {
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayInteractor.kt b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayInteractor.kt
index 5c3a7371a..f8223e4b6 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayInteractor.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayInteractor.kt
@@ -13,12 +13,12 @@ interface TabsTrayInteractor {
      * @param position The position on the tray to focus.
      * @param smoothScroll If true, animate the scrolling from the current tab to [position].
      */
-    fun setCurrentTrayPosition(position: Int, smoothScroll: Boolean)
+    fun onTrayPositionSelected(position: Int, smoothScroll: Boolean)
 
     /**
      * Dismisses the tabs tray and navigates to the browser.
      */
-    fun navigateToBrowser()
+    fun onBrowserTabSelected()
 
     /**
      * Invoked when a tab is removed from the tabs tray with the given [tabId].
@@ -30,3 +30,28 @@ interface TabsTrayInteractor {
      */
     fun onDeleteTabs(tabs: Collection<Tab>)
 }
+
+/**
+ * Interactor to be called for any tabs tray user actions.
+ *
+ * @property controller [TabsTrayController] to which user actions can be delegated for actual app update.
+ */
+class DefaultTabsTrayInteractor(
+    private val controller: TabsTrayController
+) : TabsTrayInteractor {
+    override fun onTrayPositionSelected(position: Int, smoothScroll: Boolean) {
+        controller.handleTrayScrollingToPosition(position, smoothScroll)
+    }
+
+    override fun onBrowserTabSelected() {
+        controller.handleNavigateToBrowser()
+    }
+
+    override fun onDeleteTab(tabId: String) {
+        controller.handleTabDeletion(tabId)
+    }
+
+    override fun onDeleteTabs(tabs: Collection<Tab>) {
+        controller.handleMultipleTabsDeletion(tabs)
+    }
+}
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/TrayItem.kt b/app/src/main/java/org/mozilla/fenix/tabstray/TrayItem.kt
deleted file mode 100644
index 032a63492..000000000
--- a/app/src/main/java/org/mozilla/fenix/tabstray/TrayItem.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-/* 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/. */
-
-package org.mozilla.fenix.tabstray
-
-import android.view.View
-import android.view.ViewGroup
-
-/**
- * A [View] or [ViewGroup] that can be add in the Tabs Tray.
- */
-interface TrayItem
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/TrayPagerAdapter.kt b/app/src/main/java/org/mozilla/fenix/tabstray/TrayPagerAdapter.kt
index 7b72b8144..43d74280e 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/TrayPagerAdapter.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/TrayPagerAdapter.kt
@@ -7,6 +7,7 @@ package org.mozilla.fenix.tabstray
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import androidx.annotation.VisibleForTesting
 import androidx.recyclerview.widget.RecyclerView
 import mozilla.components.browser.state.selector.normalTabs
 import mozilla.components.browser.state.selector.privateTabs
@@ -16,48 +17,48 @@ import org.mozilla.fenix.sync.SyncedTabsAdapter
 import org.mozilla.fenix.tabstray.browser.BrowserTabsAdapter
 import org.mozilla.fenix.tabstray.browser.BrowserTrayInteractor
 import org.mozilla.fenix.tabstray.syncedtabs.TabClickDelegate
-import org.mozilla.fenix.tabstray.viewholders.AbstractTrayViewHolder
-import org.mozilla.fenix.tabstray.viewholders.NormalBrowserTabViewHolder
-import org.mozilla.fenix.tabstray.viewholders.PrivateBrowserTabViewHolder
-import org.mozilla.fenix.tabstray.viewholders.SyncedTabViewHolder
+import org.mozilla.fenix.tabstray.viewholders.AbstractPageViewHolder
+import org.mozilla.fenix.tabstray.viewholders.NormalBrowserPageViewHolder
+import org.mozilla.fenix.tabstray.viewholders.PrivateBrowserPageViewHolder
+import org.mozilla.fenix.tabstray.viewholders.SyncedTabsPageViewHolder
 
 class TrayPagerAdapter(
-    private val context: Context,
-    private val store: TabsTrayStore,
-    private val browserInteractor: BrowserTrayInteractor,
-    private val navInteractor: NavigationInteractor,
-    private val interactor: TabsTrayInteractor,
-    private val browserStore: BrowserStore
-) : RecyclerView.Adapter<AbstractTrayViewHolder>() {
+    @VisibleForTesting internal val context: Context,
+    @VisibleForTesting internal val store: TabsTrayStore,
+    @VisibleForTesting internal val browserInteractor: BrowserTrayInteractor,
+    @VisibleForTesting internal val navInteractor: NavigationInteractor,
+    @VisibleForTesting internal val interactor: TabsTrayInteractor,
+    @VisibleForTesting internal val browserStore: BrowserStore
+) : RecyclerView.Adapter<AbstractPageViewHolder>() {
 
     private val normalAdapter by lazy { BrowserTabsAdapter(context, browserInteractor, store) }
     private val privateAdapter by lazy { BrowserTabsAdapter(context, browserInteractor, store) }
     private val syncedTabsAdapter by lazy { SyncedTabsAdapter(TabClickDelegate(navInteractor)) }
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AbstractTrayViewHolder {
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AbstractPageViewHolder {
         val itemView = LayoutInflater.from(parent.context).inflate(viewType, parent, false)
 
         val selectedTab = browserStore.state.selectedTab
 
         return when (viewType) {
-            NormalBrowserTabViewHolder.LAYOUT_ID -> {
-                NormalBrowserTabViewHolder(
+            NormalBrowserPageViewHolder.LAYOUT_ID -> {
+                NormalBrowserPageViewHolder(
                     itemView,
                     store,
                     interactor,
                     browserStore.state.normalTabs.indexOf(selectedTab)
                 )
             }
-            PrivateBrowserTabViewHolder.LAYOUT_ID -> {
-                PrivateBrowserTabViewHolder(
+            PrivateBrowserPageViewHolder.LAYOUT_ID -> {
+                PrivateBrowserPageViewHolder(
                     itemView,
                     store,
                     interactor,
                     browserStore.state.privateTabs.indexOf(selectedTab)
                 )
             }
-            SyncedTabViewHolder.LAYOUT_ID -> {
-                SyncedTabViewHolder(
+            SyncedTabsPageViewHolder.LAYOUT_ID -> {
+                SyncedTabsPageViewHolder(
                     itemView,
                     store
                 )
@@ -66,7 +67,7 @@ class TrayPagerAdapter(
         }
     }
 
-    override fun onBindViewHolder(viewHolder: AbstractTrayViewHolder, position: Int) {
+    override fun onBindViewHolder(viewHolder: AbstractPageViewHolder, position: Int) {
         val adapter = when (position) {
             POSITION_NORMAL_TABS -> normalAdapter
             POSITION_PRIVATE_TABS -> privateAdapter
@@ -78,9 +79,9 @@ class TrayPagerAdapter(
 
     override fun getItemViewType(position: Int): Int {
         return when (position) {
-            POSITION_NORMAL_TABS -> NormalBrowserTabViewHolder.LAYOUT_ID
-            POSITION_PRIVATE_TABS -> PrivateBrowserTabViewHolder.LAYOUT_ID
-            POSITION_SYNCED_TABS -> SyncedTabViewHolder.LAYOUT_ID
+            POSITION_NORMAL_TABS -> NormalBrowserPageViewHolder.LAYOUT_ID
+            POSITION_PRIVATE_TABS -> PrivateBrowserPageViewHolder.LAYOUT_ID
+            POSITION_SYNCED_TABS -> SyncedTabsPageViewHolder.LAYOUT_ID
             else -> throw IllegalStateException("Unknown position.")
         }
     }
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayViewHolder.kt b/app/src/main/java/org/mozilla/fenix/tabstray/browser/AbstractBrowserTabViewHolder.kt
similarity index 97%
rename from app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayViewHolder.kt
rename to app/src/main/java/org/mozilla/fenix/tabstray/browser/AbstractBrowserTabViewHolder.kt
index e0c443526..75b0ba9ea 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/browser/AbstractBrowserTabViewHolder.kt
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.mozilla.fenix.tabstray
+package org.mozilla.fenix.tabstray.browser
 
 import android.view.View
 import android.widget.ImageButton
@@ -37,13 +37,14 @@ import org.mozilla.fenix.ext.showAndEnable
 import org.mozilla.fenix.ext.toShortUrl
 import org.mozilla.fenix.selection.SelectionHolder
 import org.mozilla.fenix.selection.SelectionInteractor
-import org.mozilla.fenix.tabstray.browser.BrowserTrayInteractor
+import org.mozilla.fenix.tabstray.TabsTrayState
+import org.mozilla.fenix.tabstray.TabsTrayStore
 import org.mozilla.fenix.tabstray.ext.isSelect
 
 /**
  * A RecyclerView ViewHolder implementation for "tab" items.
  */
-abstract class TabsTrayViewHolder(
+abstract class AbstractBrowserTabViewHolder(
     itemView: View,
     private val imageLoader: ImageLoader,
     private val trayStore: TabsTrayStore,
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/browser/TabsTrayGridViewHolder.kt b/app/src/main/java/org/mozilla/fenix/tabstray/browser/BrowserTabGridViewHolder.kt
similarity index 93%
rename from app/src/main/java/org/mozilla/fenix/tabstray/browser/TabsTrayGridViewHolder.kt
rename to app/src/main/java/org/mozilla/fenix/tabstray/browser/BrowserTabGridViewHolder.kt
index 51915b03d..3257df562 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/browser/TabsTrayGridViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/browser/BrowserTabGridViewHolder.kt
@@ -16,20 +16,19 @@ import org.mozilla.fenix.R
 import org.mozilla.fenix.ext.increaseTapArea
 import kotlin.math.max
 import kotlinx.android.synthetic.main.tab_tray_grid_item.view.tab_tray_grid_item
-import org.mozilla.fenix.tabstray.TabsTrayViewHolder
 import org.mozilla.fenix.selection.SelectionHolder
 import org.mozilla.fenix.tabstray.TabsTrayStore
 
 /**
  * A RecyclerView ViewHolder implementation for "tab" items with grid layout.
  */
-class TabsTrayGridViewHolder(
+class BrowserTabGridViewHolder(
     imageLoader: ImageLoader,
     override val browserTrayInteractor: BrowserTrayInteractor,
     store: TabsTrayStore,
     selectionHolder: SelectionHolder<Tab>? = null,
     itemView: View
-) : TabsTrayViewHolder(itemView, imageLoader, store, selectionHolder) {
+) : AbstractBrowserTabViewHolder(itemView, imageLoader, store, selectionHolder) {
 
     private val closeButton: AppCompatImageButton = itemView.findViewById(R.id.mozac_browser_tabstray_close)
 
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/browser/TabsTrayListViewHolder.kt b/app/src/main/java/org/mozilla/fenix/tabstray/browser/BrowserTabListViewHolder.kt
similarity index 90%
rename from app/src/main/java/org/mozilla/fenix/tabstray/browser/TabsTrayListViewHolder.kt
rename to app/src/main/java/org/mozilla/fenix/tabstray/browser/BrowserTabListViewHolder.kt
index cc65f6846..da3f13ba8 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/browser/TabsTrayListViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/browser/BrowserTabListViewHolder.kt
@@ -9,7 +9,6 @@ import androidx.core.content.ContextCompat
 import mozilla.components.concept.base.images.ImageLoader
 import mozilla.components.concept.tabstray.Tab
 import org.mozilla.fenix.R
-import org.mozilla.fenix.tabstray.TabsTrayViewHolder
 import org.mozilla.fenix.selection.SelectionHolder
 import org.mozilla.fenix.tabstray.TabsTrayStore
 import kotlin.math.max
@@ -17,13 +16,13 @@ import kotlin.math.max
 /**
  * A RecyclerView ViewHolder implementation for "tab" items with list layout.
  */
-class TabsTrayListViewHolder(
+class BrowserTabListViewHolder(
     imageLoader: ImageLoader,
     override val browserTrayInteractor: BrowserTrayInteractor,
     store: TabsTrayStore,
     selectionHolder: SelectionHolder<Tab>? = null,
     itemView: View
-) : TabsTrayViewHolder(itemView, imageLoader, store, selectionHolder) {
+) : AbstractBrowserTabViewHolder(itemView, imageLoader, store, selectionHolder) {
     override val thumbnailSize: Int
         get() = max(
             itemView.resources.getDimensionPixelSize(R.dimen.tab_tray_list_item_thumbnail_height),
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/browser/BrowserTabsAdapter.kt b/app/src/main/java/org/mozilla/fenix/tabstray/browser/BrowserTabsAdapter.kt
index 3eb5550f3..b69f845bf 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/browser/BrowserTabsAdapter.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/browser/BrowserTabsAdapter.kt
@@ -20,7 +20,6 @@ import org.mozilla.fenix.R
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.selection.SelectionHolder
 import org.mozilla.fenix.tabstray.TabsTrayStore
-import org.mozilla.fenix.tabstray.TabsTrayViewHolder
 
 /**
  * A [RecyclerView.Adapter] for browser tabs.
@@ -30,7 +29,7 @@ class BrowserTabsAdapter(
     private val interactor: BrowserTrayInteractor,
     private val store: TabsTrayStore,
     delegate: Observable<TabsTray.Observer> = ObserverRegistry()
-) : TabsAdapter<TabsTrayViewHolder>(delegate) {
+) : TabsAdapter<AbstractBrowserTabViewHolder>(delegate) {
 
     /**
      * The layout types for the tabs.
@@ -56,18 +55,18 @@ class BrowserTabsAdapter(
         }
     }
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TabsTrayViewHolder {
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AbstractBrowserTabViewHolder {
         val view = LayoutInflater.from(parent.context).inflate(viewType, parent, false)
 
         return when (viewType) {
             ViewType.GRID.layoutRes ->
-                TabsTrayGridViewHolder(imageLoader, interactor, store, selectionHolder, view)
+                BrowserTabGridViewHolder(imageLoader, interactor, store, selectionHolder, view)
             else ->
-                TabsTrayListViewHolder(imageLoader, interactor, store, selectionHolder, view)
+                BrowserTabListViewHolder(imageLoader, interactor, store, selectionHolder, view)
         }
     }
 
-    override fun onBindViewHolder(holder: TabsTrayViewHolder, position: Int) {
+    override fun onBindViewHolder(holder: AbstractBrowserTabViewHolder, position: Int) {
         super.onBindViewHolder(holder, position)
 
         holder.tab?.let { tab ->
@@ -85,7 +84,7 @@ class BrowserTabsAdapter(
      * Over-ridden [onBindViewHolder] that uses the payloads to notify the selected tab how to
      * display itself.
      */
-    override fun onBindViewHolder(holder: TabsTrayViewHolder, position: Int, payloads: List<Any>) {
+    override fun onBindViewHolder(holder: AbstractBrowserTabViewHolder, position: Int, payloads: List<Any>) {
         val tabs = tabs ?: return
 
         if (tabs.list.isEmpty()) return
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/browser/BrowserTrayInteractor.kt b/app/src/main/java/org/mozilla/fenix/tabstray/browser/BrowserTrayInteractor.kt
index 49cb4784d..ec03088f2 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/browser/BrowserTrayInteractor.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/browser/BrowserTrayInteractor.kt
@@ -22,7 +22,7 @@ import org.mozilla.fenix.tabstray.TabsTrayState.Mode
 import org.mozilla.fenix.tabstray.TabsTrayStore
 
 /**
- * For interacting with UI that is specifically for [BaseBrowserTrayList] and other browser
+ * For interacting with UI that is specifically for [BrowserTrayList] and other browser
  * tab tray views.
  */
 interface BrowserTrayInteractor : SelectionInteractor<Tab>, UserInteractionHandler {
@@ -57,7 +57,7 @@ class DefaultBrowserTrayInteractor(
 
     private val selectTabWrapper by lazy {
         SelectTabUseCaseWrapper(metrics, selectTab) {
-            trayInteractor.navigateToBrowser()
+            trayInteractor.onBrowserTabSelected()
         }
     }
 
@@ -73,7 +73,6 @@ class DefaultBrowserTrayInteractor(
      */
     override fun open(item: Tab) {
         selectTabWrapper.invoke(item.id)
-        trayInteractor.navigateToBrowser()
     }
 
     /**
@@ -133,6 +132,6 @@ class DefaultBrowserTrayInteractor(
      * See [BrowserTrayInteractor.onFabClicked]
      */
     override fun onFabClicked(isPrivate: Boolean) {
-        controller.onNewTabTapped(isPrivate)
+        controller.handleOpeningNewTab(isPrivate)
     }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/browser/BaseBrowserTrayList.kt b/app/src/main/java/org/mozilla/fenix/tabstray/browser/BrowserTrayList.kt
similarity index 85%
rename from app/src/main/java/org/mozilla/fenix/tabstray/browser/BaseBrowserTrayList.kt
rename to app/src/main/java/org/mozilla/fenix/tabstray/browser/BrowserTrayList.kt
index 81029500f..4d561ed76 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/browser/BaseBrowserTrayList.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/browser/BrowserTrayList.kt
@@ -12,27 +12,20 @@ import mozilla.components.feature.tabs.tabstray.TabsFeature
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.tabstray.TabsTrayInteractor
 import org.mozilla.fenix.tabstray.TabsTrayStore
-import org.mozilla.fenix.tabstray.TrayItem
 import org.mozilla.fenix.tabstray.ext.filterFromConfig
 
-abstract class BaseBrowserTrayList @JvmOverloads constructor(
+class BrowserTrayList @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0
-) : RecyclerView(context, attrs, defStyleAttr), TrayItem {
+) : RecyclerView(context, attrs, defStyleAttr) {
 
     /**
      * The browser tab types we would want to show.
      */
     enum class BrowserTabType { NORMAL, PRIVATE }
 
-    /**
-     * A configuration for classes that extend [BaseBrowserTrayList].
-     */
-    data class Configuration(val browserTabType: BrowserTabType)
-
-    abstract val configuration: Configuration
-
+    lateinit var browserTabType: BrowserTabType
     lateinit var interactor: TabsTrayInteractor
     lateinit var tabsTrayStore: TabsTrayStore
 
@@ -43,7 +36,7 @@ abstract class BaseBrowserTrayList @JvmOverloads constructor(
             context.components.analytics.metrics,
             context.components.useCases.tabsUseCases.selectTab
         ) {
-            interactor.navigateToBrowser()
+            interactor.onBrowserTabSelected()
         }
 
         val removeTabUseCase = RemoveTabUseCaseWrapper(
@@ -57,7 +50,7 @@ abstract class BaseBrowserTrayList @JvmOverloads constructor(
             context.components.core.store,
             selectTabUseCase,
             removeTabUseCase,
-            { it.filterFromConfig(configuration) },
+            { it.filterFromConfig(browserTabType) },
             { }
         )
     }
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/browser/NormalBrowserTrayList.kt b/app/src/main/java/org/mozilla/fenix/tabstray/browser/NormalBrowserTrayList.kt
deleted file mode 100644
index eed7f8586..000000000
--- a/app/src/main/java/org/mozilla/fenix/tabstray/browser/NormalBrowserTrayList.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-/* 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/. */
-
-package org.mozilla.fenix.tabstray.browser
-
-import android.content.Context
-import android.util.AttributeSet
-
-/**
- * A browser tabs list that displays normal tabs.
- */
-class NormalBrowserTrayList @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
-) : BaseBrowserTrayList(context, attrs, defStyleAttr) {
-    override val configuration: Configuration = Configuration(BrowserTabType.NORMAL)
-}
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/browser/PrivateBrowserTrayList.kt b/app/src/main/java/org/mozilla/fenix/tabstray/browser/PrivateBrowserTrayList.kt
deleted file mode 100644
index 0b8f73e72..000000000
--- a/app/src/main/java/org/mozilla/fenix/tabstray/browser/PrivateBrowserTrayList.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-/* 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/. */
-
-package org.mozilla.fenix.tabstray.browser
-
-import android.content.Context
-import android.util.AttributeSet
-
-/**
- * A browser tabs list that displays private tabs.
- */
-class PrivateBrowserTrayList @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
-) : BaseBrowserTrayList(context, attrs, defStyleAttr) {
-    override val configuration: Configuration = Configuration(BrowserTabType.PRIVATE)
-}
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/browser/SelectedItemAdapterBinding.kt b/app/src/main/java/org/mozilla/fenix/tabstray/browser/SelectedItemAdapterBinding.kt
index a725364dc..cfb785a6e 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/browser/SelectedItemAdapterBinding.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/browser/SelectedItemAdapterBinding.kt
@@ -4,44 +4,36 @@
 
 package org.mozilla.fenix.tabstray.browser
 
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.cancel
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.flow.map
 import mozilla.components.browser.tabstray.TabsAdapter.Companion.PAYLOAD_DONT_HIGHLIGHT_SELECTED_ITEM
 import mozilla.components.browser.tabstray.TabsAdapter.Companion.PAYLOAD_HIGHLIGHT_SELECTED_ITEM
-import mozilla.components.lib.state.ext.flowScoped
-import mozilla.components.support.base.feature.LifecycleAwareFeature
+import mozilla.components.lib.state.helpers.AbstractBinding
 import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifChanged
+import org.mozilla.fenix.tabstray.TabsTrayState
 import org.mozilla.fenix.tabstray.TabsTrayState.Mode
 import org.mozilla.fenix.tabstray.TabsTrayStore
 
 /**
  * Notifies the adapter when the selection mode changes.
  */
+@OptIn(ExperimentalCoroutinesApi::class)
 class SelectedItemAdapterBinding(
-    val store: TabsTrayStore,
+    store: TabsTrayStore,
     val adapter: BrowserTabsAdapter
-) : LifecycleAwareFeature {
-    private var scope: CoroutineScope? = null
+) : AbstractBinding<TabsTrayState>(store) {
 
-    @OptIn(ExperimentalCoroutinesApi::class)
-    override fun start() {
-        scope = store.flowScoped { flow ->
-            flow.map { it.mode }
-                // ignore initial mode update; the adapter is already in an updated state.
-                .drop(1)
-                .ifChanged()
-                .collect { mode ->
-                    notifyAdapter(mode)
-                }
-        }
-    }
-
-    override fun stop() {
-        scope?.cancel()
+    override suspend fun onState(flow: Flow<TabsTrayState>) {
+        flow.map { it.mode }
+            // ignore initial mode update; the adapter is already in an updated state.
+            .drop(1)
+            .ifChanged()
+            .collect { mode ->
+                notifyAdapter(mode)
+            }
     }
 
     private fun notifyAdapter(mode: Mode) = with(adapter) {
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/browser/SelectionBannerBinding.kt b/app/src/main/java/org/mozilla/fenix/tabstray/browser/SelectionBannerBinding.kt
index 8850049a4..0bf301d0a 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/browser/SelectionBannerBinding.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/browser/SelectionBannerBinding.kt
@@ -12,13 +12,14 @@ import androidx.core.view.isVisible
 import kotlinx.android.synthetic.main.component_tabstray2.view.exit_multi_select
 import kotlinx.android.synthetic.main.component_tabstray2.view.multiselect_title
 import kotlinx.android.synthetic.main.tabstray_multiselect_items.view.*
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.flow.map
+import mozilla.components.lib.state.helpers.AbstractBinding
 import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifChanged
 import org.mozilla.fenix.R
-import org.mozilla.fenix.components.AbstractBinding
 import org.mozilla.fenix.tabstray.NavigationInteractor
 import org.mozilla.fenix.tabstray.TabsTrayInteractor
 import org.mozilla.fenix.tabstray.TabsTrayState
@@ -41,6 +42,7 @@ import org.mozilla.fenix.tabstray.ext.showWithTheme
  * @property showOnSelectViews A variable list of views that will be made visible when in select mode.
  * @property showOnNormalViews A variable list of views that will be made visible when in normal mode.
  */
+@OptIn(ExperimentalCoroutinesApi::class)
 @Suppress("LongParameterList")
 class SelectionBannerBinding(
     private val context: Context,
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/browser/SelectionHandleBinding.kt b/app/src/main/java/org/mozilla/fenix/tabstray/browser/SelectionHandleBinding.kt
index 6560b8d93..0e850a1d2 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/browser/SelectionHandleBinding.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/browser/SelectionHandleBinding.kt
@@ -10,13 +10,14 @@ import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.constraintlayout.widget.ConstraintSet
 import androidx.core.content.ContextCompat
 import androidx.core.view.updateLayoutParams
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.flow.map
+import mozilla.components.lib.state.helpers.AbstractBinding
 import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifChanged
 import org.mozilla.fenix.R
-import org.mozilla.fenix.components.AbstractBinding
 import org.mozilla.fenix.tabstray.TabsTrayState
 import org.mozilla.fenix.tabstray.TabsTrayState.Mode
 import org.mozilla.fenix.tabstray.TabsTrayStore
@@ -31,6 +32,7 @@ private const val NORMAL_HANDLE_PERCENT_WIDTH = 0.1F
  * @property handle The "handle" of the Tabs Tray that is used to drag the tray open/close.
  * @property containerLayout The [ConstraintLayout] that contains the "handle".
  */
+@OptIn(ExperimentalCoroutinesApi::class)
 class SelectionHandleBinding(
     store: TabsTrayStore,
     private val handle: View,
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/browser/SelectionMenuIntegration.kt b/app/src/main/java/org/mozilla/fenix/tabstray/browser/SelectionMenuIntegration.kt
index a865ebae7..40fee99e8 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/browser/SelectionMenuIntegration.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/browser/SelectionMenuIntegration.kt
@@ -8,6 +8,7 @@ import android.content.Context
 import androidx.annotation.VisibleForTesting
 import mozilla.components.browser.menu.BrowserMenuBuilder
 import org.mozilla.fenix.tabstray.NavigationInteractor
+import org.mozilla.fenix.tabstray.TabsTrayAction
 import org.mozilla.fenix.tabstray.TabsTrayInteractor
 import org.mozilla.fenix.tabstray.TabsTrayStore
 import org.mozilla.fenix.utils.Do
@@ -30,12 +31,14 @@ class SelectionMenuIntegration(
     @VisibleForTesting
     internal fun handleMenuClicked(item: SelectionMenu.Item) {
         Do exhaustive when (item) {
-            is SelectionMenu.Item.BookmarkTabs -> navInteractor.onSaveToBookmarks(
-                store.state.mode.selectedTabs
-            )
-            is SelectionMenu.Item.DeleteTabs -> trayInteractor.onDeleteTabs(
-                store.state.mode.selectedTabs
-            )
+            is SelectionMenu.Item.BookmarkTabs -> {
+                navInteractor.onSaveToBookmarks(store.state.mode.selectedTabs)
+                store.dispatch(TabsTrayAction.ExitSelectMode)
+            }
+            is SelectionMenu.Item.DeleteTabs -> {
+                trayInteractor.onDeleteTabs(store.state.mode.selectedTabs)
+                store.dispatch(TabsTrayAction.ExitSelectMode)
+            }
         }
     }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/browser/SwipeToDeleteBinding.kt b/app/src/main/java/org/mozilla/fenix/tabstray/browser/SwipeToDeleteBinding.kt
index fd7052e81..b5276ecd5 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/browser/SwipeToDeleteBinding.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/browser/SwipeToDeleteBinding.kt
@@ -4,13 +4,11 @@
 
 package org.mozilla.fenix.tabstray.browser
 
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.cancel
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.map
-import mozilla.components.lib.state.ext.flowScoped
-import mozilla.components.support.base.feature.LifecycleAwareFeature
+import mozilla.components.lib.state.helpers.AbstractBinding
 import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifChanged
 import org.mozilla.fenix.tabstray.TabsTrayState
 import org.mozilla.fenix.tabstray.TabsTrayStore
@@ -18,25 +16,18 @@ import org.mozilla.fenix.tabstray.TabsTrayStore
 /**
  * Notifies whether a tab is accessible for using the swipe-to-delete gesture.
  */
+@OptIn(ExperimentalCoroutinesApi::class)
 class SwipeToDeleteBinding(
     private val store: TabsTrayStore
-) : LifecycleAwareFeature {
-    private var scope: CoroutineScope? = null
+) : AbstractBinding<TabsTrayState>(store) {
     var isSwipeable = false
         private set
 
-    @OptIn(ExperimentalCoroutinesApi::class)
-    override fun start() {
-        scope = store.flowScoped { flow ->
-            flow.map { it.mode }
-                .ifChanged()
-                .collect { mode ->
-                    isSwipeable = mode == TabsTrayState.Mode.Normal
-                }
-        }
-    }
-
-    override fun stop() {
-        scope?.cancel()
+    override suspend fun onState(flow: Flow<TabsTrayState>) {
+        flow.map { it.mode }
+            .ifChanged()
+            .collect { mode ->
+                isSwipeable = mode == TabsTrayState.Mode.Normal
+            }
     }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/ext/TabSessionState.kt b/app/src/main/java/org/mozilla/fenix/tabstray/ext/TabSessionState.kt
index 777e4f47e..663fb6e21 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/ext/TabSessionState.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/ext/TabSessionState.kt
@@ -6,17 +6,17 @@ package org.mozilla.fenix.tabstray.ext
 
 import mozilla.components.browser.state.state.TabSessionState
 import org.mozilla.fenix.tabstray.Page
-import org.mozilla.fenix.tabstray.browser.BaseBrowserTrayList.BrowserTabType.PRIVATE
-import org.mozilla.fenix.tabstray.browser.BaseBrowserTrayList.Configuration
+import org.mozilla.fenix.tabstray.browser.BrowserTrayList.BrowserTabType
+import org.mozilla.fenix.tabstray.browser.BrowserTrayList.BrowserTabType.PRIVATE
 
-fun TabSessionState.filterFromConfig(configuration: Configuration): Boolean {
-    val isPrivate = configuration.browserTabType == PRIVATE
+fun TabSessionState.filterFromConfig(type: BrowserTabType): Boolean {
+    val isPrivate = type == PRIVATE
 
     return content.private == isPrivate
 }
 
 fun TabSessionState.getTrayPosition(): Int =
     when (content.private) {
-        true -> Page.NormalTabs.ordinal
+        true -> Page.PrivateTabs.ordinal
         false -> Page.NormalTabs.ordinal
     }
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/syncedtabs/SyncButtonBinding.kt b/app/src/main/java/org/mozilla/fenix/tabstray/syncedtabs/SyncButtonBinding.kt
index e07c7008f..435286584 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/syncedtabs/SyncButtonBinding.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/syncedtabs/SyncButtonBinding.kt
@@ -4,12 +4,13 @@
 
 package org.mozilla.fenix.tabstray.syncedtabs
 
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.map
 import mozilla.components.feature.syncedtabs.view.SyncedTabsView
+import mozilla.components.lib.state.helpers.AbstractBinding
 import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifChanged
-import org.mozilla.fenix.components.AbstractBinding
 import org.mozilla.fenix.tabstray.TabsTrayState
 import org.mozilla.fenix.tabstray.TabsTrayStore
 
@@ -19,6 +20,7 @@ import org.mozilla.fenix.tabstray.TabsTrayStore
  *
  * This binding is useful for connecting with [SyncedTabsView.Listener].
  */
+@OptIn(ExperimentalCoroutinesApi::class)
 class SyncButtonBinding(
     tabsTrayStore: TabsTrayStore,
     private val onSyncNow: () -> Unit
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/syncedtabs/SyncedTabsTrayLayout.kt b/app/src/main/java/org/mozilla/fenix/tabstray/syncedtabs/SyncedTabsTrayLayout.kt
index d659f28a9..5314fd7aa 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/syncedtabs/SyncedTabsTrayLayout.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/syncedtabs/SyncedTabsTrayLayout.kt
@@ -27,14 +27,13 @@ import org.mozilla.fenix.sync.ext.toStringRes
 import org.mozilla.fenix.tabstray.TabsTrayAction
 import org.mozilla.fenix.tabstray.TabsTrayFragment
 import org.mozilla.fenix.tabstray.TabsTrayStore
-import org.mozilla.fenix.tabstray.TrayItem
 import org.mozilla.fenix.utils.view.LifecycleViewProvider
 
 class SyncedTabsTrayLayout @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0
-) : ConstraintLayout(context, attrs, defStyleAttr), SyncedTabsView, TrayItem,
+) : ConstraintLayout(context, attrs, defStyleAttr), SyncedTabsView,
     Observable<SyncedTabsView.Listener> by ObserverRegistry() {
 
     private val lifecycleProvider = LifecycleViewProvider(this)
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/viewholders/BaseBrowserTabViewHolder.kt b/app/src/main/java/org/mozilla/fenix/tabstray/viewholders/AbstractBrowserPageViewHolder.kt
similarity index 90%
rename from app/src/main/java/org/mozilla/fenix/tabstray/viewholders/BaseBrowserTabViewHolder.kt
rename to app/src/main/java/org/mozilla/fenix/tabstray/viewholders/AbstractBrowserPageViewHolder.kt
index faecdd921..9e06a3104 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/viewholders/BaseBrowserTabViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/viewholders/AbstractBrowserPageViewHolder.kt
@@ -13,19 +13,19 @@ import androidx.recyclerview.widget.RecyclerView
 import org.mozilla.fenix.R
 import org.mozilla.fenix.tabstray.TabsTrayInteractor
 import org.mozilla.fenix.tabstray.TabsTrayStore
-import org.mozilla.fenix.tabstray.browser.BaseBrowserTrayList
+import org.mozilla.fenix.tabstray.browser.BrowserTrayList
 
 /**
  * A shared view holder for browser tabs tray list.
  */
-abstract class BaseBrowserTabViewHolder(
+abstract class AbstractBrowserPageViewHolder(
     containerView: View,
     tabsTrayStore: TabsTrayStore,
     interactor: TabsTrayInteractor,
     private val currentTabIndex: Int
-) : AbstractTrayViewHolder(containerView) {
+) : AbstractPageViewHolder(containerView) {
 
-    private val trayList: BaseBrowserTrayList = itemView.findViewById(R.id.tray_list_item)
+    protected val trayList: BrowserTrayList = itemView.findViewById(R.id.tray_list_item)
     private val emptyList: TextView = itemView.findViewById(R.id.tab_tray_empty_view)
     abstract val emptyStringText: String
 
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/viewholders/AbstractTrayViewHolder.kt b/app/src/main/java/org/mozilla/fenix/tabstray/viewholders/AbstractPageViewHolder.kt
similarity index 93%
rename from app/src/main/java/org/mozilla/fenix/tabstray/viewholders/AbstractTrayViewHolder.kt
rename to app/src/main/java/org/mozilla/fenix/tabstray/viewholders/AbstractPageViewHolder.kt
index ebe7725e5..ff6055d90 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/viewholders/AbstractTrayViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/viewholders/AbstractPageViewHolder.kt
@@ -12,7 +12,7 @@ import org.mozilla.fenix.tabstray.TrayPagerAdapter
 /**
  * An abstract [RecyclerView.ViewHolder] for [TrayPagerAdapter] items.
  */
-abstract class AbstractTrayViewHolder constructor(
+abstract class AbstractPageViewHolder constructor(
     override val containerView: View
 ) : RecyclerView.ViewHolder(containerView), LayoutContainer {
 
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/viewholders/NormalBrowserTabViewHolder.kt b/app/src/main/java/org/mozilla/fenix/tabstray/viewholders/NormalBrowserPageViewHolder.kt
similarity index 88%
rename from app/src/main/java/org/mozilla/fenix/tabstray/viewholders/NormalBrowserTabViewHolder.kt
rename to app/src/main/java/org/mozilla/fenix/tabstray/viewholders/NormalBrowserPageViewHolder.kt
index 61a1f1a4e..4edb2a9c2 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/viewholders/NormalBrowserTabViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/viewholders/NormalBrowserPageViewHolder.kt
@@ -11,23 +11,28 @@ import org.mozilla.fenix.R
 import org.mozilla.fenix.selection.SelectionHolder
 import org.mozilla.fenix.tabstray.TabsTrayInteractor
 import org.mozilla.fenix.tabstray.TabsTrayStore
+import org.mozilla.fenix.tabstray.browser.BrowserTrayList.BrowserTabType.NORMAL
 import org.mozilla.fenix.tabstray.browser.BrowserTabsAdapter
 
 /**
  * View holder for the normal tabs tray list.
  */
-class NormalBrowserTabViewHolder(
+class NormalBrowserPageViewHolder(
     containerView: View,
     private val store: TabsTrayStore,
     interactor: TabsTrayInteractor,
     currentTabIndex: Int
-) : BaseBrowserTabViewHolder(
+) : AbstractBrowserPageViewHolder(
     containerView,
     store,
     interactor,
     currentTabIndex
 ), SelectionHolder<Tab> {
 
+    init {
+        trayList.browserTabType = NORMAL
+    }
+
     /**
      * Holds the list of selected tabs.
      *
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/viewholders/PrivateBrowserTabViewHolder.kt b/app/src/main/java/org/mozilla/fenix/tabstray/viewholders/PrivateBrowserPageViewHolder.kt
similarity index 80%
rename from app/src/main/java/org/mozilla/fenix/tabstray/viewholders/PrivateBrowserTabViewHolder.kt
rename to app/src/main/java/org/mozilla/fenix/tabstray/viewholders/PrivateBrowserPageViewHolder.kt
index b49bc8fc1..c213ee512 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/viewholders/PrivateBrowserTabViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/viewholders/PrivateBrowserPageViewHolder.kt
@@ -8,21 +8,27 @@ import android.view.View
 import org.mozilla.fenix.R
 import org.mozilla.fenix.tabstray.TabsTrayInteractor
 import org.mozilla.fenix.tabstray.TabsTrayStore
+import org.mozilla.fenix.tabstray.browser.BrowserTrayList.BrowserTabType.PRIVATE
 
 /**
  * View holder for the private tabs tray list.
  */
-class PrivateBrowserTabViewHolder(
+class PrivateBrowserPageViewHolder(
     containerView: View,
     store: TabsTrayStore,
     interactor: TabsTrayInteractor,
     currentTabIndex: Int
-) : BaseBrowserTabViewHolder(
+) : AbstractBrowserPageViewHolder(
     containerView,
     store,
     interactor,
     currentTabIndex
 ) {
+
+    init {
+        trayList.browserTabType = PRIVATE
+    }
+
     override val emptyStringText: String
         get() = itemView.resources.getString(R.string.no_private_tabs_description)
 
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/viewholders/SyncedTabViewHolder.kt b/app/src/main/java/org/mozilla/fenix/tabstray/viewholders/SyncedTabsPageViewHolder.kt
similarity index 92%
rename from app/src/main/java/org/mozilla/fenix/tabstray/viewholders/SyncedTabViewHolder.kt
rename to app/src/main/java/org/mozilla/fenix/tabstray/viewholders/SyncedTabsPageViewHolder.kt
index 066fce9fa..601f78d21 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/viewholders/SyncedTabViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/viewholders/SyncedTabsPageViewHolder.kt
@@ -10,10 +10,10 @@ import kotlinx.android.synthetic.main.component_sync_tabs_tray_layout.*
 import org.mozilla.fenix.R
 import org.mozilla.fenix.tabstray.TabsTrayStore
 
-class SyncedTabViewHolder(
+class SyncedTabsPageViewHolder(
     containerView: View,
     private val tabsTrayStore: TabsTrayStore
-) : AbstractTrayViewHolder(containerView) {
+) : AbstractPageViewHolder(containerView) {
 
     override fun bind(
         adapter: RecyclerView.Adapter<out RecyclerView.ViewHolder>,
diff --git a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
index c67a40e32..6fbd03afa 100644
--- a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
+++ b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
@@ -34,7 +34,7 @@ import org.mozilla.fenix.components.settings.counterPreference
 import org.mozilla.fenix.components.settings.featureFlagPreference
 import org.mozilla.fenix.components.toolbar.ToolbarPosition
 import org.mozilla.fenix.experiments.ExperimentBranch
-import org.mozilla.fenix.experiments.Experiments
+import org.mozilla.fenix.experiments.FeatureId
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.getPreferenceKey
 import org.mozilla.fenix.ext.withExperiment
@@ -249,7 +249,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
         get() = loginsSecureWarningSyncCount.underMaxCount()
 
     val shouldShowSecurityPinWarning: Boolean
-        get() = loginsSecureWarningCount.underMaxCount()
+        get() = secureWarningCount.underMaxCount()
 
     var shouldShowPrivacyPopWindow by booleanPreference(
         appContext.getPreferenceKey(R.string.pref_key_privacy_pop_window),
@@ -312,10 +312,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
         val browsers = BrowsersCache.all(appContext)
         val experiments = appContext.components.analytics.experiments
         val isExperimentBranch =
-            experiments.withExperiment(Experiments.DEFAULT_BROWSER) { experimentBranch ->
+            experiments.withExperiment(FeatureId.DEFAULT_BROWSER) { experimentBranch ->
                 (experimentBranch == ExperimentBranch.DEFAULT_BROWSER_NEW_TAB_BANNER)
             }
-        return isExperimentBranch &&
+        return isExperimentBranch == true &&
                 !userDismissedExperimentCard &&
                 !browsers.isFirefoxDefaultBrowser &&
                 numberOfAppLaunches > APP_LAUNCHES_TO_SHOW_DEFAULT_BROWSER_CARD
@@ -357,6 +357,11 @@ class Settings(private val appContext: Context) : PreferencesHolder {
         featureFlag = FeatureFlags.tabsTrayRewrite
     )
 
+    var allowThirdPartyRootCerts by booleanPreference(
+        appContext.getPreferenceKey(R.string.pref_key_allow_third_party_root_certs),
+        default = false
+    )
+
     fun getTabTimeout(): Long = when {
         closeTabsAfterOneDay -> ONE_DAY_MS
         closeTabsAfterOneWeek -> ONE_WEEK_MS
@@ -657,12 +662,12 @@ class Settings(private val appContext: Context) : PreferencesHolder {
     )
 
     @VisibleForTesting(otherwise = PRIVATE)
-    internal val loginsSecureWarningCount = counterPreference(
-        appContext.getPreferenceKey(R.string.pref_key_logins_secure_warning),
+    internal val secureWarningCount = counterPreference(
+        appContext.getPreferenceKey(R.string.pref_key_secure_warning),
         maxCount = 1
     )
 
-    fun incrementShowLoginsSecureWarningCount() = loginsSecureWarningCount.increment()
+    fun incrementSecureWarningCount() = secureWarningCount.increment()
 
     fun incrementShowLoginsSecureWarningSyncCount() = loginsSecureWarningSyncCount.increment()
 
@@ -986,7 +991,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
     )
 
     /**
-     * Storing number of installed add-ons for telemetry purposes
+     * Stores the number of installed add-ons for telemetry purposes
      */
     var installedAddonsCount by intPreference(
         appContext.getPreferenceKey(R.string.pref_key_installed_addons_count),
@@ -994,7 +999,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
     )
 
     /**
-     * Storing the list of installed add-ons for telemetry purposes
+     * Stores the list of installed add-ons for telemetry purposes
      */
     var installedAddonsList by stringPreference(
         appContext.getPreferenceKey(R.string.pref_key_installed_addons_list),
@@ -1002,7 +1007,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
     )
 
     /**
-     * Storing number of enabled add-ons for telemetry purposes
+     * Stores the number of enabled add-ons for telemetry purposes
      */
     var enabledAddonsCount by intPreference(
         appContext.getPreferenceKey(R.string.pref_key_enabled_addons_count),
@@ -1010,13 +1015,37 @@ class Settings(private val appContext: Context) : PreferencesHolder {
     )
 
     /**
-     * Storing the list of enabled add-ons for telemetry purposes
+     * Stores the list of enabled add-ons for telemetry purposes
      */
     var enabledAddonsList by stringPreference(
         appContext.getPreferenceKey(R.string.pref_key_enabled_addons_list),
         default = ""
     )
 
+    /**
+     * Stores the number of credit cards that have been saved manually by the user.
+     */
+    var creditCardsSavedCount by intPreference(
+        appContext.getPreferenceKey(R.string.pref_key_credit_cards_saved_count),
+        0
+    )
+
+    /**
+     * Stores the number of credit cards that have been deleted by the user.
+     */
+    var creditCardsDeletedCount by intPreference(
+        appContext.getPreferenceKey(R.string.pref_key_credit_cards_deleted_count),
+        0
+    )
+
+    /**
+     * Stores the number of times that user has autofilled a credit card.
+     */
+    var creditCardsAutofilledCount by intPreference(
+        appContext.getPreferenceKey(R.string.pref_key_credit_cards_autofilled_count),
+        0
+    )
+
     private var savedLoginsSortingStrategyString by stringPreference(
         appContext.getPreferenceKey(R.string.pref_key_saved_logins_sorting_strategy),
         default = SavedLoginsSortingStrategyMenu.Item.AlphabeticallySort.strategyString
@@ -1057,12 +1086,6 @@ class Settings(private val appContext: Context) : PreferencesHolder {
         default = true
     )
 
-    var creditCardsFeature by featureFlagPreference(
-        appContext.getPreferenceKey(R.string.pref_key_show_credit_cards_feature),
-        default = false,
-        featureFlag = FeatureFlags.creditCardsFeature
-    )
-
     var addressFeature by featureFlagPreference(
         appContext.getPreferenceKey(R.string.pref_key_show_address_feature),
         default = false,
@@ -1077,4 +1100,20 @@ class Settings(private val appContext: Context) : PreferencesHolder {
         appContext.getPreferenceKey(R.string.pref_key_open_next_tab_desktop_mode),
         default = false
     )
+
+    var signedInFxaAccount by booleanPreference(
+        appContext.getPreferenceKey(R.string.pref_key_fxa_signed_in),
+        default = false
+    )
+
+    /**
+     * Storing the user choice from the "Credit cards" settings for whether save and autofill cards
+     * should be enabled or not.
+     * If set to `true` when the user focuses on credit card fields in the webpage an Android prompt letting her
+     * select the card details to be automatically filled will appear.
+     */
+    var shouldAutofillCreditCardDetails by booleanPreference(
+        appContext.getPreferenceKey(R.string.pref_key_credit_cards_save_and_autofill_cards),
+        default = true
+    )
 }
diff --git a/app/src/main/java/org/mozilla/gecko/search/SearchWidgetProvider.kt b/app/src/main/java/org/mozilla/gecko/search/SearchWidgetProvider.kt
index 57a62160d..87d39ae32 100644
--- a/app/src/main/java/org/mozilla/gecko/search/SearchWidgetProvider.kt
+++ b/app/src/main/java/org/mozilla/gecko/search/SearchWidgetProvider.kt
@@ -8,6 +8,7 @@ import android.app.PendingIntent
 import android.appwidget.AppWidgetManager
 import android.appwidget.AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH
 import android.appwidget.AppWidgetProvider
+import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
 import android.os.Build
@@ -98,7 +99,12 @@ class SearchWidgetProvider : AppWidgetProvider() {
     /**
      * Builds pending intent that starts a new voice search.
      */
-    private fun createVoiceSearchIntent(context: Context): PendingIntent? {
+    @VisibleForTesting
+    internal fun createVoiceSearchIntent(context: Context): PendingIntent? {
+        if (!context.settings().shouldShowVoiceSearch) {
+            return null
+        }
+
         val voiceIntent = Intent(context, VoiceSearchActivity::class.java).apply {
             flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
             putExtra(SPEECH_PROCESSING, true)
@@ -172,6 +178,20 @@ class SearchWidgetProvider : AppWidgetProvider() {
         private const val REQUEST_CODE_NEW_TAB = 0
         private const val REQUEST_CODE_VOICE = 1
 
+        fun updateAllWidgets(context: Context) {
+            val widgetManager = AppWidgetManager.getInstance(context)
+            val widgetIds = widgetManager.getAppWidgetIds(ComponentName(context, SearchWidgetProvider::class.java))
+
+            if (widgetIds.isNotEmpty()) {
+                context.sendBroadcast(
+                    Intent(context, SearchWidgetProvider::class.java).apply {
+                        action = AppWidgetManager.ACTION_APPWIDGET_UPDATE
+                        putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, widgetIds)
+                    }
+                )
+            }
+        }
+
         @VisibleForTesting
         internal fun getLayoutSize(@Dimension(unit = DP) dp: Int) = when {
             dp >= DP_LARGE -> SearchWidgetProviderSize.LARGE
diff --git a/app/src/main/res/anim/fade_in.xml b/app/src/main/res/anim/fade_in.xml
index 8024b31fd..b5e953477 100644
--- a/app/src/main/res/anim/fade_in.xml
+++ b/app/src/main/res/anim/fade_in.xml
@@ -5,4 +5,4 @@
 <alpha xmlns:android="http://schemas.android.com/apk/res/android"
        android:interpolator="@android:interpolator/decelerate_quad"
        android:fromAlpha="0.0" android:toAlpha="1.0"
-       android:duration="250" />
\ No newline at end of file
+       android:duration="250" />
diff --git a/app/src/main/res/anim/fade_out.xml b/app/src/main/res/anim/fade_out.xml
index 4c00bc4a6..7dd6477c2 100644
--- a/app/src/main/res/anim/fade_out.xml
+++ b/app/src/main/res/anim/fade_out.xml
@@ -5,4 +5,4 @@
 <alpha xmlns:android="http://schemas.android.com/apk/res/android"
        android:interpolator="@android:interpolator/accelerate_quad"
        android:fromAlpha="1.0" android:toAlpha="0"
-       android:duration="250" />
\ No newline at end of file
+       android:duration="250" />
diff --git a/app/src/main/res/anim/placeholder_animation.xml b/app/src/main/res/anim/placeholder_animation.xml
index 80c254842..348af4210 100644
--- a/app/src/main/res/anim/placeholder_animation.xml
+++ b/app/src/main/res/anim/placeholder_animation.xml
@@ -6,4 +6,4 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:fromXDelta="0"
     android:toXDelta="0"
-    android:duration="900" />
\ No newline at end of file
+    android:duration="900" />
diff --git a/app/src/main/res/anim/slide_out_right.xml b/app/src/main/res/anim/slide_out_right.xml
index 240992691..0e8b6ccbc 100644
--- a/app/src/main/res/anim/slide_out_right.xml
+++ b/app/src/main/res/anim/slide_out_right.xml
@@ -8,4 +8,4 @@
         android:duration="275"/>
     <alpha android:fromAlpha="1.0" android:toAlpha="0"
         android:duration="275" />
-</set>
\ No newline at end of file
+</set>
diff --git a/app/src/main/res/anim/zoom_in_fade.xml b/app/src/main/res/anim/zoom_in_fade.xml
index 5248878fd..3482fd7e3 100644
--- a/app/src/main/res/anim/zoom_in_fade.xml
+++ b/app/src/main/res/anim/zoom_in_fade.xml
@@ -16,4 +16,4 @@
         android:fromYScale="100%"
         android:toYScale="113%"
         android:duration="125" />
-</set>
\ No newline at end of file
+</set>
diff --git a/app/src/main/res/anim/zoom_out_fade.xml b/app/src/main/res/anim/zoom_out_fade.xml
index 720b5bf3c..993dafc81 100644
--- a/app/src/main/res/anim/zoom_out_fade.xml
+++ b/app/src/main/res/anim/zoom_out_fade.xml
@@ -16,4 +16,4 @@
         android:fromYScale="108%"
         android:toYScale="100%"
         android:duration="175" />
-</set>
\ No newline at end of file
+</set>
diff --git a/app/src/main/res/color/onboarding_illustration_color.xml b/app/src/main/res/color/onboarding_illustration_color.xml
index 040718d7a..5a8c8da54 100644
--- a/app/src/main/res/color/onboarding_illustration_color.xml
+++ b/app/src/main/res/color/onboarding_illustration_color.xml
@@ -5,4 +5,4 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="?attr/onboardingSelected" android:state_selected="true" />
     <item android:color="?attr/onboardingDeselected" />
-</selector>
\ No newline at end of file
+</selector>
diff --git a/app/src/main/res/color/readerview_private_button_color.xml b/app/src/main/res/color/readerview_private_button_color.xml
index 48b2a921e..afd227af8 100644
--- a/app/src/main/res/color/readerview_private_button_color.xml
+++ b/app/src/main/res/color/readerview_private_button_color.xml
@@ -5,4 +5,4 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="true" android:color="@color/primary_text_private_theme" />
     <item android:state_enabled="false" android:color="@color/mozac_feature_readerview_text_color_disabled" />
-</selector>
\ No newline at end of file
+</selector>
diff --git a/app/src/main/res/color/readerview_private_radio_color.xml b/app/src/main/res/color/readerview_private_radio_color.xml
index 0136866d0..56b5f8a12 100644
--- a/app/src/main/res/color/readerview_private_radio_color.xml
+++ b/app/src/main/res/color/readerview_private_radio_color.xml
@@ -5,4 +5,4 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_checked="true" android:color="@color/mozac_feature_readerview_selected" />
     <item android:state_checked="false" android:color="@color/primary_text_private_theme" />
-</selector>
\ No newline at end of file
+</selector>
diff --git a/app/src/main/res/color/saved_login_clear_edit_text_tint.xml b/app/src/main/res/color/saved_login_clear_edit_text_tint.xml
index ada9ebc97..1a800496d 100644
--- a/app/src/main/res/color/saved_login_clear_edit_text_tint.xml
+++ b/app/src/main/res/color/saved_login_clear_edit_text_tint.xml
@@ -7,4 +7,4 @@
         android:color="?primaryText" />
     <item android:state_enabled="false"
         android:color="?disabled" />
-</selector>
\ No newline at end of file
+</selector>
diff --git a/app/src/main/res/color/tab_checkbox_tint.xml b/app/src/main/res/color/tab_checkbox_tint.xml
index 3eff7db2a..fe33814e7 100644
--- a/app/src/main/res/color/tab_checkbox_tint.xml
+++ b/app/src/main/res/color/tab_checkbox_tint.xml
@@ -4,4 +4,4 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="?secondaryText" android:state_checked="false" />
     <item android:color="?accent" android:state_checked="true" />
-</selector>
\ No newline at end of file
+</selector>
diff --git a/app/src/main/res/color/tab_icon.xml b/app/src/main/res/color/tab_icon.xml
index 48ad13b5b..ed703e81e 100644
--- a/app/src/main/res/color/tab_icon.xml
+++ b/app/src/main/res/color/tab_icon.xml
@@ -5,4 +5,4 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="@color/tab_tray_heading_icon_normal_theme" android:state_selected="true" />
     <item android:color="@color/tab_tray_heading_icon_inactive_normal_theme" />
-</selector>
\ No newline at end of file
+</selector>
diff --git a/app/src/main/res/drawable-v24/shield_light.xml b/app/src/main/res/drawable-v24/shield_light.xml
index e04aca611..0e322f569 100644
--- a/app/src/main/res/drawable-v24/shield_light.xml
+++ b/app/src/main/res/drawable-v24/shield_light.xml
@@ -78,4 +78,4 @@
             </set>
         </aapt:attr>
     </target>
-</animated-vector>
\ No newline at end of file
+</animated-vector>
diff --git a/app/src/main/res/drawable-v26/ic_launcher_private_background.xml b/app/src/main/res/drawable-v26/ic_launcher_private_background.xml
index ab3c79093..26ba3b670 100644
--- a/app/src/main/res/drawable-v26/ic_launcher_private_background.xml
+++ b/app/src/main/res/drawable-v26/ic_launcher_private_background.xml
@@ -23,4 +23,3 @@
         </aapt:attr>
     </path>
 </vector>
-
diff --git a/app/src/main/res/drawable-v26/ic_static_shortcut_private_tab.xml b/app/src/main/res/drawable-v26/ic_static_shortcut_private_tab.xml
index 479544f20..0fc49198c 100644
--- a/app/src/main/res/drawable-v26/ic_static_shortcut_private_tab.xml
+++ b/app/src/main/res/drawable-v26/ic_static_shortcut_private_tab.xml
@@ -6,4 +6,4 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/static_shortcut_background"/>
     <foreground android:drawable="@drawable/ic_static_shortcut_private_tab_foreground"/>
-</adaptive-icon>
\ No newline at end of file
+</adaptive-icon>
diff --git a/app/src/main/res/drawable-v26/ic_static_shortcut_tab.xml b/app/src/main/res/drawable-v26/ic_static_shortcut_tab.xml
index cb4d26633..2351ce27c 100644
--- a/app/src/main/res/drawable-v26/ic_static_shortcut_tab.xml
+++ b/app/src/main/res/drawable-v26/ic_static_shortcut_tab.xml
@@ -6,4 +6,4 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/static_shortcut_background"/>
     <foreground android:drawable="@drawable/ic_static_shortcut_tab_foreground"/>
-</adaptive-icon>
\ No newline at end of file
+</adaptive-icon>
diff --git a/app/src/main/res/drawable/add_tabs_to_collection_background.xml b/app/src/main/res/drawable/add_tabs_to_collection_background.xml
index 43cde06e7..d50f08972 100644
--- a/app/src/main/res/drawable/add_tabs_to_collection_background.xml
+++ b/app/src/main/res/drawable/add_tabs_to_collection_background.xml
@@ -6,4 +6,4 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="8dp"/>
     <solid android:color="?accent" />
-</shape>
\ No newline at end of file
+</shape>
diff --git a/app/src/main/res/drawable/bottom_sheet_dialog_fragment_background.xml b/app/src/main/res/drawable/bottom_sheet_dialog_fragment_background.xml
index 0c9ac22a3..93ba489d3 100644
--- a/app/src/main/res/drawable/bottom_sheet_dialog_fragment_background.xml
+++ b/app/src/main/res/drawable/bottom_sheet_dialog_fragment_background.xml
@@ -5,4 +5,4 @@
             android:topLeftRadius="@dimen/bottom_sheet_corner_radius"
             android:topRightRadius="@dimen/bottom_sheet_corner_radius" />
     <solid android:color="?above" />
-</shape>
\ No newline at end of file
+</shape>
diff --git a/app/src/main/res/drawable/button_background.xml b/app/src/main/res/drawable/button_background.xml
index d50c66558..927fa280d 100644
--- a/app/src/main/res/drawable/button_background.xml
+++ b/app/src/main/res/drawable/button_background.xml
@@ -6,4 +6,4 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="4dp"/>
     <solid android:color="?accent" />
-</shape>
\ No newline at end of file
+</shape>
diff --git a/app/src/main/res/drawable/button_background_grey.xml b/app/src/main/res/drawable/button_background_grey.xml
index 6dcdce8a8..916a19155 100644
--- a/app/src/main/res/drawable/button_background_grey.xml
+++ b/app/src/main/res/drawable/button_background_grey.xml
@@ -6,4 +6,4 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="4dp"/>
     <solid android:color="@color/grey_button_color" />
-</shape>
\ No newline at end of file
+</shape>
diff --git a/app/src/main/res/drawable/crash_reporter_button.xml b/app/src/main/res/drawable/crash_reporter_button.xml
index 81511ea2c..976bc05cd 100644
--- a/app/src/main/res/drawable/crash_reporter_button.xml
+++ b/app/src/main/res/drawable/crash_reporter_button.xml
@@ -13,4 +13,4 @@
             <solid android:color="#312A65" />
         </shape>
     </item>
-</layer-list>
\ No newline at end of file
+</layer-list>
diff --git a/app/src/main/res/drawable/device_background.xml b/app/src/main/res/drawable/device_background.xml
index 8cc5ad492..c9c973af2 100644
--- a/app/src/main/res/drawable/device_background.xml
+++ b/app/src/main/res/drawable/device_background.xml
@@ -7,4 +7,4 @@
     <size
         android:height="40dp"
         android:width="40dp" />
-</shape>
\ No newline at end of file
+</shape>
diff --git a/app/src/main/res/drawable/dialog_background.xml b/app/src/main/res/drawable/dialog_background.xml
index aa3fcf5c6..98156a1b9 100644
--- a/app/src/main/res/drawable/dialog_background.xml
+++ b/app/src/main/res/drawable/dialog_background.xml
@@ -6,4 +6,4 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="8dp"/>
     <solid android:color="?above" />
-</shape>
\ No newline at end of file
+</shape>
diff --git a/app/src/main/res/drawable/dialog_button_background.xml b/app/src/main/res/drawable/dialog_button_background.xml
index e4aaec8f3..faafaaf7f 100644
--- a/app/src/main/res/drawable/dialog_button_background.xml
+++ b/app/src/main/res/drawable/dialog_button_background.xml
@@ -6,4 +6,4 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="8dp"/>
     <solid android:color="?inset" />
-</shape>
\ No newline at end of file
+</shape>
diff --git a/app/src/main/res/drawable/favicon_background.xml b/app/src/main/res/drawable/favicon_background.xml
index 5efbdace9..5aebd70dd 100644
--- a/app/src/main/res/drawable/favicon_background.xml
+++ b/app/src/main/res/drawable/favicon_background.xml
@@ -6,4 +6,4 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
     <solid android:color="@color/bookmark_favicon_background" />
     <size android:width="40dp" android:height="40dp"/>
-</shape>
\ No newline at end of file
+</shape>
diff --git a/app/src/main/res/drawable/home_search_background.xml b/app/src/main/res/drawable/home_search_background.xml
index 19e41a79f..20619c9f3 100644
--- a/app/src/main/res/drawable/home_search_background.xml
+++ b/app/src/main/res/drawable/home_search_background.xml
@@ -5,4 +5,4 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="?inset"/>
     <corners android:radius="8dp"/>
-</shape>
\ No newline at end of file
+</shape>
diff --git a/app/src/main/res/drawable/ic_autoplay.xml b/app/src/main/res/drawable/ic_autoplay.xml
index 86ea0d369..f3d5a487f 100644
--- a/app/src/main/res/drawable/ic_autoplay.xml
+++ b/app/src/main/res/drawable/ic_autoplay.xml
@@ -12,4 +12,4 @@
     android:id="@+id/disabled"
     android:drawable="@drawable/ic_autoplay_disabled" />
 
-</selector>
\ No newline at end of file
+</selector>
diff --git a/app/src/main/res/drawable/ic_back_button.xml b/app/src/main/res/drawable/ic_back_button.xml
new file mode 100644
index 000000000..95f2e380a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_back_button.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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/. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="?primaryText"
+        android:pathData="M20.25,11.5H5.461L11.431,5.53C11.724,5.237 11.724,4.762 11.431,4.469C11.138,4.176 10.663,4.176 10.37,4.469L3,11.839V12.66L10.37,20.03C10.516,20.176 10.708,20.25 10.9,20.25C11.092,20.25 11.284,20.177 11.43,20.03C11.723,19.737 11.723,19.262 11.43,18.969L5.461,13H20.25C20.664,13 21,12.664 21,12.25C21,11.836 20.664,11.5 20.25,11.5Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_desktop.xml b/app/src/main/res/drawable/ic_desktop.xml
index 76629aa8e..de303bb1e 100644
--- a/app/src/main/res/drawable/ic_desktop.xml
+++ b/app/src/main/res/drawable/ic_desktop.xml
@@ -9,4 +9,4 @@
     android:viewportHeight="24">
     <path android:fillColor="?primaryText"
         android:pathData="M20.5,17h-2a2.5,2.5 0,0 0,2.5 -2.5v-9A2.5,2.5 0,0 0,18.5 3h-13A2.5,2.5 0,0 0,3 5.5v9A2.5,2.5 0,0 0,5.5 17h-2a1.5,1.5 0,0 0,0 3h17a1.5,1.5 0,0 0,0 -3zM5.3,15.5l-0.8,-0.8L4.5,5.3l0.8,-0.8h13.4l0.8,0.8v9.4l-0.8,0.8L5.3,15.5zM13.25,18.5h-2.5a0.75,0.75 0,0 1,0 -1.5h2.5a0.75,0.75 0,0 1,0 1.5z" />
-</vector>
\ No newline at end of file
+</vector>
diff --git a/app/src/main/res/drawable/ic_drawer_pull_tab.xml b/app/src/main/res/drawable/ic_drawer_pull_tab.xml
index b3a54e018..015f3ef7c 100644
--- a/app/src/main/res/drawable/ic_drawer_pull_tab.xml
+++ b/app/src/main/res/drawable/ic_drawer_pull_tab.xml
@@ -9,4 +9,4 @@
         <size android:height="2dp" android:width="24dp" />
         <solid android:color="?neutral"/>
     </shape>
-</inset>
\ No newline at end of file
+</inset>
diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml
index 57149e629..2348db076 100644
--- a/app/src/main/res/drawable/ic_home.xml
+++ b/app/src/main/res/drawable/ic_home.xml
@@ -10,4 +10,4 @@
     <path
         android:pathData="M21.5 11.1l-8.8-8a1 1 0 0 0-1.4 0l-8.8 8c-0.3 0.4-0.3 1 0 1.3 0.4 0.4 1 0.4 1.5 0l1-1v7c0 1.5 1.3 2.8 3 2.8h8c1.7 0 3-1.3 3-2.8v-7l1 1c0.4 0.4 1 0.4 1.4 0 0.4-0.3 0.4-1 0-1.3zM17 18.4c0 0.5-0.4 1-1 1H8c-0.6 0-1-0.5-1-1V9.6L12 5l5 4.6z"
         android:fillColor="?primaryText"/>
-</vector>
\ No newline at end of file
+</vector>
diff --git a/app/src/main/res/drawable/ic_link.xml b/app/src/main/res/drawable/ic_link.xml
index 0e034b502..7cf4c3232 100644
--- a/app/src/main/res/drawable/ic_link.xml
+++ b/app/src/main/res/drawable/ic_link.xml
@@ -11,4 +11,4 @@
         android:id="@+id/disabled"
         android:drawable="@drawable/ic_link_disabled" />
 
-</selector>
\ No newline at end of file
+</selector>
diff --git a/app/src/main/res/drawable/ic_new_pin.xml b/app/src/main/res/drawable/ic_new_pin.xml
new file mode 100644
index 000000000..15940a2a2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_new_pin.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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/. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12dp"
+    android:height="12dp"
+    android:viewportWidth="12"
+    android:viewportHeight="12">
+    <path
+        android:fillColor="@color/top_site_pin_icon_color"
+        android:pathData="M9.05,4.055H7.6L7.156,3.89C7.156,3.89 6.19,2.926 5.612,2.349L6.106,1.855C6.302,1.659 6.302,1.342 6.106,1.147C5.91,0.951 5.593,0.951 5.398,1.147L4.689,1.855L1.147,5.398C0.951,5.594 0.951,5.911 1.147,6.106C1.343,6.302 1.66,6.302 1.855,6.106L2.349,5.612C2.93,6.194 3.904,7.17 3.904,7.17L4.054,7.597L4.055,9.049C4.055,9.425 4.279,9.76 4.626,9.904C4.742,9.952 4.862,9.975 4.981,9.975C5.221,9.975 5.457,9.881 5.634,9.703L7.314,8.023L10.144,10.853C10.34,11.049 10.657,11.049 10.852,10.853C11.048,10.657 11.048,10.34 10.852,10.145L8.022,7.315L9.702,5.635C9.968,5.369 10.046,4.974 9.903,4.627C9.761,4.279 9.425,4.055 9.05,4.055Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_static_shortcut_background.xml b/app/src/main/res/drawable/ic_static_shortcut_background.xml
index a186424a7..32a587e21 100644
--- a/app/src/main/res/drawable/ic_static_shortcut_background.xml
+++ b/app/src/main/res/drawable/ic_static_shortcut_background.xml
@@ -7,4 +7,4 @@
     android:shape="oval">
     <solid android:color="@color/static_shortcut_background" />
     <size android:width="108dp" android:height="108dp" />
-</shape>
\ No newline at end of file
+</shape>
diff --git a/app/src/main/res/drawable/ic_static_shortcut_private_tab.xml b/app/src/main/res/drawable/ic_static_shortcut_private_tab.xml
index beaaf6582..d9f67886f 100644
--- a/app/src/main/res/drawable/ic_static_shortcut_private_tab.xml
+++ b/app/src/main/res/drawable/ic_static_shortcut_private_tab.xml
@@ -6,4 +6,4 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@drawable/ic_static_shortcut_background" />
     <item android:drawable="@drawable/ic_static_shortcut_private_tab_foreground" />
-</layer-list>
\ No newline at end of file
+</layer-list>
diff --git a/app/src/main/res/drawable/ic_static_shortcut_tab.xml b/app/src/main/res/drawable/ic_static_shortcut_tab.xml
index 15759ffc3..c78a6647b 100644
--- a/app/src/main/res/drawable/ic_static_shortcut_tab.xml
+++ b/app/src/main/res/drawable/ic_static_shortcut_tab.xml
@@ -6,4 +6,4 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@drawable/ic_static_shortcut_background" />
     <item android:drawable="@drawable/ic_static_shortcut_tab_foreground" />
-</layer-list>
\ No newline at end of file
+</layer-list>
diff --git a/app/src/main/res/drawable/ic_top_sites.xml b/app/src/main/res/drawable/ic_top_sites.xml
index af3d6c0b4..59a02d306 100644
--- a/app/src/main/res/drawable/ic_top_sites.xml
+++ b/app/src/main/res/drawable/ic_top_sites.xml
@@ -11,4 +11,3 @@
       android:fillColor="?primaryText"
       android:pathData="M21.28 20.22l-5.472-5.472 2.986-2.986c0.527-0.528 0.68-1.285 0.398-1.976a1.796 1.796 0 0 0-1.665-1.133l-2.475-0.029-3.775-3.776 1.068-1.068a0.75 0.75 0 1 0-1.061-1.061L2.72 11.287a0.75 0.75 0 0 0 1.06 1.061l1.079-1.079 3.775 3.775 0.029 2.475a1.794 1.794 0 0 0 1.135 1.665 1.795 1.795 0 0 0 1.973-0.398l2.977-2.977 5.472 5.472a0.748 0.748 0 0 0 1.06 0 0.75 0.75 0 0 0 0-1.061zm-10.569-2.495a0.304 0.304 0 0 1-0.348 0.07 0.307 0.307 0 0 1-0.2-0.294l-0.037-3.086-4.207-4.207 4.299-4.299 4.206 4.207 3.086 0.037a0.306 0.306 0 0 1 0.294 0.199 0.31 0.31 0 0 1-0.07 0.349l-7.023 7.024z" />
 </vector>
-
diff --git a/app/src/main/res/drawable/migration_button_background.xml b/app/src/main/res/drawable/migration_button_background.xml
index e70aee5b4..99596c710 100644
--- a/app/src/main/res/drawable/migration_button_background.xml
+++ b/app/src/main/res/drawable/migration_button_background.xml
@@ -6,4 +6,4 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="4dp"/>
     <solid android:color="#312A65" />
-</shape>
\ No newline at end of file
+</shape>
diff --git a/app/src/main/res/drawable/mozac_ic_warning_with_bottom_padding.xml b/app/src/main/res/drawable/mozac_ic_warning_with_bottom_padding.xml
index 408f4c077..d285b129b 100644
--- a/app/src/main/res/drawable/mozac_ic_warning_with_bottom_padding.xml
+++ b/app/src/main/res/drawable/mozac_ic_warning_with_bottom_padding.xml
@@ -6,4 +6,4 @@
     <item
         android:drawable="@drawable/mozac_ic_warning"
         android:bottom="14dp" />
-</layer-list>
\ No newline at end of file
+</layer-list>
diff --git a/app/src/main/res/drawable/private_home_background_gradient.xml b/app/src/main/res/drawable/private_home_background_gradient.xml
index bf2877bae..267bc2096 100644
--- a/app/src/main/res/drawable/private_home_background_gradient.xml
+++ b/app/src/main/res/drawable/private_home_background_gradient.xml
@@ -13,4 +13,4 @@
                     android:type="linear" />
         </shape>
     </item>
-</selector>
\ No newline at end of file
+</selector>
diff --git a/app/src/main/res/drawable/recent_apps_background.xml b/app/src/main/res/drawable/recent_apps_background.xml
index a7c314420..2be5826a3 100644
--- a/app/src/main/res/drawable/recent_apps_background.xml
+++ b/app/src/main/res/drawable/recent_apps_background.xml
@@ -3,6 +3,6 @@
    - 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/. -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="?inset"/>
+    <solid android:color="?recentlyUsedShareMenu"/>
     <corners android:radius="@dimen/share_recent_apps_background_radius"/>
-</shape>
\ No newline at end of file
+</shape>
diff --git a/app/src/main/res/drawable/rounded_bottom_corners.xml b/app/src/main/res/drawable/rounded_bottom_corners.xml
index 4ce4f140b..1407f4e20 100644
--- a/app/src/main/res/drawable/rounded_bottom_corners.xml
+++ b/app/src/main/res/drawable/rounded_bottom_corners.xml
@@ -6,4 +6,4 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="?above" />
     <corners android:bottomLeftRadius="@dimen/tab_corner_radius" android:bottomRightRadius="@dimen/tab_corner_radius" />
-</shape>
\ No newline at end of file
+</shape>
diff --git a/app/src/main/res/drawable/rounded_grey_corners_transparent_center.xml b/app/src/main/res/drawable/rounded_grey_corners_transparent_center.xml
index e933d4ef2..e803ff8df 100644
--- a/app/src/main/res/drawable/rounded_grey_corners_transparent_center.xml
+++ b/app/src/main/res/drawable/rounded_grey_corners_transparent_center.xml
@@ -10,4 +10,4 @@
         android:width="1dp"
         android:color="?toolbarDivider"/>
     <solid android:color="@android:color/transparent"/>
-</shape>
\ No newline at end of file
+</shape>
diff --git a/app/src/main/res/drawable/rounded_search_widget_background.xml b/app/src/main/res/drawable/rounded_search_widget_background.xml
index e37f2029b..a21f3705d 100644
--- a/app/src/main/res/drawable/rounded_search_widget_background.xml
+++ b/app/src/main/res/drawable/rounded_search_widget_background.xml
@@ -6,4 +6,4 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="@color/search_widget_background" />
     <corners android:radius="@dimen/tab_corner_radius"/>
-</shape>
\ No newline at end of file
+</shape>
diff --git a/app/src/main/res/drawable/search_url_background.xml b/app/src/main/res/drawable/search_url_background.xml
index 955ed4696..fd279d445 100644
--- a/app/src/main/res/drawable/search_url_background.xml
+++ b/app/src/main/res/drawable/search_url_background.xml
@@ -9,4 +9,4 @@
              android:bottomLeftRadius="8dp"
              android:topLeftRadius="8dp"
              android:topRightRadius="8dp"/>
-</shape>
\ No newline at end of file
+</shape>
diff --git a/app/src/main/res/drawable/session_border.xml b/app/src/main/res/drawable/session_border.xml
index daa19bd86..5b7de5836 100644
--- a/app/src/main/res/drawable/session_border.xml
+++ b/app/src/main/res/drawable/session_border.xml
@@ -6,4 +6,4 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="@dimen/tab_corner_radius"/>
     <stroke android:width="@dimen/tab_border_width" android:color="?tabRing"/>
-</shape>
\ No newline at end of file
+</shape>
diff --git a/app/src/main/res/drawable/shield_light.xml b/app/src/main/res/drawable/shield_light.xml
index f621f8390..34cbdc10e 100644
--- a/app/src/main/res/drawable/shield_light.xml
+++ b/app/src/main/res/drawable/shield_light.xml
@@ -28,4 +28,4 @@
                 android:valueType="colorType" />
         </aapt:attr>
     </target>
-</animated-vector>
\ No newline at end of file
+</animated-vector>
diff --git a/app/src/main/res/drawable/top_sites_background.xml b/app/src/main/res/drawable/top_sites_background.xml
deleted file mode 100644
index c5ff9918d..000000000
--- a/app/src/main/res/drawable/top_sites_background.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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/. -->
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:shape="rectangle">
-    <corners android:radius="4dp" />
-    <solid
-        android:color="?mozac_widget_favicon_background_color"
-        tools:color="@color/photonWhite" />
-    <stroke
-        android:width="1dp"
-        android:color="@color/top_sites_border_color"
-        tools:color="@color/photonLightGrey30" />
-</shape>
diff --git a/app/src/main/res/drawable/url_background.xml b/app/src/main/res/drawable/url_background.xml
index 3058f12e5..d543eb368 100644
--- a/app/src/main/res/drawable/url_background.xml
+++ b/app/src/main/res/drawable/url_background.xml
@@ -10,4 +10,4 @@
         android:bottomRightRadius="8dp"
         android:topLeftRadius="8dp"
         android:topRightRadius="8dp" />
-</shape>
\ No newline at end of file
+</shape>
diff --git a/app/src/main/res/font/metropolis.xml b/app/src/main/res/font/metropolis.xml
index bdb818c34..5ccbd737a 100644
--- a/app/src/main/res/font/metropolis.xml
+++ b/app/src/main/res/font/metropolis.xml
@@ -74,4 +74,4 @@
         app:fontStyle="normal"
         app:fontWeight="100" />
 
-</font-family>
\ No newline at end of file
+</font-family>
diff --git a/app/src/main/res/layout/activity_privacy_content_display.xml b/app/src/main/res/layout/activity_privacy_content_display.xml
index c6ff55e47..cee2f0499 100644
--- a/app/src/main/res/layout/activity_privacy_content_display.xml
+++ b/app/src/main/res/layout/activity_privacy_content_display.xml
@@ -22,7 +22,7 @@
                     android:background="@android:color/transparent"
                     android:id="@+id/privacyContentCloseButton"
                     android:src="@drawable/ic_close"
-                    android:contentDescription="close"
+                    android:contentDescription="@string/privacy_content_close_button_content_description"
                     tools:ignore="AndroidSrcXmlDetector" />
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/browser_toolbar_popup_window.xml b/app/src/main/res/layout/browser_toolbar_popup_window.xml
index 3cd156001..28ed26d0f 100644
--- a/app/src/main/res/layout/browser_toolbar_popup_window.xml
+++ b/app/src/main/res/layout/browser_toolbar_popup_window.xml
@@ -50,4 +50,4 @@
         android:text="@string/browser_toolbar_long_press_popup_paste_and_go"
         android:textAllCaps="false"
         android:textColor="?primaryText" />
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/collection_header.xml b/app/src/main/res/layout/collection_header.xml
index e2d7af88d..9122f0455 100644
--- a/app/src/main/res/layout/collection_header.xml
+++ b/app/src/main/res/layout/collection_header.xml
@@ -8,4 +8,4 @@
     android:layout_height="48dp"
     android:gravity="center_vertical"
     android:text="@string/collections_header"
-    android:textAppearance="@style/HeaderTextStyle" />
\ No newline at end of file
+    android:textAppearance="@style/HeaderTextStyle" />
diff --git a/app/src/main/res/layout/component_browser_top_toolbar.xml b/app/src/main/res/layout/component_browser_top_toolbar.xml
index 77f460296..0152ecdb1 100644
--- a/app/src/main/res/layout/component_browser_top_toolbar.xml
+++ b/app/src/main/res/layout/component_browser_top_toolbar.xml
@@ -20,4 +20,3 @@
     app:browserToolbarProgressBarGravity="bottom"
     app:browserToolbarSecureColor="?primaryText"
     app:browserToolbarTrackingProtectionAndSecurityIndicatorSeparatorColor="?toolbarDivider" />
-
diff --git a/app/src/main/res/layout/component_credit_cards.xml b/app/src/main/res/layout/component_credit_cards.xml
index 34471f4b5..0e791b496 100644
--- a/app/src/main/res/layout/component_credit_cards.xml
+++ b/app/src/main/res/layout/component_credit_cards.xml
@@ -2,12 +2,12 @@
 <!-- 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/. -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/credit_cards_wrapper"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="wrap_content">
 
     <ProgressBar
         android:id="@+id/progress_bar"
@@ -17,14 +17,28 @@
         android:layout_height="8dp"
         android:translationY="-3dp"
         android:visibility="gone"
+        app:layout_constraintVertical_chainStyle="packed"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"/>
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/credit_cards_list"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:visibility="gone"
-        tools:listitem="@layout/credit_card_list_item" />
+        app:layout_constrainedHeight="true"
+        tools:listitem="@layout/credit_card_list_item"
+        app:layout_constraintTop_toBottomOf="@id/progress_bar"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/add_credit_card_button"/>
 
-</FrameLayout>
+    <include
+        android:id="@+id/add_credit_card_button"
+        layout="@layout/layout_add_credit_card"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/credit_cards_list" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/component_locale_settings.xml b/app/src/main/res/layout/component_locale_settings.xml
index 338f2868c..5cde4858c 100644
--- a/app/src/main/res/layout/component_locale_settings.xml
+++ b/app/src/main/res/layout/component_locale_settings.xml
@@ -18,4 +18,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/component_permissions_blocked_by_android.xml b/app/src/main/res/layout/component_permissions_blocked_by_android.xml
index 7ddd84db2..57bdd497b 100644
--- a/app/src/main/res/layout/component_permissions_blocked_by_android.xml
+++ b/app/src/main/res/layout/component_permissions_blocked_by_android.xml
@@ -63,4 +63,3 @@
         android:text="@string/phone_feature_go_to_settings" />
 
 </LinearLayout>
-
diff --git a/app/src/main/res/layout/component_tabhistory.xml b/app/src/main/res/layout/component_tabhistory.xml
index 073753f5c..f01a2efcf 100644
--- a/app/src/main/res/layout/component_tabhistory.xml
+++ b/app/src/main/res/layout/component_tabhistory.xml
@@ -28,4 +28,3 @@
         android:paddingTop="19dp"
         tools:listitem="@layout/history_list_item" />
 </androidx.constraintlayout.widget.ConstraintLayout>
-
diff --git a/app/src/main/res/layout/component_tabstray_fab.xml b/app/src/main/res/layout/component_tabstray_fab.xml
index 6a6fbfcf0..ce63c8aa6 100644
--- a/app/src/main/res/layout/component_tabstray_fab.xml
+++ b/app/src/main/res/layout/component_tabstray_fab.xml
@@ -17,6 +17,7 @@
     android:elevation="99dp"
     android:text="@string/tab_drawer_fab_content"
     android:textColor="@color/photonWhite"
+    android:visibility="gone"
     app:elevation="99dp"
     app:borderWidth="0dp"
     app:icon="@drawable/ic_new"
diff --git a/app/src/main/res/layout/credit_card_list_item.xml b/app/src/main/res/layout/credit_card_list_item.xml
index 386eed434..121e4b494 100644
--- a/app/src/main/res/layout/credit_card_list_item.xml
+++ b/app/src/main/res/layout/credit_card_list_item.xml
@@ -10,19 +10,30 @@
     android:background="?android:attr/selectableItemBackground"
     android:minHeight="?android:attr/listPreferredItemHeight">
 
+    <ImageView
+        android:id="@+id/credit_card_logo"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginStart="16dp"
+        android:scaleType="fitCenter"
+        android:importantForAccessibility="no"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent" />
+
     <TextView
         android:id="@+id/credit_card_number"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/saved_logins_item_margin_start"
-        android:layout_marginEnd="@dimen/saved_logins_item_margin_end"
+        android:layout_marginStart="@dimen/credit_cards_saved_cards_item_margin_start"
+        android:layout_marginEnd="@dimen/credit_cards_saved_cards_item_margin_end"
         android:ellipsize="middle"
         android:singleLine="true"
         android:textAppearance="?android:attr/textAppearanceListItem"
         android:textColor="?primaryText"
         app:layout_constraintBottom_toTopOf="@id/expiry_date"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/credit_card_logo"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
         tools:text="mozilla.org" />
@@ -38,7 +49,7 @@
         android:textColor="?secondaryText"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/credit_card_logo"
         app:layout_constraintTop_toBottomOf="@id/credit_card_number"
         app:layout_constraintVertical_chainStyle="packed"
         tools:text="02/2022" />
diff --git a/app/src/main/res/layout/delete_exceptions_button.xml b/app/src/main/res/layout/delete_exceptions_button.xml
index 7b4bee99e..6b69a49a6 100644
--- a/app/src/main/res/layout/delete_exceptions_button.xml
+++ b/app/src/main/res/layout/delete_exceptions_button.xml
@@ -8,4 +8,3 @@
     style="@style/NeutralButton"
     android:layout_marginHorizontal="16dp"
     android:text="@string/preferences_tracking_protection_exceptions_turn_on_for_all" />
-
diff --git a/app/src/main/res/layout/download_list_item.xml b/app/src/main/res/layout/download_list_item.xml
index 89c5da55c..bf2dc7d2d 100644
--- a/app/src/main/res/layout/download_list_item.xml
+++ b/app/src/main/res/layout/download_list_item.xml
@@ -21,4 +21,4 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="@dimen/library_item_height" />
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/etp_dropdown_item.xml b/app/src/main/res/layout/etp_dropdown_item.xml
index e0ce6d9f9..33790393d 100644
--- a/app/src/main/res/layout/etp_dropdown_item.xml
+++ b/app/src/main/res/layout/etp_dropdown_item.xml
@@ -11,4 +11,4 @@
     android:paddingStart="15dp"
     android:gravity="center_vertical"
     android:background="@drawable/etp_spinner_item_background"
-    android:textSize="14sp" />
\ No newline at end of file
+    android:textSize="14sp" />
diff --git a/app/src/main/res/layout/fragment_browser.xml b/app/src/main/res/layout/fragment_browser.xml
index 32d2bd4c4..cd4c91f5b 100644
--- a/app/src/main/res/layout/fragment_browser.xml
+++ b/app/src/main/res/layout/fragment_browser.xml
@@ -18,7 +18,7 @@
             android:id="@+id/browserLayout"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            app:layout_constraintBottom_toTopOf="@+id/loginSelectBar"
+            app:layout_constraintBottom_toTopOf="@+id/creditCardSelectBar"
             app:layout_constraintTop_toTopOf="parent"
             tools:context="browser.BrowserFragment">
 
@@ -62,13 +62,21 @@
 
         </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
+        <mozilla.components.feature.prompts.creditcard.CreditCardSelectBar
+            android:visibility="gone"
+            android:id="@+id/creditCardSelectBar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toTopOf="@id/loginSelectBar"
+            app:layout_constraintTop_toBottomOf="@id/browserLayout" />
+
         <mozilla.components.feature.prompts.login.LoginSelectBar
             android:visibility="gone"
             android:id="@+id/loginSelectBar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/browserLayout" />
+            app:layout_constraintTop_toBottomOf="@id/creditCardSelectBar" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <org.mozilla.fenix.browser.TabPreview
diff --git a/app/src/main/res/layout/fragment_credit_card_editor.xml b/app/src/main/res/layout/fragment_credit_card_editor.xml
index 4efcf05ca..85a04639d 100644
--- a/app/src/main/res/layout/fragment_credit_card_editor.xml
+++ b/app/src/main/res/layout/fragment_credit_card_editor.xml
@@ -2,236 +2,204 @@
 <!-- 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/. -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_margin="16dp"
-    android:orientation="vertical">
-
-    <!-- Card Number -->
-    <TextView
-        android:id="@+id/card_number_title"
-        android:layout_width="wrap_content"
-        android:layout_height="16dp"
-        android:gravity="center_vertical"
-        android:paddingStart="3dp"
-        android:paddingEnd="0dp"
-        android:text="@string/credit_cards_card_number"
-        android:textColor="?primaryText"
-        android:textSize="12sp"
-        android:letterSpacing="0.05"
-        app:fontFamily="@font/metropolis_semibold" />
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/card_number_layout"
+    android:layout_height="match_parent"
+    android:layout_margin="16dp">
+
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textColor="?primaryText"
-        app:errorEnabled="true"
-        app:hintEnabled="false">
+        android:orientation="vertical">
 
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/card_number_input"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textSize="16sp"
-            android:fontFamily="sans-serif"
+        <!-- Card Number -->
+        <TextView
+            android:id="@+id/card_number_title"
+            android:layout_width="wrap_content"
+            android:layout_height="16dp"
+            android:gravity="center_vertical"
+            android:letterSpacing="0.05"
+            android:paddingStart="3dp"
+            android:paddingEnd="0dp"
+            android:text="@string/credit_cards_card_number"
             android:textColor="?primaryText"
-            android:letterSpacing="0.01"
-            android:lineSpacingExtra="8sp"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:singleLine="true"
-            android:imeOptions="flagNoExtractUi"
-            android:inputType="phone"
-            android:digits="0123456789- " />
-
-    </com.google.android.material.textfield.TextInputLayout>
-
-    <!-- Name on Card -->
-    <TextView
-        android:id="@+id/name_on_card_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:paddingStart="3dp"
-        android:paddingEnd="0dp"
-        android:text="@string/credit_cards_name_on_card"
-        android:textColor="?primaryText"
-        android:textSize="12sp"
-        android:layout_marginTop="10dp"
-        android:letterSpacing="0.05"
-        app:fontFamily="@font/metropolis_semibold" />
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/name_on_card_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="11dp"
-        android:textColor="?primaryText"
-        app:hintEnabled="false">
+            android:textSize="12sp"
+            app:fontFamily="@font/metropolis_semibold" />
 
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/name_on_card_input"
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/card_number_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:fontFamily="sans-serif"
-            android:letterSpacing="0.01"
-            android:lineSpacingExtra="8sp"
-            android:maxLines="1"
-            android:singleLine="true"
             android:textColor="?primaryText"
-            android:textSize="16sp" />
-
-    </com.google.android.material.textfield.TextInputLayout>
-
-    <!-- Expiration Date -->
-    <TextView
-        android:id="@+id/expiration_date_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:paddingStart="3dp"
-        android:paddingEnd="0dp"
-        android:text="@string/credit_cards_expiration_date"
-        android:textColor="?primaryText"
-        android:textSize="12sp"
-        android:layout_marginTop="10dp"
-        android:letterSpacing="0.05"
-        app:fontFamily="@font/metropolis_semibold" />
+            app:errorEnabled="true"
+            app:hintEnabled="false">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:baselineAligned="false">
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/card_number_input"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:digits="0123456789- "
+                android:ellipsize="end"
+                android:fontFamily="sans-serif"
+                android:imeOptions="flagNoExtractUi"
+                android:inputType="phone"
+                android:letterSpacing="0.01"
+                android:lineSpacingExtra="8sp"
+                android:maxLines="1"
+                android:singleLine="true"
+                android:textColor="?primaryText"
+                android:textSize="16sp" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <!-- Name on Card -->
+        <TextView
+            android:id="@+id/name_on_card_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:gravity="center_vertical"
+            android:letterSpacing="0.05"
+            android:paddingStart="3dp"
+            android:paddingEnd="0dp"
+            android:text="@string/credit_cards_name_on_card"
+            android:textColor="?primaryText"
+            android:textSize="12sp"
+            app:fontFamily="@font/metropolis_semibold" />
 
-        <LinearLayout
-            android:layout_width="0dp"
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/name_on_card_layout"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_marginEnd="24dp"
-            android:orientation="vertical">
+            android:paddingBottom="11dp"
+            android:textColor="?primaryText"
+            app:hintEnabled="false">
 
-            <androidx.appcompat.widget.AppCompatSpinner
-                android:id="@+id/expiry_month_drop_down"
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/name_on_card_input"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                tools:listitem="@android:layout/simple_list_item_1" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="?primaryText" />
-
-        </LinearLayout>
+                android:ellipsize="end"
+                android:fontFamily="sans-serif"
+                android:imeOptions="flagNoExtractUi"
+                android:letterSpacing="0.01"
+                android:lineSpacingExtra="8sp"
+                android:maxLines="1"
+                android:singleLine="true"
+                android:textColor="?primaryText"
+                android:textSize="16sp" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <!-- Expiration Date -->
+        <TextView
+            android:id="@+id/expiration_date_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:gravity="center_vertical"
+            android:letterSpacing="0.05"
+            android:paddingStart="3dp"
+            android:paddingEnd="0dp"
+            android:text="@string/credit_cards_expiration_date"
+            android:textColor="?primaryText"
+            android:textSize="12sp"
+            app:fontFamily="@font/metropolis_semibold" />
 
         <LinearLayout
-            android:layout_width="0dp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="vertical">
+            android:baselineAligned="false"
+            android:orientation="horizontal">
 
-            <androidx.appcompat.widget.AppCompatSpinner
-                android:id="@+id/expiry_year_drop_down"
-                android:layout_width="match_parent"
+            <LinearLayout
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                tools:listitem="@android:layout/simple_list_item_1" />
+                android:layout_marginEnd="24dp"
+                android:layout_weight="1"
+                android:orientation="vertical">
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="?primaryText" />
+                <androidx.appcompat.widget.AppCompatSpinner
+                    android:id="@+id/expiry_month_drop_down"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    tools:listitem="@android:layout/simple_list_item_1" />
 
-        </LinearLayout>
-    </LinearLayout>
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="?primaryText" />
 
-    <!-- Card Nickname -->
-    <TextView
-        android:id="@+id/card_nickname_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:paddingStart="3dp"
-        android:paddingEnd="0dp"
-        android:text="@string/credit_cards_card_nickname"
-        android:textColor="?primaryText"
-        android:textSize="12sp"
-        android:layout_marginTop="10dp"
-        android:letterSpacing="0.05"
-        app:fontFamily="@font/metropolis_semibold" />
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/card_nickname_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="11dp"
-        android:textColor="?primaryText"
-        app:errorEnabled="true"
-        app:hintEnabled="false">
+            </LinearLayout>
 
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/card_nickname_input"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:fontFamily="sans-serif"
-            android:letterSpacing="0.01"
-            android:lineSpacingExtra="8sp"
-            android:maxLines="1"
-            android:singleLine="true"
-            android:textColor="?primaryText"
-            android:textSize="16sp" />
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.8"
+                android:orientation="vertical">
 
-    </com.google.android.material.textfield.TextInputLayout>
+                <androidx.appcompat.widget.AppCompatSpinner
+                    android:id="@+id/expiry_year_drop_down"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    tools:listitem="@android:layout/simple_list_item_1" />
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="?primaryText" />
 
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/delete_button"
-            style="@style/Widget.MaterialComponents.Button.TextButton"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:letterSpacing="0"
-            android:padding="10dp"
-            android:text="@string/credit_cards_delete_card_button"
-            android:textAllCaps="false"
-            android:textColor="@color/destructive_button_text_color"
-            android:visibility="gone"
-            app:fontFamily="@font/metropolis_semibold"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent" />
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/cancel_button"
-            style="@style/Widget.MaterialComponents.Button.TextButton"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:letterSpacing="0"
-            android:padding="10dp"
-            android:text="@string/credit_cards_cancel_button"
-            android:textAllCaps="false"
-            android:textColor="?primaryText"
-            android:textStyle="bold"
-            app:fontFamily="@font/metropolis_semibold"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/save_button" />
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/save_button"
-            style="@style/NeutralButton"
-            android:layout_width="wrap_content"
-            android:paddingStart="12dp"
-            android:paddingEnd="12dp"
-            android:text="@string/credit_cards_save_button"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
+            </LinearLayout>
+        </LinearLayout>
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="16dp">
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/delete_button"
+                style="@style/Widget.MaterialComponents.Button.TextButton"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:letterSpacing="0"
+                android:padding="10dp"
+                android:text="@string/credit_cards_delete_card_button"
+                android:textAllCaps="false"
+                android:textColor="@color/destructive_button_text_color"
+                android:visibility="gone"
+                app:fontFamily="@font/metropolis_semibold"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/cancel_button"
+                style="@style/Widget.MaterialComponents.Button.TextButton"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:letterSpacing="0"
+                android:padding="10dp"
+                android:text="@string/credit_cards_cancel_button"
+                android:textAllCaps="false"
+                android:textColor="?primaryText"
+                android:textStyle="bold"
+                app:fontFamily="@font/metropolis_semibold"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/save_button" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/save_button"
+                style="@style/NeutralButton"
+                android:layout_width="wrap_content"
+                android:paddingStart="12dp"
+                android:paddingEnd="12dp"
+                android:text="@string/credit_cards_save_button"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
-</LinearLayout>
+    </LinearLayout>
+</ScrollView>
diff --git a/app/src/main/res/layout/fragment_locale_settings.xml b/app/src/main/res/layout/fragment_locale_settings.xml
index eb8b403c7..d235e7043 100644
--- a/app/src/main/res/layout/fragment_locale_settings.xml
+++ b/app/src/main/res/layout/fragment_locale_settings.xml
@@ -16,4 +16,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_manage_site_permissions_feature_phone.xml b/app/src/main/res/layout/fragment_manage_site_permissions_feature_phone.xml
index f1019b488..9dab31a01 100644
--- a/app/src/main/res/layout/fragment_manage_site_permissions_feature_phone.xml
+++ b/app/src/main/res/layout/fragment_manage_site_permissions_feature_phone.xml
@@ -80,4 +80,4 @@
         <include layout="@layout/component_permissions_blocked_by_android"/>
 
     </LinearLayout>
-</ScrollView>
\ No newline at end of file
+</ScrollView>
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index 6a7e8be88..da0653431 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -202,4 +202,4 @@
             android:textOn="@string/search_engine_button"
             app:drawableStartCompat="@drawable/ic_search" />
     </LinearLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_site_permissions_exceptions_item.xml b/app/src/main/res/layout/fragment_site_permissions_exceptions_item.xml
index ed6da05d1..476a6bcc3 100644
--- a/app/src/main/res/layout/fragment_site_permissions_exceptions_item.xml
+++ b/app/src/main/res/layout/fragment_site_permissions_exceptions_item.xml
@@ -31,4 +31,3 @@
             tools:text="mozilla.com" />
 
 </LinearLayout>
-
diff --git a/app/src/main/res/layout/layout_add_credit_card.xml b/app/src/main/res/layout/layout_add_credit_card.xml
new file mode 100644
index 000000000..9d9803653
--- /dev/null
+++ b/app/src/main/res/layout/layout_add_credit_card.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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/. -->
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/selectableItemBackground"
+    android:clickable="true"
+    android:focusable="true">
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/add_credit_card_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/credit_cards_saved_cards_item_margin_start"
+        app:srcCompat="@drawable/ic_new"
+        android:importantForAccessibility="no"
+        app:layout_constraintBottom_toBottomOf="@id/add_credit_card_text"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/add_credit_card_text" />
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/add_credit_card_text"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/credit_cards_saved_cards_item_margin_start"
+        android:text="@string/preferences_credit_cards_add_credit_card"
+        style="@style/Body16TextStyle"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/add_credit_card_icon"
+        app:layout_constraintTop_toTopOf="parent"
+        android:textAlignment="viewStart" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/layout_percentage_seek_bar.xml b/app/src/main/res/layout/layout_percentage_seek_bar.xml
index 12db43e26..64a611065 100644
--- a/app/src/main/res/layout/layout_percentage_seek_bar.xml
+++ b/app/src/main/res/layout/layout_percentage_seek_bar.xml
@@ -66,7 +66,7 @@
     <View
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:background="@color/violet_05"
+        android:background="@color/photonViolet05"
         app:layout_constraintBottom_toBottomOf="@+id/sampleText"
         app:layout_constraintEnd_toEndOf="@+id/sampleText"
         app:layout_constraintStart_toStartOf="@+id/sampleText"
diff --git a/app/src/main/res/layout/layout_url_background.xml b/app/src/main/res/layout/layout_url_background.xml
index da7b45fae..db5a90b13 100644
--- a/app/src/main/res/layout/layout_url_background.xml
+++ b/app/src/main/res/layout/layout_url_background.xml
@@ -13,4 +13,4 @@
         android:layout_height="40dp"
         android:layout_gravity="center_vertical"
         android:background="@drawable/search_url_background"/>
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/app/src/main/res/layout/locale_settings_item.xml b/app/src/main/res/layout/locale_settings_item.xml
index 511ae58c5..ca15df65a 100644
--- a/app/src/main/res/layout/locale_settings_item.xml
+++ b/app/src/main/res/layout/locale_settings_item.xml
@@ -56,4 +56,4 @@
         app:layout_constraintVertical_chainStyle="packed"
         tools:text="English (United States)" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/migration_list_item.xml b/app/src/main/res/layout/migration_list_item.xml
index 1060a1ad3..811790ec2 100644
--- a/app/src/main/res/layout/migration_list_item.xml
+++ b/app/src/main/res/layout/migration_list_item.xml
@@ -33,4 +33,4 @@
             app:layout_constraintStart_toEndOf="@+id/migration_status_image"
             app:layout_constraintTop_toTopOf="parent"
             tools:text="@sample/migration_items" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/normal_browser_tray_list.xml b/app/src/main/res/layout/normal_browser_tray_list.xml
index a8a12f582..532d794c5 100644
--- a/app/src/main/res/layout/normal_browser_tray_list.xml
+++ b/app/src/main/res/layout/normal_browser_tray_list.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <org.mozilla.fenix.tabstray.browser.NormalBrowserTrayList
+    <org.mozilla.fenix.tabstray.browser.BrowserTrayList
         android:id="@+id/tray_list_item"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/onboarding_tracking_protection.xml b/app/src/main/res/layout/onboarding_tracking_protection.xml
index e97cc3041..97ce4d7b1 100644
--- a/app/src/main/res/layout/onboarding_tracking_protection.xml
+++ b/app/src/main/res/layout/onboarding_tracking_protection.xml
@@ -80,4 +80,4 @@
         app:onboardingKeyDescription="@string/onboarding_tracking_protection_strict_button_description_3"
         app:onboardingKeyTitle="@string/onboarding_tracking_protection_strict_option"
         tools:text="Strict" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/preference_cat_style.xml b/app/src/main/res/layout/preference_cat_style.xml
index b0b640ed7..98934ae20 100644
--- a/app/src/main/res/layout/preference_cat_style.xml
+++ b/app/src/main/res/layout/preference_cat_style.xml
@@ -10,4 +10,4 @@
     android:layout_height="@dimen/section_header_height"
     android:layout_marginStart="@dimen/top_bar_alignment_margin_start"
     android:gravity="start|center_vertical"
-    app:allowDividerAbove="true" />
\ No newline at end of file
+    app:allowDividerAbove="true" />
diff --git a/app/src/main/res/layout/preference_category_no_icon_style.xml b/app/src/main/res/layout/preference_category_no_icon_style.xml
index b5f7df4ab..fee6140d9 100644
--- a/app/src/main/res/layout/preference_category_no_icon_style.xml
+++ b/app/src/main/res/layout/preference_category_no_icon_style.xml
@@ -10,4 +10,4 @@
     android:layout_height="@dimen/section_header_height"
     android:layout_marginStart="@dimen/top_bar_no_icon_alignment_margin_start"
     android:gravity="start|center_vertical"
-    app:allowDividerAbove="true" />
\ No newline at end of file
+    app:allowDividerAbove="true" />
diff --git a/app/src/main/res/layout/preference_credit_cards_add_credit_card.xml b/app/src/main/res/layout/preference_credit_cards_add_credit_card.xml
deleted file mode 100644
index 41c8b247c..000000000
--- a/app/src/main/res/layout/preference_credit_cards_add_credit_card.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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/. -->
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/credit_cards_add_credit_card_button_height"
-    android:background="?android:selectableItemBackground"
-    android:clickable="true"
-    android:focusable="true"
-    android:paddingStart="@dimen/top_bar_alignment_margin_start"
-    tools:ignore="RtlSymmetry">
-
-    <ImageView
-        android:id="@+id/add_icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:importantForAccessibility="no"
-        android:textAlignment="textStart"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_new" />
-
-    <TextView
-        android:id="@+id/add_credit_card_text"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/credit_cards_add_credit_card_text_horizontal_margin"
-        android:layout_marginEnd="@dimen/credit_cards_add_credit_card_text_horizontal_margin"
-        android:text="@string/preferences_credit_cards_add_credit_card"
-        android:textColor="?primaryText"
-        android:textSize="@dimen/credit_cards_add_credit_card_text_size"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/add_icon"
-        app:layout_constraintTop_toTopOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/preference_search_engine_chooser.xml b/app/src/main/res/layout/preference_search_engine_chooser.xml
index 650f700f4..0fdae27f9 100644
--- a/app/src/main/res/layout/preference_search_engine_chooser.xml
+++ b/app/src/main/res/layout/preference_search_engine_chooser.xml
@@ -13,4 +13,4 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/preference_sync.xml b/app/src/main/res/layout/preference_sync.xml
new file mode 100644
index 000000000..bd13e71ce
--- /dev/null
+++ b/app/src/main/res/layout/preference_sync.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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/. -->
+
+<androidx.appcompat.widget.SwitchCompat
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/switch_widget"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:clickable="false"
+    android:focusable="false"
+    android:gravity="center_vertical"
+    android:orientation="vertical" />
diff --git a/app/src/main/res/layout/private_browser_tray_list.xml b/app/src/main/res/layout/private_browser_tray_list.xml
index 21ce16541..532d794c5 100644
--- a/app/src/main/res/layout/private_browser_tray_list.xml
+++ b/app/src/main/res/layout/private_browser_tray_list.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <org.mozilla.fenix.tabstray.browser.PrivateBrowserTrayList
+    <org.mozilla.fenix.tabstray.browser.BrowserTrayList
         android:id="@+id/tray_list_item"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/quicksetting_permission_spinner_dropdown.xml b/app/src/main/res/layout/quicksetting_permission_spinner_dropdown.xml
index 20d16c5f6..649870fec 100644
--- a/app/src/main/res/layout/quicksetting_permission_spinner_dropdown.xml
+++ b/app/src/main/res/layout/quicksetting_permission_spinner_dropdown.xml
@@ -13,4 +13,4 @@
     android:paddingStart="15dp"
     android:paddingEnd="15dp"
     tools:text="Allow Audible"
-    android:textColor="?accentUsedOnDarkBackground" />
\ No newline at end of file
+    android:textColor="?accentUsedOnDarkBackground" />
diff --git a/app/src/main/res/layout/recently_closed_nav_item.xml b/app/src/main/res/layout/recently_closed_nav_item.xml
index 02ad905ae..6230b4d5f 100644
--- a/app/src/main/res/layout/recently_closed_nav_item.xml
+++ b/app/src/main/res/layout/recently_closed_nav_item.xml
@@ -63,4 +63,4 @@
         app:layout_constraintTop_toBottomOf="@id/recently_closed_tabs_header"
         app:layout_goneMarginEnd="@dimen/library_item_icon_margin_horizontal"
         tools:text="2 tabs" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/search_suggestions_hint.xml b/app/src/main/res/layout/search_suggestions_hint.xml
index 14bf46202..914a63125 100644
--- a/app/src/main/res/layout/search_suggestions_hint.xml
+++ b/app/src/main/res/layout/search_suggestions_hint.xml
@@ -102,4 +102,4 @@
             app:layout_constraintTop_toTopOf="@id/allow" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</androidx.core.widget.NestedScrollView>
\ No newline at end of file
+</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/search_widget_small_no_mic.xml b/app/src/main/res/layout/search_widget_small_no_mic.xml
index 89c056207..d0bd2d81a 100644
--- a/app/src/main/res/layout/search_widget_small_no_mic.xml
+++ b/app/src/main/res/layout/search_widget_small_no_mic.xml
@@ -16,4 +16,4 @@
         android:layout_height="40dp"
         android:layout_gravity="center"
         android:contentDescription="@string/search_widget_content_description" />
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/app/src/main/res/layout/share_close.xml b/app/src/main/res/layout/share_close.xml
index 8bc84de86..918f0c9f3 100644
--- a/app/src/main/res/layout/share_close.xml
+++ b/app/src/main/res/layout/share_close.xml
@@ -48,4 +48,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintEnd_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/title" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/share_tab_item.xml b/app/src/main/res/layout/share_tab_item.xml
index 47735c24f..48315f2f2 100644
--- a/app/src/main/res/layout/share_tab_item.xml
+++ b/app/src/main/res/layout/share_tab_item.xml
@@ -48,4 +48,4 @@
         app:layout_constraintTop_toBottomOf="@id/share_tab_title"
         app:layout_constraintEnd_toEndOf="parent"/>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/share_to_apps.xml b/app/src/main/res/layout/share_to_apps.xml
index 3f654bcfa..54d257d2b 100644
--- a/app/src/main/res/layout/share_to_apps.xml
+++ b/app/src/main/res/layout/share_to_apps.xml
@@ -101,4 +101,3 @@
         </RelativeLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </HorizontalScrollView>
-
diff --git a/app/src/main/res/layout/tab_history_list_item.xml b/app/src/main/res/layout/tab_history_list_item.xml
index 3bdef8369..a58a46d22 100644
--- a/app/src/main/res/layout/tab_history_list_item.xml
+++ b/app/src/main/res/layout/tab_history_list_item.xml
@@ -8,4 +8,3 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="@dimen/library_item_height" />
-
diff --git a/app/src/main/res/layout/tab_tray_grid_item.xml b/app/src/main/res/layout/tab_tray_grid_item.xml
index 35cdb4c8f..e3a4da115 100644
--- a/app/src/main/res/layout/tab_tray_grid_item.xml
+++ b/app/src/main/res/layout/tab_tray_grid_item.xml
@@ -51,10 +51,11 @@ A FrameLayout here is an efficient way of having a views stack while allowing:
             <TextView
                 android:id="@+id/mozac_browser_tabstray_title"
                 android:layout_width="0dp"
-                android:layout_height="30dp"
+                android:layout_height="wrap_content"
                 android:layout_alignParentTop="true"
                 android:ellipsize="none"
                 android:fadingEdgeLength="25dp"
+                android:minHeight="30dp"
                 android:paddingHorizontal="7dp"
                 android:paddingVertical="5dp"
                 android:requiresFadingEdge="horizontal"
diff --git a/app/src/main/res/layout/tab_tray_item.xml b/app/src/main/res/layout/tab_tray_item.xml
index f8661c46d..0b5a77334 100644
--- a/app/src/main/res/layout/tab_tray_item.xml
+++ b/app/src/main/res/layout/tab_tray_item.xml
@@ -67,7 +67,6 @@
         android:ellipsize="end"
         android:textColor="@color/tab_tray_item_text_normal_theme"
         android:textSize="16sp"
-        android:lineSpacingExtra="4sp"
         android:maxLines="2"
         tools:text="Firefox"
         app:layout_constraintEnd_toStartOf="@id/mozac_browser_tabstray_close"
@@ -81,7 +80,6 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
-        android:layout_marginTop="4dp"
         android:layout_marginBottom="24dp"
         android:layout_marginStart="12dp"
         android:ellipsize="end"
diff --git a/app/src/main/res/layout/tabs_tray_tab_counter.xml b/app/src/main/res/layout/tabs_tray_tab_counter.xml
index df8b697ac..c09d7df21 100644
--- a/app/src/main/res/layout/tabs_tray_tab_counter.xml
+++ b/app/src/main/res/layout/tabs_tray_tab_counter.xml
@@ -31,4 +31,4 @@
         android:textSize="12sp"
         android:textStyle="bold"
         tools:text="16" />
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/app/src/main/res/layout/tabs_tray_tab_counter2.xml b/app/src/main/res/layout/tabs_tray_tab_counter2.xml
index 25036e94f..c8ea417bd 100644
--- a/app/src/main/res/layout/tabs_tray_tab_counter2.xml
+++ b/app/src/main/res/layout/tabs_tray_tab_counter2.xml
@@ -5,7 +5,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:mozac="http://schemas.android.com/apk/res-auto"
     android:id="@+id/counter_root"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_centerHorizontal="true"
     android:layout_centerVertical="true">
@@ -16,4 +16,4 @@
         android:layout_height="wrap_content"
         mozac:tabCounterTintColor="@color/tab_icon" />
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/app/src/main/res/layout/top_site_item.xml b/app/src/main/res/layout/top_site_item.xml
index f02af96fd..97f178960 100644
--- a/app/src/main/res/layout/top_site_item.xml
+++ b/app/src/main/res/layout/top_site_item.xml
@@ -12,48 +12,35 @@
     android:layout_marginBottom="@dimen/top_sites_item_margin_bottom"
     android:orientation="vertical">
 
-    <ImageView
-        android:id="@+id/favicon_image"
-        style="@style/TopSite.Favicon"
-        android:layout_gravity="center"
-        android:importantForAccessibility="no"
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/favicon_card"
+        style="@style/TopSite.FaviconCard"
+        android:importantForAccessibility="noHideDescendants"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.imageview.ShapeableImageView
+            android:id="@+id/favicon_image"
+            style="@style/topSiteFavicon" />
+    </com.google.android.material.card.MaterialCardView>
 
     <TextView
         android:id="@+id/top_site_title"
-        android:layout_width="64dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:maxWidth="84dp"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="@dimen/top_sites_text_margin_top"
+        android:drawablePadding="2dp"
         android:gravity="center"
+        android:textAlignment="center"
         android:singleLine="true"
         android:textColor="@color/top_site_title_text"
         android:textSize="12sp"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/favicon_image"
-        tools:ignore="SmallSp" />
-
-    <FrameLayout
-        android:id="@+id/pin_indicator"
-        android:layout_width="16dp"
-        android:layout_height="16dp"
-        android:elevation="7dp"
-        android:translationX="8dp"
-        android:translationY="-8dp"
-        android:visibility="gone"
-        app:layout_constraintRight_toLeftOf="@id/favicon_image"
-        app:layout_constraintTop_toTopOf="@id/favicon_image">
-
-        <View
-            android:id="@+id/pin_icon"
-            android:layout_width="16dp"
-            android:layout_height="16dp"
-            android:layout_gravity="center"
-            android:background="@drawable/ic_pin"
-            android:backgroundTint="@color/top_site_pin_icon_background_tint"/>
-    </FrameLayout>
+        app:layout_constraintTop_toBottomOf="@id/favicon_card"
+        tools:ignore="RtlCompat,SmallSp" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/view_synced_tabs_group.xml b/app/src/main/res/layout/view_synced_tabs_group.xml
index fe0083253..91abefcc5 100644
--- a/app/src/main/res/layout/view_synced_tabs_group.xml
+++ b/app/src/main/res/layout/view_synced_tabs_group.xml
@@ -22,6 +22,7 @@
         android:textAppearance="@style/Header14TextStyle"
         android:textColor="@color/primary_text_normal_theme"
         android:textSize="12sp"
+        android:textDirection="locale"
         app:drawableStartCompat="@drawable/mozac_ic_device_desktop"
         app:drawableTint="@color/primary_text_normal_theme"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/view_synced_tabs_no_item.xml b/app/src/main/res/layout/view_synced_tabs_no_item.xml
index 769081cd6..362e45190 100644
--- a/app/src/main/res/layout/view_synced_tabs_no_item.xml
+++ b/app/src/main/res/layout/view_synced_tabs_no_item.xml
@@ -18,4 +18,4 @@
         android:textColor="?secondaryText"
         android:textSize="12sp" />
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/app/src/main/res/layout/view_synced_tabs_title.xml b/app/src/main/res/layout/view_synced_tabs_title.xml
index 7082a78b0..80cfee5aa 100644
--- a/app/src/main/res/layout/view_synced_tabs_title.xml
+++ b/app/src/main/res/layout/view_synced_tabs_title.xml
@@ -30,4 +30,4 @@
         app:srcCompat="@drawable/mozac_ic_refresh"
         app:tint="?primaryText" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/menu/download_select_multi.xml b/app/src/main/res/menu/download_select_multi.xml
index e0087d5c2..d5cd26234 100644
--- a/app/src/main/res/menu/download_select_multi.xml
+++ b/app/src/main/res/menu/download_select_multi.xml
@@ -12,4 +12,4 @@
         android:id="@+id/delete_downloads_multi_select"
         android:title="@string/download_delete_item_1"
         app:showAsAction="never" />
-</menu>
\ No newline at end of file
+</menu>
diff --git a/app/src/main/res/menu/login_save.xml b/app/src/main/res/menu/login_save.xml
index fb9682757..644dbf941 100644
--- a/app/src/main/res/menu/login_save.xml
+++ b/app/src/main/res/menu/login_save.xml
@@ -11,4 +11,4 @@
         app:iconTint="@color/save_enabled_ic_color"
         android:title="@string/save_changes_to_login"
         app:showAsAction="always" />
-</menu>
\ No newline at end of file
+</menu>
diff --git a/app/src/main/res/menu/tab_tray_menu.xml b/app/src/main/res/menu/tab_tray_menu.xml
index 35c8e87ff..9022adce5 100644
--- a/app/src/main/res/menu/tab_tray_menu.xml
+++ b/app/src/main/res/menu/tab_tray_menu.xml
@@ -22,4 +22,4 @@
         android:id="@+id/tab_tray_close_menu_item"
         android:title="@string/tab_tray_menu_item_close"
         app:showAsAction="never" />
-</menu>
\ No newline at end of file
+</menu>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_private.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_private.xml
index a527ca92e..66196fc1d 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_private.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_private.xml
@@ -6,4 +6,4 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@drawable/ic_launcher_private_background"/>
     <foreground android:drawable="@drawable/ic_launcher_private_foreground"/>
-</adaptive-icon>
\ No newline at end of file
+</adaptive-icon>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_private_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_private_round.xml
index a527ca92e..66196fc1d 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_private_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_private_round.xml
@@ -6,4 +6,4 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@drawable/ic_launcher_private_background"/>
     <foreground android:drawable="@drawable/ic_launcher_private_foreground"/>
-</adaptive-icon>
\ No newline at end of file
+</adaptive-icon>
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index a302b5d2f..cc865eaa1 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -126,6 +126,9 @@
     <action
         android:id="@+id/action_global_savedLoginsAuthFragment"
         app:destination="@id/savedLoginsAuthFragment" />
+    <action
+        android:id="@+id/action_global_creditCardsSettingFragment"
+        app:destination="@id/credit_cards_graph" />
     <action
         android:id="@+id/action_global_tabHistoryDialogFragment"
         app:destination="@id/tabHistoryDialogFragment" />
@@ -1017,15 +1020,18 @@
             android:label="@string/preferences_nimbus_experiments"
             tools:layout="@layout/mozac_service_nimbus_experiments">
             <action
-                android:id="@+id/action_nimbusExperimentsFragment_to_nimbusDetailsFragment"
-                app:destination="@+id/nimbusDetailsFragment" />
+                android:id="@+id/action_nimbusExperimentsFragment_to_nimbusBranchesFragment"
+                app:destination="@+id/nimbusBranchesFragment" />
         </fragment>
         <fragment
-            android:id="@+id/nimbusDetailsFragment"
-            android:name="org.mozilla.fenix.nimbus.NimbusDetailsFragment"
+            android:id="@+id/nimbusBranchesFragment"
+            android:name="org.mozilla.fenix.nimbus.NimbusBranchesFragment"
             tools:layout="@layout/mozac_service_nimbus_experiment_details">
             <argument
-                android:name="experiment"
+                android:name="experimentId"
+                app:argType="string" />
+            <argument
+                android:name="experimentName"
                 app:argType="string" />
         </fragment>
     </navigation>
@@ -1037,13 +1043,6 @@
             android:id="@+id/creditCardsSettingFragment"
             android:name="org.mozilla.fenix.settings.creditcards.CreditCardsSettingFragment"
             android:label="@string/preferences_credit_cards">
-            <action
-                android:id="@+id/action_creditCardsSettingFragment_to_turnOnSyncFragment"
-                app:destination="@id/turnOnSyncFragment"
-                app:enterAnim="@anim/slide_in_right"
-                app:exitAnim="@anim/slide_out_left"
-                app:popEnterAnim="@anim/slide_in_left"
-                app:popExitAnim="@anim/slide_out_right" />
             <action
                 android:id="@+id/action_creditCardsSettingFragment_to_creditCardEditorFragment"
                 app:destination="@id/creditCardEditorFragment"
diff --git a/app/src/main/res/raw/initial_experiments.json b/app/src/main/res/raw/initial_experiments.json
new file mode 100644
index 000000000..268c73f0e
--- /dev/null
+++ b/app/src/main/res/raw/initial_experiments.json
@@ -0,0 +1,3 @@
+{
+  "data": []
+}
diff --git a/app/src/main/res/values-ast/strings.xml b/app/src/main/res/values-ast/strings.xml
index dde8d7e9b..326cc998e 100644
--- a/app/src/main/res/values-ast/strings.xml
+++ b/app/src/main/res/values-ast/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_name_private_5">%s en privao</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (en privao)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">Más opciones</string>
@@ -95,13 +96,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Escartar</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Cambia la distribución de les llingüetes abiertes. Vete a axustes y esbilla\'l rexáu na vista de llingüetes.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Dir a Axustes</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Escartar</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Llingüeta nueva</string>
@@ -428,9 +422,6 @@
     <!-- Text displayed when there are no exceptions, with learn more link that brings users to a tracking protection SUMO page -->
     <string name="exceptions_empty_message_learn_more_link">Deprender más</string>
 
-    <!-- Description in Quick Settings that tells user tracking protection is off globally for all sites, and links to Settings to turn it on -->
-    <string name="preferences_tracking_protection_turned_off_globally">Desactivóse globalmente, vete a Axustes p\'activala</string>
-
     <!-- Preference switch for Telemetry -->
     <string name="preferences_telemetry">Telemetría</string>
     <!-- Preference switch for usage and technical data collection -->
@@ -523,8 +514,6 @@
     <string name="library_new_tab">Llingüeta nueva</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Atopar na llibrería</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Llingüetes sincronizaes</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Llista de llectura</string>
     <!-- Menu Item Label for Search in Library -->
@@ -571,6 +560,10 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Dempués d\'un mes</string>
 
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Siempres</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Enxamás</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Zarrales a mano</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -766,8 +759,6 @@
     <string name="bookmark_delete_folder_snackbar">Desanicióse %1$s</string>
     <!-- Screen title for adding a bookmarks folder -->
     <string name="bookmark_add_folder">Amestar una carpeta</string>
-    <!-- deprecated: Snackbar title shown after a bookmark has been created. -->
-    <string name="bookmark_created_snackbar">Creóse\'l marcador.</string>
     <!-- Snackbar title shown after a bookmark has been created. -->
     <string name="bookmark_saved_snackbar">¡Guardóse\'l marcador!</string>
     <!-- Snackbar edit button shown after a bookmark has been created. -->
@@ -1431,10 +1422,6 @@ en llinia y con nós.</string>
     <string name="preferences_passwords_autofill">Autocompletáu de formularios</string>
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Sincronización d\'anicios de sesión</string>
-    <!-- Syncing saved logins in Fenix is on -->
-    <string name="preferences_passwords_sync_logins_on">Sí</string>
-    <!-- Syncing saved logins in Fenix is off -->
-    <string name="preferences_passwords_sync_logins_off">Non</string>
     <!-- Syncing saved logins in Fenix needs reconnect to sync -->
     <string name="preferences_passwords_sync_logins_reconnect">Calca equí pa reconectar</string>
     <!-- Syncing saved logins in Fenix needs login -->
@@ -1564,6 +1551,18 @@ en llinia y con nós.</string>
     <!-- Title of the "Saved cards" screen -->
     <string name="credit_cards_saved_cards">Tarxetes guardaes</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Rellena esti campu</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Configurar</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Dempués</string>
+
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Desbloquéu del preséu</string>
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Desbloquia pa usar les tarxetes de creitu atroxaes</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Amestar un motor de busca</string>
     <!-- Title of the Edit search engine screen -->
@@ -1722,20 +1721,10 @@ en llinia y con nós.</string>
     <!-- Content description for close button in collection placeholder. -->
     <string name="remove_home_collection_placeholder_content_description">Quitar</string>
 
-    <!-- Deprecated: text for the firefox account onboarding card header
-    The first parameter is the name of the app (e.g. Firefox Preview) -->
-    <string name="onboarding_firefox_account_header">Aprovecha %s al máximu.</string>
-
     <!-- Content description radio buttons with a link to more information -->
     <string name="radio_preference_info_content_description">Calca pa más detalles</string>
 
-    <!-- Deprecated: No Open Tabs Message Header -->
-    <string name="no_collections_header1">Coleiciona les coses que t\'importen</string>
-    <!-- Deprecated: Label to describe what collections are to a new user without any collections -->
-    <string name="no_collections_description1">Agrupa busques, sitios y llingüetes asemeyaos p\'acceder aína a ellos dempués.</string>
-    <!-- Deprecated: text for the firefox account onboarding card header when we detect you're already signed in to -->
-    <string name="onboarding_firefox_account_auto_signin_header_2">Aniciesti sesión como %s n\'otru Firefox d\'esti teléfonu. ¿Quedríes aniciar sesión con esta cuenta?</string>
-    <!-- Deprecated: Describes the add to homescreen functionality -->
-    <string name="add_to_homescreen_description">Pues amestar fácilmente esti sitiu web a la pantalla d\'aniciu del preséu p\'acceder nel intre y restolalu como si fore una aplicación.</string>
+    <!-- Content description for privacy content close button -->
+    <string name="privacy_content_close_button_content_description">Zarrar</string>
 
-    </resources>
+</resources>
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index 1c303a0e5..9d0f5b2e4 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -5,6 +5,7 @@
     <string name="app_name_private_5">Прыватны %s</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (прыватна)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">Дадаткова</string>
@@ -48,6 +49,16 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">Вылучана</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">Нядаўна захаваныя</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">Нядаўна захаваныя закладкі</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">Паказаць усе</string>
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">Паказаць усе захаваныя закладкі</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s распрацаваны Mozilla.</string>
 
@@ -91,14 +102,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Адхіліць</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Змяніце выклад адкрытых картак. Перайдзіце ў налады і абярыце сетку ў раздзеле выгляду картак.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Перайсці ў налады</string>
-
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Закрыць</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Новая картка</string>
@@ -107,6 +110,12 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">Папулярныя сайты</string>
 
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">Назад да</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">Паказаць усе</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">Адкрытыя карткі</string>
@@ -184,6 +193,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Змяніць</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Хатні экран</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">Немагчыма злучыцца. Невядомая схема URL.</string>
@@ -412,6 +425,11 @@
         and the third is the device model. -->
     <string name="default_device_name_2">%1$s на %2$s %3$s</string>
 
+    <!-- Preference for syncing credit cards -->
+    <string name="preferences_sync_credit_cards">Крэдытныя карты</string>
+    <!-- Preference for syncing addresses -->
+    <string name="preferences_sync_address">Адрасы</string>
+
     <!-- Send Tab -->
     <!-- Name of the "receive tabs" notification channel. Displayed in the "App notifications" system settings for the app -->
     <string name="fxa_received_tab_channel_name">Атрыманыя карткі</string>
@@ -442,9 +460,6 @@
     <!-- Text displayed when there are no exceptions, with learn more link that brings users to a tracking protection SUMO page -->
     <string name="exceptions_empty_message_learn_more_link">Даведацца больш</string>
 
-    <!-- Description in Quick Settings that tells user tracking protection is off globally for all sites, and links to Settings to turn it on -->
-    <string name="preferences_tracking_protection_turned_off_globally">Выключана паўсюль. Перайдзіце ў Налады, каб уключыць.</string>
-
     <!-- Preference switch for Telemetry -->
     <string name="preferences_telemetry">Тэлеметрыя</string>
     <!-- Preference switch for usage and technical data collection -->
@@ -455,6 +470,8 @@
     <string name="preferences_marketing_data">Маркетынгавыя дадзеныя</string>
     <!-- Preference description for marketing data collection, parameter is the app name (e.g. Firefox) -->
     <string name="preferences_marketing_data_description">Дзяліцца звесткамі пра магчымасці, якімі вы карыстаецеся ў %1$s, з нашым пастаўшчыком мабільнага маркетынгу Leanplum.</string>
+    <!-- Preference description for marketing data collection -->
+    <string name="preferences_marketing_data_description2">Дзеліцца асноўнымі звесткамі аб выкарыстанні з Adjust, нашым пастаўшчыком мабільнага маркетынгу</string>
     <!-- Title for studies preferences -->
     <string name="preference_experiments_2">Даследаванні</string>
     <!-- Summary for studies preferences -->
@@ -546,8 +563,6 @@
     <string name="library_new_tab">Новая картка</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Знайсці на старонцы</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Сінхранізаваныя карткі</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Спіс для чытання</string>
     <!-- Menu Item Label for Search in Library -->
@@ -592,6 +607,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Праз месяц</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Запускаць на хатнім экране</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">Праз чатыры гадзіны</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Заўжды</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Ніколі</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Закрываць уручную</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -801,8 +825,6 @@
     <string name="bookmark_delete_folder_snackbar">%1$s выдалена</string>
     <!-- Screen title for adding a bookmarks folder -->
     <string name="bookmark_add_folder">Дадаць папку</string>
-    <!-- deprecated: Snackbar title shown after a bookmark has been created. -->
-    <string name="bookmark_created_snackbar">Закладка створана.</string>
     <!-- Snackbar title shown after a bookmark has been created. -->
     <string name="bookmark_saved_snackbar">Закладка захавана!</string>
     <!-- Snackbar edit button shown after a bookmark has been created. -->
@@ -1471,10 +1493,8 @@
     <string name="preferences_passwords_autofill">Аўтазапаўненне</string>
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Сінхранізацыя лагінаў</string>
-    <!-- Syncing saved logins in Fenix is on -->
-    <string name="preferences_passwords_sync_logins_on">Уключана</string>
-    <!-- Syncing saved logins in Fenix is off -->
-    <string name="preferences_passwords_sync_logins_off">Выключана</string>
+    <!-- Preference for syncing saved logins in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices">Сінхранізаваць лагіны паміж прыладамі</string>
     <!-- Syncing saved logins in Fenix needs reconnect to sync -->
     <string name="preferences_passwords_sync_logins_reconnect">Перападлучыцца</string>
     <!-- Syncing saved logins in Fenix needs login -->
@@ -1578,6 +1598,8 @@
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Дадзеныя зашыфраваны</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Сінхранізаваць карты паміж прыладамі</string>
+    <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
+    <string name="preferences_credit_cards_sync_cards">Сінхранізаваць карты</string>
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Дадаць крэдытную карту</string>
     <!-- Preference option for managing saved credit cards -->
@@ -1592,6 +1614,10 @@
     <string name="credit_cards_card_number">Нумар карты</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">Тэрмін дзеяння</string>
+    <!-- The label for the expiration date month of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_month">Месяц заканчэння тэрміну дзеяння</string>
+    <!-- The label for the expiration date year of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_year">Год заканчэння тэрміну дзеяння</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">Імя на карце</string>
     <!-- The header for the nickname for a credit card -->
@@ -1609,6 +1635,27 @@
     <!-- Title of the "Saved cards" screen -->
     <string name="credit_cards_saved_cards">Захаваныя карты</string>
 
+    <!-- Error message for credit card number validation -->
+    <string name="credit_cards_number_validation_error_message">Калі ласка, увядзіце сапраўдны нумар крэдытнай карты</string>
+
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Калі ласка, запоўніце гэтае поле</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Разблакуйце, каб пабачыць захаваныя карты</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Абараніце свае крэдытныя карты</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Наладзьце графічны ключ, пін або пароль для блакавання прылады, каб абараніць захаваныя крэдытныя карты, калі хтось іншы атрымае доступ да вашай прылады.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Наладзіць зараз</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Пазней</string>
+
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Разблакуйце сваю прыладу</string>
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Разблакуйце, каб выкарыстаць захаваную інфармацыю крэдытнай карты</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Дадаць пашукавік</string>
     <!-- Title of the Edit search engine screen -->
@@ -1780,19 +1827,13 @@
     <!-- Content description for close button in collection placeholder. -->
     <string name="remove_home_collection_placeholder_content_description">Выдаліць</string>
 
-    <!-- Deprecated: text for the firefox account onboarding card header
-    The first parameter is the name of the app (e.g. Firefox Preview) -->
-    <string name="onboarding_firefox_account_header">Атрымайце максімум ад %s.</string>
-
     <!-- Content description radio buttons with a link to more information -->
     <string name="radio_preference_info_content_description">Пстрыкніце, каб атрымаць падрабязнасці</string>
 
-    <!-- Deprecated: No Open Tabs Message Header -->
-    <string name="no_collections_header1">Збірайце важныя для вас рэчы</string>
-    <!-- Deprecated: Label to describe what collections are to a new user without any collections -->
-    <string name="no_collections_description1">Групуйце падобныя пошукі, сайты і карткі для хуткага доступу.</string>
-    <!-- Deprecated: text for the firefox account onboarding card header when we detect you're already signed in to -->
-    <string name="onboarding_firefox_account_auto_signin_header_2">Вы ўвайшлі як %s у іншым браўзеры Firefox на гэтым тэлефоне. Ці хочаце аўтарызавацца з дапамогай гэтага ўліковага запісу?</string>
-    <!-- Deprecated: Describes the add to homescreen functionality -->
-    <string name="add_to_homescreen_description">Вы можаце лёгка дадаць гэты вэб-сайт на хатні экран свайго тэлефона, каб мець да яго імгненны доступ і аглядаць хутчэй, нібыта гэта асобная праграма.</string>
+    <!-- Content description for the action bar "up" button -->
+    <string name="action_bar_up_description">Перайсці ўверх</string>
+
+    <!-- Content description for privacy content close button -->
+    <string name="privacy_content_close_button_content_description">Закрыць</string>
+
 </resources>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index e53e87a2f..68cf77eaf 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -5,6 +5,7 @@
     <string name="app_name_private_5">Поверителен %s</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (поверителен)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">Повече настройки</string>
@@ -21,10 +22,6 @@
     <!-- No Private Tabs Message Description -->
     <string name="no_private_tabs_description">Поверителните раздели ще бъдат показани тук.</string>
 
-    <!-- Default title for pinned Baidu top site that links to Baidu home page  -->
-    <string name="default_top_site_baidu">Baidu</string>
-    <!-- Default title for pinned JD top site that links to JD home page  -->
-    <string name="default_top_site_jd">JD</string>
     <!-- Message announced to the user when tab tray is selected with 1 tab -->
     <string name="open_tab_tray_single">1 отворен раздел. Докоснете за превключване на раздели.</string>
     <!-- Message announced to the user when tab tray is selected with 0 or 2+ tabs -->
@@ -54,6 +51,16 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">Избран</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">Последно запазени</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">Последно запазени отметки</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">Показване на всички</string>
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">Бутон за показване на всички запазени отметки</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s е произведен от @fork-maintainers.</string>
 
@@ -62,7 +69,7 @@
     <string name="private_browsing_title">Вие сте в поверителен прозорец</string>
     <!-- Explanation for private browsing displayed to users on home view when they first enable private mode
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="private_browsing_placeholder_description_2">%1$s изчиства историята на търсенето и разглеждането, когато ги затворите или излезете от приложението. Въпреки че това не ви прави анонимни за уеб сайтовете или доставчиците на интернет услуги, улеснява запазването на анонимността на действия ви в мрежата, от останалите ползващи същото устройство.</string>
+    <string name="private_browsing_placeholder_description_2">%1$s изчиства вашата история на търсене и разглеждане от поверителните раздели, когато ги затворите или излезете от приложението. Това не ви прави невидими за уебсайтовете или мрежовите доставчици, но запазва поверителността на вашата дейност онлайн от други ползватели на същото устройството.</string>
     <string name="private_browsing_common_myths">Разпространени легенди относно поверителното разглеждане</string>
     <!-- Delete session button to erase your history in a private session -->
     <string name="private_browsing_delete_session">Изтриване на сесията</string>
@@ -98,20 +105,19 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Прекратяване</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Променете изгледа на отворените раздели. Отворете настройки и изберете „мрежа“ в „преглед на раздел“.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Към настройки</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Прекратяване</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Нов раздел</string>
     <!-- Shortcut action to open new private tab -->
     <string name="home_screen_shortcut_open_new_private_tab_2">Нов поверителен раздел</string>
     <!-- Heading for the Top Sites block -->
-    <string name="home_screen_top_sites_heading">Най-посещавани страници</string>
+    <string name="home_screen_top_sites_heading">Предпочитани страници</string>
+
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">Върнете се към</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">Показване на всички</string>
 
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
@@ -130,6 +136,8 @@
     <string name="browser_menu_edit_bookmark">Редактиране на отметка</string>
     <!-- Browser menu button that opens the addon manager -->
     <string name="browser_menu_add_ons">Добавки</string>
+    <!-- Browser menu button that opens the addon extensions manager -->
+    <string name="browser_menu_extensions">Разширения</string>
     <!-- Text displayed when there are no add-ons to be shown -->
     <string name="no_add_ons">Няма добавки</string>
     <!-- Browser menu button that sends a user to help articles -->
@@ -179,6 +187,18 @@
     <!-- Browser menu button to configure reader mode appearance e.g. the used font type and size -->
     <string name="browser_menu_read_appearance">Външен вид</string>
 
+    <!-- Browser menu button to show reader view appearance controls e.g. the used font type and size -->
+    <string name="browser_menu_customize_reader_view">Настройки на режим за четене</string>
+
+    <!-- Browser menu label for adding a bookmark -->
+    <string name="browser_menu_add">Добавяне</string>
+    <!-- Browser menu label for editing a bookmark -->
+    <string name="browser_menu_edit">Редактиране</string>
+
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Начален екран</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">Грешка при свързване. Неразпознат протокол.</string>
@@ -217,6 +237,11 @@
     <!-- Search suggestion onboarding hint Learn more link text -->
     <string name="search_suggestions_onboarding_learn_more_link">Научете повече</string>
 
+    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <string name="search_engine_suggestions_title">Търсене с %s</string>
+    <!-- Search engine suggestion description text -->
+    <string name="search_engine_suggestions_description">Търсете директно от адресната лента</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
     <string name="search_widget_content_description">Отваряне на раздел във Firefox</string>
@@ -364,6 +389,12 @@
     <!-- Toast shown after confirming the custom add-on collection configuration -->
     <string name="toast_customize_addon_collection_done">Списъкът с добавки е променен. Излизане от приложението за прилагане на промените…</string>
 
+    <!-- Add-on Installation from AMO-->
+    <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
+    <string name="addon_not_supported_error">Добавката не се поддържа</string>
+    <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
+    <string name="addon_already_installed">Добавката вече е инсталирана</string>
+
     <!-- Account Preferences -->
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Синхронизиране</string>
@@ -398,6 +429,11 @@
         and the third is the device model. -->
     <string name="default_device_name_2">%1$s на %2$s %3$s</string>
 
+    <!-- Preference for syncing credit cards -->
+    <string name="preferences_sync_credit_cards">Банкови карти</string>
+    <!-- Preference for syncing addresses -->
+    <string name="preferences_sync_address">Адреси</string>
+
     <!-- Send Tab -->
     <!-- Name of the "receive tabs" notification channel. Displayed in the "App notifications" system settings for the app -->
     <string name="fxa_received_tab_channel_name">Получени раздели</string>
@@ -428,9 +464,6 @@
     <!-- Text displayed when there are no exceptions, with learn more link that brings users to a tracking protection SUMO page -->
     <string name="exceptions_empty_message_learn_more_link">Научете повече</string>
 
-    <!-- Description in Quick Settings that tells user tracking protection is off globally for all sites, and links to Settings to turn it on -->
-    <string name="preferences_tracking_protection_turned_off_globally">Изключено глобално, посетете Настройки, за да го включите.</string>
-
     <!-- Preference switch for Telemetry -->
     <string name="preferences_telemetry">Телеметрия</string>
     <!-- Preference switch for usage and technical data collection -->
@@ -441,6 +474,8 @@
     <string name="preferences_marketing_data">Маркетингови данни</string>
     <!-- Preference description for marketing data collection, parameter is the app name (e.g. Firefox) -->
     <string name="preferences_marketing_data_description">Споделя данни за използваните от вас възможности на %1$s чрез Leanplum, нашият партньор за мобилен маркетинг.</string>
+    <!-- Preference description for marketing data collection -->
+    <string name="preferences_marketing_data_description2">Споделя данни за употребата с Adjust, нашия доставчик на мобилен маркетинг</string>
     <!-- Title for studies preferences -->
     <string name="preference_experiments_2">Проучвания</string>
     <!-- Summary for studies preferences -->
@@ -526,8 +561,10 @@
     <string name="library_desktop_bookmarks_unfiled">Други отметки</string>
     <!-- Option in Library to open History page -->
     <string name="library_history">История</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Синхронизирани раздели</string>
+    <!-- Option in Library to open a new tab -->
+    <string name="library_new_tab">Нов раздел</string>
+    <!-- Option in Library to find text in page -->
+    <string name="library_find_in_page">Търсене в страницата</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Списък за четене</string>
     <!-- Menu Item Label for Search in Library -->
@@ -573,6 +610,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">След един месец</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Отваряне на началната страница</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">След четири часа</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Винаги</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Никога</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Ръчно затваряне</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -589,12 +635,16 @@
     <string name="tabs_header_private_title">Поверителни сесии</string>
     <!-- Title for the list of tabs in the current private session -->
     <string name="tabs_header_private_tabs_title">Поверителни раздели</string>
+    <!-- Title for the list of tabs in the synced tabs -->
+    <string name="tabs_header_synced_tabs_title">Синхронизирани раздели</string>
     <!-- Content description (not visible, for screen readers etc.): Add tab button. Adds a news tab when pressed -->
     <string name="add_tab">Добавяне на раздел</string>
     <!-- Content description (not visible, for screen readers etc.): Add tab button. Adds a news tab when pressed -->
     <string name="add_private_tab">Отваря поверителен раздел</string>
     <!-- Text for the new tab button to indicate adding a new private tab in the tab -->
     <string name="tab_drawer_fab_content">Поверителен</string>
+    <!-- Text for the new tab button to indicate syncing command on the synced tabs page -->
+    <string name="tab_drawer_fab_sync">Синхронизирани</string>
     <!-- Text shown as the title of the open tab tray -->
     <string name="tab_tray_title">Отворени раздели</string>
     <!-- Text shown in the menu for saving tabs to a collection -->
@@ -605,6 +655,8 @@
     <string name="tab_tray_menu_item_share">Споделяне на всички раздели</string>
     <!-- Text shown in the menu to view recently closed tabs -->
     <string name="tab_tray_menu_recently_closed">Последно затворени раздели</string>
+    <!-- Text shown in the menu to view account settings -->
+    <string name="tab_tray_menu_account_settings">Настройки на сметката</string>
     <!-- Text shown in the menu to view tab settings -->
     <string name="tab_tray_menu_tab_settings">Настройки на раздели</string>
     <!-- Text shown in the menu for closing all tabs -->
@@ -722,6 +774,12 @@
     <string name="download_delete_all">Изтриване на изтеглени файлове</string>
     <!-- Text for the dialog to confirm clearing all downloads -->
     <string name="download_delete_all_dialog">Сигурни ли сте, че желаете да изтриете изтеглените файлове?</string>
+    <!-- Text for the snackbar to confirm that multiple downloads items have been removed -->
+    <string name="download_delete_multiple_items_snackbar_1">Изтеглените файлове са премахнати</string>
+    <!-- Text for the snackbar to confirm that a single download item has been removed. The first parameter is the name of the download item. -->
+    <string name="download_delete_single_item_snackbar">Файлът „%1$s“ е премахнат</string>
+    <!-- Text shown when no download exists -->
+    <string name="download_empty_message_1">Няма изтеглени файлове</string>
     <!-- History multi select title in app bar
     The first parameter is the number of downloads selected -->
     <string name="download_multi_select_title">%1$d избрани</string>
@@ -731,6 +789,10 @@
     <string name="download_menu_open">Отваряне</string>
 
 
+    <!-- Text for the button to remove a single download item -->
+    <string name="download_delete_item_1">Премахване</string>
+
+
     <!-- Crashes -->
     <!-- Title text displayed on the tab crash page. This first parameter is the name of the application (For example: Fenix) -->
     <string name="tab_crash_title_2">Извинете. %1$s не можа да зареди страницата.</string>
@@ -764,14 +826,12 @@
     <string name="bookmark_delete_folder_snackbar">Изтрита %1$s</string>
     <!-- Screen title for adding a bookmarks folder -->
     <string name="bookmark_add_folder">Добавяне на папка</string>
-    <!-- deprecated: Snackbar title shown after a bookmark has been created. -->
-    <string name="bookmark_created_snackbar">Отметката е създадена.</string>
     <!-- Snackbar title shown after a bookmark has been created. -->
     <string name="bookmark_saved_snackbar">Отметката е запазена!</string>
     <!-- Snackbar edit button shown after a bookmark has been created. -->
-    <string name="edit_bookmark_snackbar_action">ПРОМЕНЯНЕ</string>
+    <string name="edit_bookmark_snackbar_action">РЕДАКТИРАНЕ</string>
     <!-- Bookmark overflow menu edit button -->
-    <string name="bookmark_menu_edit_button">Променяне</string>
+    <string name="bookmark_menu_edit_button">Редактиране</string>
     <!-- Bookmark overflow menu select button -->
     <string name="bookmark_menu_select_button">Избиране</string>
     <!-- Bookmark overflow menu copy button -->
@@ -852,9 +912,11 @@
     <!-- Preference for altering the location access for all websites -->
     <string name="preference_phone_feature_location">Местоположение</string>
     <!-- Preference for altering the notification access for all websites -->
-    <string name="preference_phone_feature_notification">Известие</string>
+    <string name="preference_phone_feature_notification">Известия</string>
     <!-- Preference for altering the persistent storage access for all websites -->
     <string name="preference_phone_feature_persistent_storage">Постоянно хранилище</string>
+    <!-- Preference for altering the EME access for all websites -->
+    <string name="preference_phone_feature_media_key_system_access">Съдържание под DRM</string>
     <!-- Label that indicates that a permission must be asked always -->
     <string name="preference_option_phone_feature_ask_to_allow">Винаги да пита</string>
     <!-- Label that indicates that a permission must be blocked -->
@@ -873,6 +935,20 @@
     <!-- Label for global setting that indicates that all video and audio autoplay is allowed -->
     <string name="preference_option_autoplay_allowed2">Разрешаване на звук и видео</string>
 
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Разрешаване на звук и видео</string>
+    <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
+    <string name="preference_option_autoplay_allowed_wifi_only2">Без звук и видео през мобилни данни</string>
+    <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
+    <string name="preference_option_autoplay_allowed_wifi_subtext">Звук и видео ще бъдат възпроизвеждани само по Wi-Fi</string>
+    <!-- Label for global setting that indicates that video autoplay is allowed, but audio autoplay is blocked -->
+    <string name="preference_option_autoplay_block_audio2">Само без звук</string>
+    <!-- Label for site specific setting that indicates that video autoplay is allowed, but audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_block_audio">Само без звук</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
+    <string name="preference_option_autoplay_blocked3">Без звук и видео</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Без звук и видео</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">Включено</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
@@ -887,6 +963,10 @@
     <string name="no_collections_description2">Съберете важните за вас неща.\nГрупирайте търсения, страници и раздели за бърз достъп по-късно.</string>
     <!-- Title for the "select tabs" step of the collection creator -->
     <string name="create_collection_select_tabs">Избиране на раздели</string>
+    <!-- Title for the "select collection" step of the collection creator -->
+    <string name="create_collection_select_collection">Избор на списък</string>
+    <!-- Title for the "name collection" step of the collection creator -->
+    <string name="create_collection_name_collection">Наименуване на списък</string>
     <!-- Button to add new collection for the "select collection" step of the collection creator -->
     <string name="create_collection_add_new_collection">Създаване на списък</string>
     <!-- Button to select all tabs in the "select tabs" step of the collection creator -->
@@ -929,10 +1009,14 @@
 
     <!-- Sub-header in the dialog to share a link to another app -->
     <string name="share_link_subheader">Споделяне на препратка</string>
+    <!-- Sub-header in the dialog to share a link to another sync device -->
+    <string name="share_device_subheader">Изпращане към устройство</string>
     <!-- Sub-header in the dialog to share a link to an app from the full list -->
     <string name="share_link_all_apps_subheader">Всички действия</string>
     <!-- Sub-header in the dialog to share a link to an app from the most-recent sorted list -->
     <string name="share_link_recent_apps_subheader">Последно използвани</string>
+    <!-- An option from the three dot menu to into sync -->
+    <string name="sync_menu_sign_in">Вписване в Sync</string>
     <!-- An option from the share dialog to sign into sync -->
     <string name="sync_sign_in">Вписване в Sync</string>
     <!-- An option from the share dialog to send link to all other sync devices -->
@@ -972,6 +1056,10 @@
     <string name="notification_pbm_action_delete_and_open">Изчистване и отваряне</string>
     <!-- Name of the "Powered by Fenix" notification channel. Displayed in the "App notifications" system settings for the app -->
     <string name="notification_powered_by_channel_name">С подкрепата на</string>
+    <!-- Text shown in snackbar when user deletes a collection -->
+    <string name="snackbar_collection_deleted">Списъкът е изтрит</string>
+    <!-- Text shown in snackbar when user renames a collection -->
+    <string name="snackbar_collection_renamed">Списъкът е преименуван</string>
     <!-- Text shown in snackbar when user deletes a tab -->
     <string name="snackbar_tab_deleted">Разделът е изтрит</string>
     <!-- Text shown in snackbar when user deletes all tabs -->
@@ -982,8 +1070,12 @@
     <string name="snackbar_tabs_closed">Разделите са затворени</string>
     <!-- Text shown in snackbar when user closes tabs -->
     <string name="snackbar_message_tabs_closed">Разделите са затворени!</string>
+    <!-- Text shown in snackbar when user bookmarks a list of tabs -->
+    <string name="snackbar_message_bookmarks_saved">Отметките са запазени!</string>
     <!-- Text shown in snackbar action for viewing bookmarks -->
     <string name="snackbar_message_bookmarks_view">Преглед</string>
+    <!-- Text shown in snackbar when user adds a site to top sites -->
+    <string name="snackbar_added_to_top_sites">Добавено към най-посещаваните страници!</string>
     <!-- Text shown in snackbar when user closes a private tab -->
     <string name="snackbar_private_tab_closed">Поверителният раздел е затворен</string>
     <!-- Text shown in snackbar when user closes all private tabs -->
@@ -992,6 +1084,8 @@
     <string name="snackbar_private_tabs_deleted">Поверителните раздели са затворени</string>
     <!-- Text shown in snackbar to undo deleting a tab, top site or collection -->
     <string name="snackbar_deleted_undo">ОТМЕНЯНЕ</string>
+    <!-- Text shown in snackbar when user removes a top site -->
+    <string name="snackbar_top_site_removed">Страницата е премахната</string>
     <!-- Text for action to undo deleting a tab or collection shown in a11y dialog -->
     <string name="a11y_dialog_deleted_undo">Отменяне</string>
     <!-- Text for action to confirm deleting a tab or collection shown in a11y dialog -->
@@ -1000,8 +1094,14 @@
         First parameter is the name of the app, second parameter is the URL or text scanned-->
     <string name="qr_scanner_confirmation_dialog_message">Разрешете %1$s да отвори %2$s</string>
 
+    <!-- QR code scanner prompt dialog positive option to allow navigation to scanned link -->
+    <string name="qr_scanner_dialog_positive">РАЗРЕШАВАНЕ</string>
+    <!-- QR code scanner prompt dialog positive option to deny navigation to scanned link -->
+    <string name="qr_scanner_dialog_negative">ЗАБРАНЯВАНЕ</string>
     <!-- Tab collection deletion prompt dialog message. Placeholder will be replaced with the collection name -->
     <string name="tab_collection_dialog_message">Наистина ли искате да изтриете %1$s?</string>
+    <!-- Collection and tab deletion prompt dialog message. This will show when the last tab from a collection is deleted -->
+    <string name="delete_tab_and_collection_dialog_message">При изтриване на раздела ще бъде изтрит целия списък. Винаги може да създадете нов списък.</string>
     <!-- Collection and tab deletion prompt dialog title. Placeholder will be replaced with the collection name. This will show when the last tab from a collection is deleted -->
     <string name="delete_tab_and_collection_dialog_title">Изтриване на %1$s?</string>
     <!-- Tab collection deletion prompt dialog option to delete the collection -->
@@ -1014,11 +1114,18 @@
     <!-- Message for copying the URL via long press on the toolbar -->
     <string name="url_copied">Адресът е копиран</string>
 
+    <!-- Sample text for accessibility font size -->
+    <string name="accessibility_text_size_sample_text_1">Това е примерен текст. Той е тук, за да покаже как ще изглежда текста при намаляване и увеличаване на размера чрез тази настройка.</string>
     <!-- Summary for Accessibility Text Size Scaling Preference -->
     <string name="preference_accessibility_text_size_summary">Направи текста в уебсайтовете по-голям или по-малък</string>
     <!-- Title for Accessibility Text Size Scaling Preference -->
     <string name="preference_accessibility_font_size_title">Размер на шрифт</string>
 
+    <!-- Title for Accessibility Text Automatic Size Scaling Preference -->
+    <string name="preference_accessibility_auto_size_2">Автоматичен размер на шрифта</string>
+    <!-- Summary for Accessibility Text Automatic Size Scaling Preference -->
+    <string name="preference_accessibility_auto_size_summary">Размерът на шрифта ще отговаря на настройките на Android. Изключете, за да управлявате размера на шрифта оттук.</string>
+
     <!-- Title for the Delete browsing data preference -->
     <string name="preferences_delete_browsing_data">Изтриване на данни от разглеждане</string>
     <!-- Title for the tabs item in Delete browsing data -->
@@ -1070,19 +1177,44 @@
     <!-- Text for the snackbar confirmation that the data was deleted -->
     <string name="preferences_delete_browsing_data_snackbar">Историята е изчистена</string>
 
+    <!-- Text for the snackbar to show the user that the deletion of browsing data is in progress -->
+    <string name="deleting_browsing_data_in_progress">Изтриване на данни от разглеждане…</string>
+
+    <!-- Tips -->
+    <!-- text for firefox preview moving tip header "Firefox Preview" and "Firefox Nightly" are intentionally hardcoded -->
+    <string name="tip_firefox_preview_moved_header">Firefox Preview вече е Firefox Nightly</string>
+    <!-- text for firefox preview moving tip description -->
+    <string name="tip_firefox_preview_moved_description">
+        Firefox Nightly се обновява всяка нощ и предлага нови, експериментални възможности.
+        Поради това, той може да е по-нестабилен. Изтеглете Firefox beta browser, ако предпочитате по-стабилно потребителско усещане.</string>
+    <!-- text for firefox preview moving tip button. "Firefox for Android Beta" is intentionally hardcoded -->
+    <string name="tip_firefox_preview_moved_button_2">Вземете Firefox за Android Beta</string>
+
+    <!-- text for firefox preview moving tip header. "Firefox Nightly" is intentionally hardcoded -->
+    <string name="tip_firefox_preview_moved_header_preview_installed">Firefox Nightly е преместен</string>
+    <!-- text for firefox preview moving tip description -->
+    <string name="tip_firefox_preview_moved_description_preview_installed">
+        Това приложение повече няма да получава обновявания по сигурността. Спрете да го използвате и преминете към новия Nightly.
+        \n\nЗа да прехвърлите вашите отметки, данни за вход и история към друго приложение създайте Firefox Account.</string>
     <!-- text for firefox preview moving tip button  -->
     <string name="tip_firefox_preview_moved_button_preview_installed">Преминете към новият Nightly</string>
 
     <!-- text for firefox preview moving tip header. "Firefox Nightly" is intentionally hardcoded -->
     <string name="tip_firefox_preview_moved_header_preview_not_installed">Firefox Nightly е преместен</string>
 
+    <!-- text for firefox preview moving tip description -->
+    <string name="tip_firefox_preview_moved_description_preview_not_installed">
+        Това приложение повече няма да получава обновявания по сигурността. Изтеглете новия Nightly и спрете да го използвате.
+        \n\nЗа да прехвърлите вашите отметки, данни за вход и история към друго приложение създайте Firefox Account.</string>
+    <!-- text for firefox preview moving tip button  -->
+    <string name="tip_firefox_preview_moved_button_preview_not_installed">Вземете новия Nightly</string>
+
     <!-- Onboarding -->
     <!-- Text for onboarding welcome message
     The first parameter is the name of the app (e.g. Firefox Preview) -->
     <string name="onboarding_header">Здравейте от %s!</string>
-    <!-- text for the Firefox Preview feature section header
-    The first parameter is the name of the app (e.g. Firefox Preview) -->
-    <string name="onboarding_feature_section_header">Запознайте се с %s</string>
+    <!-- text for the Firefox Accounts section header -->
+    <string name="onboarding_fxa_section_header">Вече имате профил?</string>
     <!-- text for the "What's New" onboarding card header -->
     <string name="onboarding_whats_new_header1">Вижте какво е новото</string>
     <!-- text for the "what's new" onboarding card description
@@ -1090,35 +1222,44 @@
     <string name="onboarding_whats_new_description">Имате въпроси относно новия дизайн на %s? Искате ли да разберете какви са промените?</string>
     <!-- text for underlined clickable link that is part of "what's new" onboarding card description that links to an FAQ -->
     <string name="onboarding_whats_new_description_linktext">Получете отговори тук</string>
-    <!-- text for the Firefox account onboarding sign in card header -->
-    <string name="onboarding_account_sign_in_header">Синхронизирайте отметки, пароли и други чрез вашата сметка във Firefox.</string>
+    <!-- text for the Firefox account onboarding sign in card header. The word "Firefox" should not be translated -->
+    <string name="onboarding_account_sign_in_header_1">Синхронизирайте Firefox между устройства</string>
     <!-- Text for the button to learn more about signing in to your Firefox account -->
-    <string name="onboarding_manual_sign_in_learn_more">Научете повече</string>
+    <string name="onboarding_manual_sign_in_description">Пренесете отметки, история и пароли във Firefox на това устройство.</string>
+    <!-- text for the firefox account onboarding card header when we detect you're already signed in to
+        another Firefox browser. (The word `Firefox` should not be translated)
+        The first parameter is the email of the detected user's account -->
+    <string name="onboarding_firefox_account_auto_signin_header_3">Вписани сте като %s в друг Firefox на това устройство. Желаете ли за бъдете вписани с този профил?</string>
+    <!-- text for the button to confirm automatic sign-in -->
+    <string name="onboarding_firefox_account_auto_signin_confirm">Да, вписване</string>
     <!-- text for the automatic sign-in button while signing in is in process -->
     <string name="onboarding_firefox_account_signing_in">Вписване…</string>
-    <!-- text for the button to manually sign into Firefox account. The word "Firefox" should not be translated -->
-    <string name="onboarding_firefox_account_sign_in">Вписване във Firefox</string>
+    <!-- text for the button to manually sign into Firefox account. -->
+    <string name="onboarding_firefox_account_sign_in_1">Регистриране</string>
+    <!-- text for the button to stay signed out when presented with an option to automatically sign-in. -->
+    <string name="onboarding_firefox_account_stay_signed_out">Без вписване</string>
+    <!-- text to display in the snackbar once account is signed-in -->
+    <string name="onboarding_firefox_account_sync_is_on">Синхронизирането е включено</string>
+    <!-- text to display in the snackbar if automatic sign-in fails. user may try again -->
+    <string name="onboarding_firefox_account_automatic_signin_failed">Грешка при влизане</string>
     <!-- text for the tracking protection onboarding card header -->
-    <string name="onboarding_tracking_protection_header_2">Автоматична поверителност</string>
-    <!-- text for the tracking protection card description
-    The first parameter is the name of the app (e.g. Firefox Preview) -->
-    <string name="onboarding_tracking_protection_description_2">Настройките за поверителност и сигурност спират проследяващ и злонамерен код, както и компании, които ви преследват.</string>
+    <string name="onboarding_tracking_protection_header_3">Постоянна поверителност</string>
+    <!-- text for the tracking protection card description. 'Firefox' intentionally hardcoded here -->
+    <string name="onboarding_tracking_protection_description_3">Firefox автоматично предотвратява тайното проследяване от различни компании докато разглеждате в мрежата.</string>
     <!-- text for tracking protection radio button option for standard level of blocking -->
     <string name="onboarding_tracking_protection_standard_button_2">Стандартна (подразбиране)</string>
     <!-- text for standard blocking option button description -->
-    <string name="onboarding_tracking_protection_standard_button_description_2">Спира малко проследявания. Страниците зареждат нормално.</string>
+    <string name="onboarding_tracking_protection_standard_button_description_3">Баланс между поверителност и бързодействие. Страниците се зареждат нормално.</string>
     <!-- text for tracking protection radio button option for strict level of blocking -->
     <string name="onboarding_tracking_protection_strict_button">Строга (препоръчителна)</string>
     <!-- text for tracking protection radio button option for strict level of blocking -->
     <string name="onboarding_tracking_protection_strict_option">Строга</string>
     <!-- text for strict blocking option button description -->
-    <string name="onboarding_tracking_protection_strict_button_description_2">Спира повече проследявания, реклами и изскачащи прозорци. Страниците зареждат по-бързо, но може да не работят.</string>
-    <!-- text for the toolbar position card header
-        In English this is an idiom for "choose a side as in an argument or fight"
-        but it is ok to make this more literally about "choosing a position in a physical space -->
-    <string name="onboarding_toolbar_position_header">Изберете страна</string>
+    <string name="onboarding_tracking_protection_strict_button_description_3">Спира повече проследявания, така че страниците зарежда по-бързо, но някои функции на страницата може да не работят.</string>
+    <!-- text for the toolbar position card header  -->
+    <string name="onboarding_toolbar_placement_header_1">Изберете място на лентата с инструменти</string>
     <!-- text for the toolbar position card description -->
-    <string name="onboarding_toolbar_position_description">Изпробвайте работа с една ръка, с лента инструменти отдолу, или я преместете отгоре.</string>
+    <string name="onboarding_toolbar_placement_description_1">Сложете лентата с инструменти на удобно място. Поставете я долу или я качете горе.</string>
     <!-- text for the private browsing onboarding card header -->
     <string name="onboarding_private_browsing_header">Разглеждайте поверително</string>
     <!-- text for the private browsing onboarding card description
@@ -1130,6 +1271,9 @@
     <string name="onboarding_private_browsing_button">Отваряне на настройки</string>
     <!-- text for the privacy notice onboarding card header -->
     <string name="onboarding_privacy_notice_header">Поверителност</string>
+    <!-- text for the privacy notice onboarding card description
+    The first parameter is the name of the app (e.g. Firefox Preview) Substitute %s for long browser name. -->
+    <string name="onboarding_privacy_notice_description2">Ние създадохме %s така, че да имате контрол над това, което споделяте онлайн и с нас.</string>
     <!-- Text for the button to read the privacy notice -->
     <string name="onboarding_privacy_notice_read_button">Бележка за поверителността</string>
     <!-- Content description (not visible, for screen readers etc.): Close onboarding screen -->
@@ -1143,7 +1287,7 @@
     <string name="onboarding_theme_picker_header">Изберете тема</string>
 
     <!-- text for the theme picker onboarding card description -->
-    <string name="onboarding_theme_picker_description1">Запазете батерия и зрението си с избиране на тъмна тема.</string>
+    <string name="onboarding_theme_picker_description_2">Запазете батерия и зрението си с тъмна тема.</string>
     <!-- Automatic theme setting (will follow device setting) -->
     <string name="onboarding_theme_automatic_title">Автоматичнa</string>
     <!-- Summary of automatic theme setting (will follow device setting) -->
@@ -1157,16 +1301,35 @@
     <string name="sync_sent_tabs_snackbar">Разделите са изпратени!</string>
     <!-- Text shown in snackbar when one tab has been sent to device  -->
     <string name="sync_sent_tab_snackbar">Разделът е изпратен!</string>
+    <!-- Text shown in snackbar when sharing tabs failed  -->
+    <string name="sync_sent_tab_error_snackbar">Грешка при изпращане</string>
     <!-- Text shown in snackbar for the "retry" action that the user has after sharing tabs failed -->
     <string name="sync_sent_tab_error_snackbar_action">НОВ ОПИТ</string>
     <!-- Title of QR Pairing Fragment -->
     <string name="sync_scan_code">Сканиране на код</string>
 
+    <!-- Instructions on how to access pairing -->
+    <string name="sign_in_instructions"><![CDATA[Отворете Firefox на вашият компютър и посетете <b>https://firefox.com/pair</b>]]></string>
+    <!-- Text shown for sign in pairing when ready -->
+    <string name="sign_in_ready_for_scan">В готовност за сканиране</string>
+    <!-- Text shown for settings option for sign with pairing -->
+    <string name="sign_in_with_camera">Вписване чрез камерата</string>
+    <!-- Text shown for settings option for sign with email -->
+    <string name="sign_in_with_email">Или чрез електронна поща</string>
+    <!-- Text shown for settings option for create new account text.'Firefox' intentionally hardcoded here.-->
+    <string name="sign_in_create_account_text"><![CDATA[Нямате акаунт? <u>Създайте такъв,</u> за да синхронизирате Firefox между различни устройства.]]></string>
+    <!-- Text shown in confirmation dialog to sign out of account -->
+    <string name="sign_out_confirmation_message">Firefox ще спре да се синхронизира с вашия профил, но няма да изтрива данни от разглеждане от устройството.</string>
+    <!-- Text shown in confirmation dialog to sign out of account. The first parameter is the name of the app (e.g. Firefox Preview) -->
+    <string name="sign_out_confirmation_message_2">%s ще спре да се синхронизира с вашия профил, но няма да изтрива данни от разглеждане от устройството.</string>
     <!-- Option to continue signing out of account shown in confirmation dialog to sign out of account -->
     <string name="sign_out_disconnect">Изключване</string>
     <!-- Option to cancel signing out shown in confirmation dialog to sign out of account -->
     <string name="sign_out_cancel">Отказ</string>
 
+    <!-- Error message snackbar shown after the user tried to select a default folder which cannot be altered -->
+    <string name="bookmark_cannot_edit_root">Подразбираните папки не могат да бъдат променяни</string>
+
     <!-- Enhanced Tracking Protection -->
     <!-- Link displayed in enhanced tracking protection panel to access tracking protection settings -->
     <string name="etp_settings">Настройки на защитата</string>
@@ -1184,15 +1347,21 @@
     <!-- Preference for enhanced tracking protection for the standard protection settings -->
     <string name="preference_enhanced_tracking_protection_standard_default_1">Стандартна (подразбиране)</string>
     <!-- Preference description for enhanced tracking protection for the standard protection settings -->
-    <string name="preference_enhanced_tracking_protection_standard_description_3">Спира малко проследявания. Страниците зареждат нормално.</string>
+    <string name="preference_enhanced_tracking_protection_standard_description_4">Баланс между поверителност и бързодействие. Страниците се зареждат нормално.</string>
+    <!--  Accessibility text for the Standard protection information icon  -->
+    <string name="preference_enhanced_tracking_protection_standard_info_button">Какво е спряно от стандартната защита от проследяване</string>
     <!-- Preference for enhanced tracking protection for the strict protection settings -->
     <string name="preference_enhanced_tracking_protection_strict">Строга</string>
     <!-- Preference description for enhanced tracking protection for the strict protection settings -->
-    <string name="preference_enhanced_tracking_protection_strict_description_2">Спира повече проследявания, реклами и изскачащи прозорци. Страниците зареждат по-бързо, но може да не работят.</string>
+    <string name="preference_enhanced_tracking_protection_strict_description_3">Спира повече проследявания, така че страниците зарежда по-бързо, но някои функции на страницата може да не работят.</string>
+    <!--  Accessibility text for the Strict protection information icon  -->
+    <string name="preference_enhanced_tracking_protection_strict_info_button">Какво е спряно от строгата защита от проследяване</string>
     <!-- Preference for enhanced tracking protection for the custom protection settings -->
     <string name="preference_enhanced_tracking_protection_custom">По избор</string>
     <!-- Preference description for enhanced tracking protection for the strict protection settings -->
     <string name="preference_enhanced_tracking_protection_custom_description_2">Изберете какво проследяване и кои скриптове да спрете.</string>
+    <!--  Accessibility text for the Strict protection information icon  -->
+    <string name="preference_enhanced_tracking_protection_custom_info_button">Какво е спряно от потребителската защита от проследяване</string>
     <!-- Header for categories that are being blocked by current Enhanced Tracking Protection settings -->
     <!-- Preference for enhanced tracking protection for the custom protection settings for cookies-->
     <string name="preference_enhanced_tracking_protection_custom_cookies">Бисквитки</string>
@@ -1210,10 +1379,13 @@
     <string name="preference_enhanced_tracking_protection_custom_tracking_content_1">Във всички раздели</string>
     <!-- Option for enhanced tracking protection for the custom protection settings for tracking content-->
     <string name="preference_enhanced_tracking_protection_custom_tracking_content_2">Само в поверителни раздели</string>
+    <!-- Option for enhanced tracking protection for the custom protection settings for tracking content-->
+    <string name="preference_enhanced_tracking_protection_custom_tracking_content_3">Само в определени раздели</string>
     <!-- Preference for enhanced tracking protection for the custom protection settings -->
     <string name="preference_enhanced_tracking_protection_custom_cryptominers">Добиване на криптовалути</string>
     <!-- Preference for enhanced tracking protection for the custom protection settings -->
     <string name="preference_enhanced_tracking_protection_custom_fingerprinters">Снемане на цифров отпечатък</string>
+    <string name="enhanced_tracking_protection_blocked">Забраняване</string>
     <!-- Header for categories that are being not being blocked by current Enhanced Tracking Protection settings -->
     <string name="enhanced_tracking_protection_allowed">Разрешено</string>
     <!-- Category of trackers (social media trackers) that can be blocked by Enhanced Tracking Protection -->
@@ -1261,6 +1433,9 @@
     <!-- Category of trackers (redirect trackers) that can be blocked by Enhanced Tracking Protection -->
     <string name="etp_redirect_trackers_title">Пренасочващи проследявания</string>
 
+    <!-- Description of redirect tracker cookies that can be blocked by Enhanced Tracking Protection -->
+    <string name="etp_redirect_trackers_description">Изчиства бисквитки за пренасочване към известни проследяващи страници.</string>
+
     <!-- About page link text to open support link -->
     <string name="about_support">Поддръжка</string>
     <!-- About page link text to list of past crashes (like about:crashes on desktop) -->
@@ -1304,6 +1479,9 @@
     <!-- Placeholder text for the TextView in the Add to Homescreen dialog -->
     <string name="add_to_homescreen_text_placeholder">Име на пряк път</string>
 
+    <!-- Describes the add to homescreen functionality -->
+    <string name="add_to_homescreen_description_2">Можете лесно да добавите тази страница към началния екран, за да имате бърз достъп до нея, подобно на приложение.</string>
+
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Регистрации и пароли</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
@@ -1316,10 +1494,8 @@
     <string name="preferences_passwords_autofill">Автоматично попълване</string>
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Синхронизиране на регистрации</string>
-    <!-- Syncing saved logins in Fenix is on -->
-    <string name="preferences_passwords_sync_logins_on">Включено</string>
-    <!-- Syncing saved logins in Fenix is off -->
-    <string name="preferences_passwords_sync_logins_off">Изключено</string>
+    <!-- Preference for syncing saved logins in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices">Синхронизиране на регистрации между устройства</string>
     <!-- Syncing saved logins in Fenix needs reconnect to sync -->
     <string name="preferences_passwords_sync_logins_reconnect">Повторно свързване</string>
     <!-- Syncing saved logins in Fenix needs login -->
@@ -1334,6 +1510,10 @@
     <string name="preferences_passwords_exceptions">Изключения</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description_empty">Тук се показват регистрации и пароли, които не са запазени.</string>
+    <!-- Description of list of login exceptions that we never save logins for -->
+    <string name="preferences_passwords_exceptions_description">Следните страници няма да запазват регистрации и пароли.</string>
+    <!-- Text on button to remove all saved login exceptions -->
+    <string name="preferences_passwords_exceptions_remove_all">Изтриване на всички</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Търсене на регистрация</string>
     <!-- Option to sort logins list A-Z, alphabetically -->
@@ -1355,6 +1535,8 @@
     <!-- Learn more link that will link to a page with more information displayed when a connection is insecure and we detect the user is entering a password -->
     <string name="logins_insecure_connection_warning_learn_more">Научете повече</string>
 
+    <!-- Prompt message displayed when Fenix detects a user has entered a password and user decides if Fenix should save it. The first parameter is the name of the application (For example: Fenix)  -->
+    <string name="logins_doorhanger_save">Желаете ли данните за вход да бъдат запазени от %s?</string>
     <!-- Positive confirmation that Fenix should save the new or updated login -->
     <string name="logins_doorhanger_save_confirmation">Запазване</string>
     <!-- Negative confirmation that Fenix should not save the new or updated login -->
@@ -1363,10 +1545,18 @@
     <string name="logins_password_copied">Паролата е копирана в системния буфер</string>
     <!-- Shown in snackbar to tell user that the username has been copied -->
     <string name="logins_username_copied">Потребителското име е копирано в системния буфер</string>
+    <!-- Shown in snackbar to tell user that the site has been copied -->
+    <string name="logins_site_copied">Препратката е копирана</string>
     <!-- Content Description (for screenreaders etc) read for the button to copy a password in logins-->
     <string name="saved_logins_copy_password">Копиране на парола</string>
+    <!-- Content Description (for screenreaders etc) read for the button to clear a password while editing a login-->
+    <string name="saved_logins_clear_password">Изчистване на паролата</string>
     <!-- Content Description (for screenreaders etc) read for the button to copy a username in logins -->
     <string name="saved_login_copy_username">Копиране на потребителско име</string>
+    <!-- Content Description (for screenreaders etc) read for the button to clear a username while editing a login -->
+    <string name="saved_login_clear_username">Изчистване на потребителското име</string>
+    <!-- Content Description (for screenreaders etc) read for the button to copy a site in logins -->
+    <string name="saved_login_copy_site">Копиране на сайта</string>
     <!-- Content Description (for screenreaders etc) read for the button to open a site in logins -->
     <string name="saved_login_open_site">Отваряне препратката в четеца</string>
     <!-- Content Description (for screenreaders etc) read for the button to reveal a password in logins -->
@@ -1377,9 +1567,88 @@
     <string name="logins_biometric_prompt_message">Отключете, за да видите запазените регистрации</string>
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">Защитете вашите данни за вход</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message">Настройте фигура, PIN или парола за отключване на устройството, за да защитите запазените регистрации и пароли, в случай че някой друг има достъп до него.</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_later">По-късно</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_set_up_now">Настройване</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their logins -->
+    <string name="logins_biometric_prompt_message_pin">Отключете устройството си</string>
+    <!-- Title for Accessibility Force Enable Zoom Preference -->
+    <string name="preference_accessibility_force_enable_zoom">Мащабиране във всички страници</string>
+    <!-- Summary for Accessibility Force Enable Zoom Preference -->
+    <string name="preference_accessibility_force_enable_zoom_summary">Разрешава щипване за мащабиране, дори на страници, които не разрешават този жест.</string>
+    <!-- Saved logins sorting strategy menu item -by name- (if selected, it will sort saved logins alphabetically) -->
+    <string name="saved_logins_sort_strategy_alphabetically">Име (А-Я)</string>
+    <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
+    <string name="saved_logins_sort_strategy_last_used">Последно използване</string>
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Меню за сортиране на регистрации</string>
 
+    <!-- Credit Cards Autofill -->
+    <!-- Preference and title for managing the settings for credit cards -->
+    <string name="preferences_credit_cards">Банкови карти</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards">Запазване и автоматично попълване на карти</string>
+    <!-- Preference summary for saving and autofilling credit card data -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Данните са криптирани</string>
+    <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
+    <string name="preferences_credit_cards_sync_cards_across_devices">Синхронизиране на карти между устройства</string>
+    <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
+    <string name="preferences_credit_cards_sync_cards">Синхронизиране на карти</string>
+    <!-- Preference option for adding a credit card -->
+    <string name="preferences_credit_cards_add_credit_card">Добавяне на карта</string>
+    <!-- Preference option for managing saved credit cards -->
+    <string name="preferences_credit_cards_manage_saved_cards">Управление на карти</string>
+    <!-- Title of the "Add card" screen -->
+    <string name="credit_cards_add_card">Добавяне на карта</string>
+    <!-- Title of the "Edit card" screen -->
+    <string name="credit_cards_edit_card">Редактиране на карта</string>
+    <!-- The header for the card number of a credit card -->
+    <string name="credit_cards_card_number">Номер на карта</string>
+    <!-- The header for the expiration date of a credit card -->
+    <string name="credit_cards_expiration_date">Дата на валидност</string>
+    <!-- The label for the expiration date month of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_month">Месец на валидност</string>
+    <!-- The label for the expiration date year of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_year">Година на валидност</string>
+    <!-- The header for the name on the credit card -->
+    <string name="credit_cards_name_on_card">Име от картата</string>
+    <!-- The header for the nickname for a credit card -->
+    <string name="credit_cards_card_nickname">Псевдоним на картата</string>
+    <!-- The text for the "Delete card" menu item for deleting a credit card -->
+    <string name="credit_cards_menu_delete_card">Изтриване на картата</string>
+    <!-- The text for the "Delete card" button for deleting a credit card -->
+    <string name="credit_cards_delete_card_button">Изтриване на картата</string>
+    <!-- The title for the "Save" menu item for saving a credit card -->
+    <string name="credit_cards_menu_save">Запазване</string>
+    <!-- The text for the "Save" button for saving a credit card -->
+    <string name="credit_cards_save_button">Запазване</string>
+    <!-- The text for the "Cancel" button for cancelling adding or updating a credit card -->
+    <string name="credit_cards_cancel_button">Отказ</string>
+    <!-- Title of the "Saved cards" screen -->
+    <string name="credit_cards_saved_cards">Запазени карти</string>
+    <!-- Error message for credit card number validation -->
+    <string name="credit_cards_number_validation_error_message">Моля, въведете валиден номер на банкова карта</string>
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Попълнете полето</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Отключете, за да видите запазените карти</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Защитете банковите си карти</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Настройте фигура, PIN или парола за отключване на устройството, за да защитите запазените банкови карти, в случай че някой друг има достъп до него.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Настройване</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">По-късно</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Отключете устройството си</string>
+
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Отключете, за да използвате запазената банкова карта</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Добавяне на търсеща машина</string>
     <!-- Title of the Edit search engine screen -->
@@ -1414,6 +1683,8 @@
     <!-- Text shown when a user tries to add a search engine that already exists -->
     <string name="search_add_custom_engine_error_existing_name">Търсеща машина с име „%s“ вече съществува.</string>
 
+    <!-- Text shown when a user leaves the search string field empty -->
+    <string name="search_add_custom_engine_error_empty_search_string">Въведете низ за търсене</string>
     <!-- Text shown when a user leaves out the required template string -->
     <string name="search_add_custom_engine_error_missing_template">Уверете се, че низът за търсене съвпада с примера</string>
     <!-- Text shown when we aren't able to validate the custom search query. The first parameter is the url of the custom search engine -->
@@ -1428,6 +1699,8 @@
     <!-- Title text shown for the migration screen to the new browser. Placeholder replaced with app name -->
     <string name="migration_title">Добре дошли в един чисто нов %s</string>
 
+    <!-- Description text followed by a list of things migrating (e.g. Bookmarks, History). Placeholder replaced with app name-->
+    <string name="migration_description">Очаква се напълно преработен четец с подобрена производителност и възможности, които да ви помогнат да направите повече онлайн.\n\nИзчакайте, докато добавяме към %s вашите</string>
     <!-- Text on the disabled button while in progress. Placeholder replaced with app name -->
     <string name="migration_updating_app_button_text">Обновяване на %s…</string>
     <!-- Text on the enabled button. Placeholder replaced with app name-->
@@ -1437,10 +1710,57 @@
     <!--Text on list of migrated items (e.g. Settings, History, etc.)-->
     <string name="migration_text_passwords">Пароли</string>
 
+    <!-- Heading for the instructions to allow a permission -->
+    <string name="phone_feature_blocked_intro">За да разрешите:</string>
+    <!-- First step for the allowing a permission -->
+    <string name="phone_feature_blocked_step_settings">1. Отворете Настройки на Android</string>
+    <!-- Second step for the allowing a permission -->
+    <string name="phone_feature_blocked_step_permissions"><![CDATA[2. Докоснете <b>Разрешения</b>]]></string>
+
+    <!-- Third step for the allowing a permission (Fore example: Camera) -->
+    <string name="phone_feature_blocked_step_feature"><![CDATA[3. Превключете <b>%1$s</b> в положение ВКЛЮЧЕНО]]></string>
+
+    <!-- Label that indicates a site is using a secure connection -->
+    <string name="quick_settings_sheet_secure_connection">Шифрована връзка</string>
+    <!-- Label that indicates a site is using a insecure connection -->
+    <string name="quick_settings_sheet_insecure_connection">Незащитена връзка</string>
+    <!-- Confirmation message for a dialog confirming if the user wants to delete all the permissions for all sites-->
+    <string name="confirm_clear_permissions_on_all_sites">Сигурни ли сте, че искате да премахнете всички права за всички страници?</string>
+    <!-- Confirmation message for a dialog confirming if the user wants to delete all the permissions for a site-->
+    <string name="confirm_clear_permissions_site">Сигурни ли сте, че искате да премахнете всички права за страницата?</string>
+    <!-- Confirmation message for a dialog confirming if the user wants to set default value a permission for a site-->
+    <string name="confirm_clear_permission_site">Сигурни ли сте, че искате да премахнете това право за страницата?</string>
+    <!-- label shown when there are not site exceptions to show in the site exception settings -->
+    <string name="no_site_exceptions">Няма изключения</string>
+    <!-- Label for the Pocket default top site -->
+    <string name="pocket_top_articles">Предпочитани статии</string>
+    <!-- Bookmark deletion confirmation -->
+    <string name="bookmark_deletion_confirmation">Сигурен ли сте, че искате да изтриете отметката?</string>
+    <!-- Browser menu button that adds a top site to the home fragment -->
+    <string name="browser_menu_add_to_top_sites">Добавяне към предпочитаните</string>
+    <!-- text shown before the issuer name to indicate who its verified by, parameter is the name of
+     the certificate authority that verified the ticket-->
+    <string name="certificate_info_verified_by">Проверено от: %1$s</string>
     <!-- Login overflow menu delete button -->
     <string name="login_menu_delete_button">Изтриване</string>
+    <!-- Login overflow menu edit button -->
+    <string name="login_menu_edit_button">Редактиране</string>
+    <!-- Message in delete confirmation dialog for logins -->
+    <string name="login_deletion_confirmation">Сигурни ли сте, че искате да изтриете тези данни за вход?</string>
     <!-- Positive action of a dialog asking to delete  -->
     <string name="dialog_delete_positive">Изтриване</string>
+    <!--  The saved login options menu description. -->
+    <string name="login_options_menu">Настройки за вход</string>
+    <!--  The editable text field for a login's web address. -->
+    <string name="saved_login_hostname_description">Текстовото поле за редактиране на адреса на регистрация.</string>
+    <!--  The editable text field for a login's username. -->
+    <string name="saved_login_username_description">Текстовото поле за редактиране на потребителското име на регистрация.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description">Текстовото поле за редактиране на паролата на регистрация.</string>
+    <!--  The button description to save changes to an edited login. -->
+    <string name="save_changes_to_login">Запазване на промените на регистрацията.</string>
+    <!--  The button description to discard changes to an edited login. -->
+    <string name="discard_changes">Отказ от промените</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Редактиране</string>
     <!--  The error message in edit login view when password field is blank. -->
@@ -1469,28 +1789,38 @@
     <!-- The text displayed when a synced device has no tabs to show in the list of Synced Tabs. -->
     <string name="synced_tabs_no_open_tabs">Няма отворени раздели</string>
 
+    <!-- Top Sites -->
+    <!-- Title text displayed in the dialog when top sites limit is reached. -->
+    <string name="top_sites_max_limit_title">Пределът за добавяне на предпочитани страници е достигнат</string>
+    <!-- Content description text displayed in the dialog when top sites limit is reached. -->
+    <string name="top_sites_max_limit_content_2">За да добавите друга предпочитана страница премахнете някоя. Натиснете и задръжте върху нея, след това я премахнете.</string>
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">Добре, разбрах</string>
 
-    <!-- Title text displayed in the rename top site dialog. -->
+    <!-- Label for the show most visited sites preference -->
+    <string name="top_sites_toggle_top_frecent_sites">Най-посещавани страници</string>
+	<!-- Title text displayed in the rename top site dialog. -->
 	<string name="top_sites_rename_dialog_title">Наименование</string>
+	<!-- Hint for renaming title of a top site -->
+	<string name="top_site_name_hint">Име на предпочитана страница</string>
 	<!-- Button caption to confirm the renaming of the top site. -->
 	<string name="top_sites_rename_dialog_ok">Добре</string>
 	<!-- Dialog button text for canceling the rename top site prompt. -->
 	<string name="top_sites_rename_dialog_cancel">Отказ</string>
 
+    <!-- Default browser experiment -->
+    <string name="default_browser_experiment_card_text">Задайте Firefox като стандартно приложение за отваряне на страници, електронна поща и съобщения.</string>
+
     <!-- Content description for close button in collection placeholder. -->
     <string name="remove_home_collection_placeholder_content_description">Премахване</string>
 
-    <!-- Deprecated: text for the firefox account onboarding card header
-    The first parameter is the name of the app (e.g. Firefox Preview) -->
-    <string name="onboarding_firefox_account_header">Извлечете максимума от %s</string>
-
     <!-- Content description radio buttons with a link to more information -->
     <string name="radio_preference_info_content_description">Натиснете за подробности</string>
 
-    <!-- Deprecated: No Open Tabs Message Header -->
-    <string name="no_collections_header1">Съберете нещата, които са важни за вас</string>
-    <!-- Deprecated: Label to describe what collections are to a new user without any collections -->
-    <string name="no_collections_description1">Групирайте заедно подобни търсения, сайтове и раздели за бърз достъп по-късно.</string>
-    </resources>
+    <!-- Content description for the action bar "up" button -->
+    <string name="action_bar_up_description">Придвижване нагоре</string>
+
+    <!-- Content description for privacy content close button -->
+    <string name="privacy_content_close_button_content_description">Затваряне</string>
+
+</resources>
diff --git a/app/src/main/res/values-br/strings.xml b/app/src/main/res/values-br/strings.xml
index 470b8a8cd..89d2e966c 100644
--- a/app/src/main/res/values-br/strings.xml
+++ b/app/src/main/res/values-br/strings.xml
@@ -91,13 +91,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Argas</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Cheñchit ar mod ma vez diskouezet an ivinelloù digoret. Kit en arventennoù ha diuzit eta gael ha dindan mod-diskouez an ivinelloù.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Mont en arventennoù</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Argas</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Ivinell nevez</string>
@@ -180,6 +173,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Embann</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Skramm degemer</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">Ne cʼhaller ket kennaskañ. Steuñv URL dianav.</string>
@@ -541,8 +538,6 @@
     <string name="library_new_tab">Ivinell nevez</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Kavout er bajenn</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Ivinelloù goubredet</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Roll Lennadurioù</string>
     <!-- Menu Item Label for Search in Library -->
@@ -587,6 +582,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Goude ur mizvezh</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Kregiñ gant ar skramm degemer</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">Goude peder eurvezh</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Atav</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Morse</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Serriñ an dornlevr</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -1562,6 +1566,10 @@
 
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">Deiziad termen</string>
+    <!-- The label for the expiration date month of a credit card -->
+    <string name="credit_cards_expiration_date_month">Deiziad termen Miz</string>
+    <!-- The label for the expiration date year of a credit card -->
+    <string name="credit_cards_expiration_date_year">Deiziad termen Bloaz</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">Anv war ar gartenn</string>
     <!-- The header for the nickname for a credit card -->
@@ -1582,6 +1590,25 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Biziatait un niverenn kartenn gred talvoudek mar plij.</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Mar plij, leugnit ar maez-mañ</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Dibrennit da welet ho kartennoù enrollet</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Diogelit ho kartennoù kred</string>
+
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Arventennit ur patrom prennañ, ur PIN pe ur ger-tremen evit gwareziñ ho kartennoù kred enrollet ma vez ho trevnad gant unan bennak all.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Arventennañ bremañ</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Diwezhatoc’h</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Dibrennit ho trevnad</string>
+
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Dibrennit evit implijout titouroù kartenn gred enrollet</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Ouzhpennañ ul lusker klask</string>
     <!-- Title of the Edit search engine screen -->
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index b298019b5..5fdb858a5 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -6,6 +6,7 @@
     <string name="app_name_private_5">%s privat</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (nav. privada)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">Més opcions</string>
@@ -21,10 +22,6 @@
     <!-- No Private Tabs Message Description -->
     <string name="no_private_tabs_description">Les pestanyes privades es mostraran aquí.</string>
 
-    <!-- Default title for pinned Baidu top site that links to Baidu home page  -->
-    <string name="default_top_site_baidu">Baidu</string>
-    <!-- Default title for pinned JD top site that links to JD home page  -->
-    <string name="default_top_site_jd">JD</string>
     <!-- Message announced to the user when tab tray is selected with 1 tab -->
     <string name="open_tab_tray_single">1 pestanya oberta. Toqueu per canviar de pestanya.</string>
     <!-- Message announced to the user when tab tray is selected with 0 or 2+ tabs -->
@@ -53,6 +50,16 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">S’ha seleccionat</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">Desades recentment</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">Adreces d’interès desades recentment</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">Mostra-ho tot</string>
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">Mostra el botó de totes les adreces d’interès desades</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">El %1$s està creat per @fork-maintainers.</string>
 
@@ -96,13 +103,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Descarta</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Canvieu la disposició de les pestanyes obertes. Aneu als paràmetres i trieu «graella» a la vista de pestanyes.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Vés als paràmetres</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Descarta</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Pestanya nova</string>
@@ -112,6 +112,12 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">Llocs principals</string>
 
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">Torneu a la pestanya</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">Mostra-ho tot</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">Pestanyes obertes</string>
@@ -182,6 +188,15 @@
 
     <!-- Browser menu button to show reader view appearance controls e.g. the used font type and size -->
     <string name="browser_menu_customize_reader_view">Personalitza la vista de lectura</string>
+    <!-- Browser menu label for adding a bookmark -->
+    <string name="browser_menu_add">Afegeix</string>
+    <!-- Browser menu label for editing a bookmark -->
+    <string name="browser_menu_edit">Edita</string>
+
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Pantalla d’inici</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">No s’ha pogut connectar. No es reconeix l’esquema d’URL.</string>
@@ -414,6 +429,11 @@
         and the third is the device model. -->
     <string name="default_device_name_2">%1$s en %2$s %3$s</string>
 
+    <!-- Preference for syncing credit cards -->
+    <string name="preferences_sync_credit_cards">Targetes de crèdit</string>
+    <!-- Preference for syncing addresses -->
+    <string name="preferences_sync_address">Adreces</string>
+
     <!-- Send Tab -->
     <!-- Name of the "receive tabs" notification channel. Displayed in the "App notifications" system settings for the app -->
     <string name="fxa_received_tab_channel_name">Pestanyes rebudes</string>
@@ -444,9 +464,6 @@
     <!-- Text displayed when there are no exceptions, with learn more link that brings users to a tracking protection SUMO page -->
     <string name="exceptions_empty_message_learn_more_link">Més informació</string>
 
-    <!-- Description in Quick Settings that tells user tracking protection is off globally for all sites, and links to Settings to turn it on -->
-    <string name="preferences_tracking_protection_turned_off_globally">Desactivada globalment, aneu als Paràmetres per activar-la.</string>
-
     <!-- Preference switch for Telemetry -->
     <string name="preferences_telemetry">Telemesura</string>
     <!-- Preference switch for usage and technical data collection -->
@@ -457,6 +474,8 @@
     <string name="preferences_marketing_data">Dades de màrqueting</string>
     <!-- Preference description for marketing data collection, parameter is the app name (e.g. Firefox) -->
     <string name="preferences_marketing_data_description">Comparteix dades de funcions que utilitzeu al %1$s amb Leanplum, el nostre proveïdor de màrqueting mòbil.</string>
+    <!-- Preference description for marketing data collection -->
+    <string name="preferences_marketing_data_description2">Comparteix dades bàsiques d’ús amb Adjust, el nostre proveïdor de màrqueting mòbil</string>
     <!-- Title for studies preferences -->
     <string name="preference_experiments_2">Estudis</string>
     <!-- Summary for studies preferences -->
@@ -543,8 +562,6 @@
     <string name="library_new_tab">Pestanya nova</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Cerca a la pàgina</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Pestanyes sincronitzades</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Llista de lectura</string>
     <!-- Menu Item Label for Search in Library -->
@@ -589,6 +606,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Al cap d’un mes</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Comença a la pantalla d’inici</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">Passades quatre hores</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Sempre</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Mai</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Tanca-les manualment</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -605,12 +631,16 @@
     <string name="tabs_header_private_title">Sessió privada</string>
     <!-- Title for the list of tabs in the current private session -->
     <string name="tabs_header_private_tabs_title">Pestanyes privades</string>
+    <!-- Title for the list of tabs in the synced tabs -->
+    <string name="tabs_header_synced_tabs_title">Pestanyes sincronitzades</string>
     <!-- Content description (not visible, for screen readers etc.): Add tab button. Adds a news tab when pressed -->
     <string name="add_tab">Afegeix una pestanya</string>
     <!-- Content description (not visible, for screen readers etc.): Add tab button. Adds a news tab when pressed -->
     <string name="add_private_tab">Afegeix una pestanya privada</string>
     <!-- Text for the new tab button to indicate adding a new private tab in the tab -->
     <string name="tab_drawer_fab_content">Privada</string>
+    <!-- Text for the new tab button to indicate syncing command on the synced tabs page -->
+    <string name="tab_drawer_fab_sync">Sincronitza</string>
     <!-- Text shown as the title of the open tab tray -->
     <string name="tab_tray_title">Pestanyes obertes</string>
     <!-- Text shown in the menu for saving tabs to a collection -->
@@ -621,6 +651,8 @@
     <string name="tab_tray_menu_item_share">Comparteix totes les pestanyes</string>
     <!-- Text shown in the menu to view recently closed tabs -->
     <string name="tab_tray_menu_recently_closed">Pestanyes tancades recentment</string>
+    <!-- Text shown in the menu to view account settings -->
+    <string name="tab_tray_menu_account_settings">Paràmetres del compte</string>
     <!-- Text shown in the menu to view tab settings -->
     <string name="tab_tray_menu_tab_settings">Paràmetres de les pestanyes</string>
     <!-- Text shown in the menu for closing all tabs -->
@@ -791,8 +823,6 @@
     <string name="bookmark_delete_folder_snackbar">S’ha suprimit %1$s</string>
     <!-- Screen title for adding a bookmarks folder -->
     <string name="bookmark_add_folder">Afegeix una carpeta</string>
-    <!-- deprecated: Snackbar title shown after a bookmark has been created. -->
-    <string name="bookmark_created_snackbar">S’ha creat l’adreça d’interès.</string>
     <!-- Snackbar title shown after a bookmark has been created. -->
     <string name="bookmark_saved_snackbar">S’ha desat l’adreça d’interès</string>
     <!-- Snackbar edit button shown after a bookmark has been created. -->
@@ -978,6 +1008,8 @@
     <string name="share_link_all_apps_subheader">Totes les accions</string>
     <!-- Sub-header in the dialog to share a link to an app from the most-recent sorted list -->
     <string name="share_link_recent_apps_subheader">Usades recentment</string>
+    <!-- An option from the three dot menu to into sync -->
+    <string name="sync_menu_sign_in">Inicia la sessió per sincronitzar</string>
     <!-- An option from the share dialog to sign into sync -->
     <string name="sync_sign_in">Inicia la sessió al Sync</string>
     <!-- An option from the share dialog to send link to all other sync devices -->
@@ -1171,9 +1203,6 @@
     <!-- text for the Firefox Accounts section header -->
     <string name="onboarding_fxa_section_header">Ja teniu un compte?</string>
 
-    <!-- text for the Firefox Preview feature section header
-    The first parameter is the name of the app (e.g. Firefox Preview) -->
-    <string name="onboarding_feature_section_header">Coneixeu el %s</string>
     <!-- text for the "What's New" onboarding card header -->
     <string name="onboarding_whats_new_header1">Descobriu les novetats</string>
     <!-- text for the "what's new" onboarding card description
@@ -1181,10 +1210,10 @@
     <string name="onboarding_whats_new_description">Teniu preguntes sobre el redisseny del %s? Voleu saber què ha canviat?</string>
     <!-- text for underlined clickable link that is part of "what's new" onboarding card description that links to an FAQ -->
     <string name="onboarding_whats_new_description_linktext">Vegeu les respostes aquí</string>
-    <!-- text for the Firefox account onboarding sign in card header -->
-    <string name="onboarding_account_sign_in_header">Comenceu a sincronitzar les adreces d’interès, les contrasenyes i molt més amb el vostre compte del Firefox.</string>
+    <!-- text for the Firefox account onboarding sign in card header. The word "Firefox" should not be translated -->
+    <string name="onboarding_account_sign_in_header_1">Sincronitzeu el Firefox entre dispositius</string>
     <!-- Text for the button to learn more about signing in to your Firefox account -->
-    <string name="onboarding_manual_sign_in_learn_more">Més informació</string>
+    <string name="onboarding_manual_sign_in_description">Importeu les adreces d’interès, l’historial i les contrasenyes al Firefox d’aquest dispositiu.</string>
     <!-- text for the firefox account onboarding card header when we detect you're already signed in to
         another Firefox browser. (The word `Firefox` should not be translated)
         The first parameter is the email of the detected user's account -->
@@ -1193,8 +1222,8 @@
     <string name="onboarding_firefox_account_auto_signin_confirm">Sí, inicia la sessió</string>
     <!-- text for the automatic sign-in button while signing in is in process -->
     <string name="onboarding_firefox_account_signing_in">S’està iniciant la sessió…</string>
-    <!-- text for the button to manually sign into Firefox account. The word "Firefox" should not be translated -->
-    <string name="onboarding_firefox_account_sign_in">Inicia la sessió al Firefox</string>
+    <!-- text for the button to manually sign into Firefox account. -->
+    <string name="onboarding_firefox_account_sign_in_1">Registre</string>
     <!-- text for the button to stay signed out when presented with an option to automatically sign-in. -->
     <string name="onboarding_firefox_account_stay_signed_out">No iniciïs la sessió</string>
     <!-- text to display in the snackbar once account is signed-in -->
@@ -1202,26 +1231,23 @@
     <!-- text to display in the snackbar if automatic sign-in fails. user may try again -->
     <string name="onboarding_firefox_account_automatic_signin_failed">No s’ha pogut iniciar la sessió</string>
     <!-- text for the tracking protection onboarding card header -->
-    <string name="onboarding_tracking_protection_header_2">Privadesa automàtica</string>
-    <!-- text for the tracking protection card description
-    The first parameter is the name of the app (e.g. Firefox Preview) -->
-    <string name="onboarding_tracking_protection_description_2">Els paràmetres de privadesa i de seguretat bloquen els elements de seguiment, el programari maliciós i les empreses que us fan el seguiment.</string>
+    <string name="onboarding_tracking_protection_header_3">Privadesa sempre activa</string>
+    <!-- text for the tracking protection card description. 'Firefox' intentionally hardcoded here -->
+    <string name="onboarding_tracking_protection_description_3">El Firefox bloca automàticament les empreses que, en secret, us fan el seguiment mentre navegueu.</string>
     <!-- text for tracking protection radio button option for standard level of blocking -->
     <string name="onboarding_tracking_protection_standard_button_2">Estàndard (per defecte)</string>
     <!-- text for standard blocking option button description -->
-    <string name="onboarding_tracking_protection_standard_button_description_2">Es bloquen menys elements de seguiment. Les pàgines es carregaran amb normalitat.</string>
+    <string name="onboarding_tracking_protection_standard_button_description_3">Equilibri entre privadesa i rendiment. Les pàgines es carreguen amb normalitat.</string>
     <!-- text for tracking protection radio button option for strict level of blocking -->
     <string name="onboarding_tracking_protection_strict_button">Estricta (recomanat)</string>
     <!-- text for tracking protection radio button option for strict level of blocking -->
     <string name="onboarding_tracking_protection_strict_option">Estricta</string>
     <!-- text for strict blocking option button description -->
-    <string name="onboarding_tracking_protection_strict_button_description_2">Bloca més elements de seguiment, anuncis i finestres emergents. Les pàgines es carreguen més ràpidament, però és possible que algunes característiques no funcionin.</string>
-    <!-- text for the toolbar position card header
-        In English this is an idiom for "choose a side as in an argument or fight"
-        but it is ok to make this more literally about "choosing a position in a physical space -->
-    <string name="onboarding_toolbar_position_header">Posicioneu-vos</string>
+    <string name="onboarding_tracking_protection_strict_button_description_3">Bloca més elements de seguiment i fa que les pàgines es carreguin més ràpidament, però podria causar problemes amb algunes funcions de la pàgina.</string>
+    <!-- text for the toolbar position card header  -->
+    <string name="onboarding_toolbar_placement_header_1">Trieu la ubicació de la barra d’eines</string>
     <!-- text for the toolbar position card description -->
-    <string name="onboarding_toolbar_position_description">Proveu la navegació amb una sola mà amb la barra d’eines part inferior o moveu-la al capdamunt.</string>
+    <string name="onboarding_toolbar_placement_description_1">Tingueu la barra d’eines a mà. La podeu mantenir a la part inferior o moure-la a dalt.</string>
     <!-- text for the private browsing onboarding card header -->
     <string name="onboarding_private_browsing_header">Navegueu amb privadesa</string>
     <!-- text for the private browsing onboarding card description
@@ -1234,7 +1260,7 @@
     <!-- text for the privacy notice onboarding card header -->
     <string name="onboarding_privacy_notice_header">La vostra privadesa</string>
     <!-- text for the privacy notice onboarding card description
-    The first parameter is the name of the app (e.g. Firefox Preview) -->
+    The first parameter is the name of the app (e.g. Firefox Preview) Substitute %s for long browser name. -->
     <string name="onboarding_privacy_notice_description2">Hem dissenyat el %s per donar-vos el control sobre tot allò que compartiu en línia i que compartiu amb nosaltres.</string>
     <!-- Text for the button to read the privacy notice -->
     <string name="onboarding_privacy_notice_read_button">Mostra l’avís de privadesa</string>
@@ -1249,7 +1275,7 @@
     <!-- text for the theme picker onboarding card header -->
     <string name="onboarding_theme_picker_header">Trieu el tema</string>
     <!-- text for the theme picker onboarding card description -->
-    <string name="onboarding_theme_picker_description1">Estalvieu bateria i descanseu la vista activant el mode fosc.</string>
+    <string name="onboarding_theme_picker_description_2">Estalvieu bateria i descanseu la vista amb el mode fosc.</string>
     <!-- Automatic theme setting (will follow device setting) -->
     <string name="onboarding_theme_automatic_title">Automàtic</string>
     <!-- Summary of automatic theme setting (will follow device setting) -->
@@ -1305,13 +1331,13 @@
     <!-- Preference for enhanced tracking protection for the standard protection settings -->
     <string name="preference_enhanced_tracking_protection_standard_default_1">Estàndard (per defecte)</string>
     <!-- Preference description for enhanced tracking protection for the standard protection settings -->
-    <string name="preference_enhanced_tracking_protection_standard_description_3">Es bloquen menys elements de seguiment. Les pàgines es carregaran amb normalitat.</string>
+    <string name="preference_enhanced_tracking_protection_standard_description_4">Equilibri entre privadesa i rendiment. Les pàgines es carreguen amb normalitat.</string>
     <!--  Accessibility text for the Standard protection information icon  -->
     <string name="preference_enhanced_tracking_protection_standard_info_button">Què es bloca en la protecció contra el seguiment estàndard</string>
     <!-- Preference for enhanced tracking protection for the strict protection settings -->
     <string name="preference_enhanced_tracking_protection_strict">Estricta</string>
     <!-- Preference description for enhanced tracking protection for the strict protection settings -->
-    <string name="preference_enhanced_tracking_protection_strict_description_2">Bloca més elements de seguiment, anuncis i finestres emergents. Les pàgines es carreguen més ràpidament, però és possible que algunes característiques no funcionin.</string>
+    <string name="preference_enhanced_tracking_protection_strict_description_3">Bloca més elements de seguiment i fa que les pàgines es carreguin més ràpidament, però podria causar problemes amb algunes funcions de la pàgina.</string>
     <!--  Accessibility text for the Strict protection information icon  -->
     <string name="preference_enhanced_tracking_protection_strict_info_button">Què es bloca en la protecció contra el seguiment estricta</string>
     <!-- Preference for enhanced tracking protection for the custom protection settings -->
@@ -1453,10 +1479,8 @@
     <string name="preferences_passwords_autofill">Emplenament automàtic</string>
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Sincronitza els inicis de sessió</string>
-    <!-- Syncing saved logins in Fenix is on -->
-    <string name="preferences_passwords_sync_logins_on">Activat</string>
-    <!-- Syncing saved logins in Fenix is off -->
-    <string name="preferences_passwords_sync_logins_off">Desactivat</string>
+    <!-- Preference for syncing saved logins in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices">Sincronitza els inicis de sessió entre dispositius</string>
     <!-- Syncing saved logins in Fenix needs reconnect to sync -->
     <string name="preferences_passwords_sync_logins_reconnect">Torna a connectar</string>
     <!-- Syncing saved logins in Fenix needs login -->
@@ -1548,6 +1572,69 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Ordena el menú d’inicis de sessió</string>
 
+    <!-- Credit Cards Autofill -->
+    <!-- Preference and title for managing the settings for credit cards -->
+    <string name="preferences_credit_cards">Targetes de crèdit</string>
+
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards">Desa i emplena automàticament les targetes</string>
+    <!-- Preference summary for saving and autofilling credit card data -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Les dades estan xifrades</string>
+    <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
+    <string name="preferences_credit_cards_sync_cards_across_devices">Sincronitza les targetes entre dispositius</string>
+    <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
+    <string name="preferences_credit_cards_sync_cards">Sincronitza les targetes</string>
+    <!-- Preference option for adding a credit card -->
+    <string name="preferences_credit_cards_add_credit_card">Afegeix una targeta de crèdit</string>
+    <!-- Preference option for managing saved credit cards -->
+    <string name="preferences_credit_cards_manage_saved_cards">Gestiona les targetes desades</string>
+    <!-- Title of the "Add card" screen -->
+    <string name="credit_cards_add_card">Afegeix una targeta</string>
+    <!-- Title of the "Edit card" screen -->
+    <string name="credit_cards_edit_card">Edita la targeta</string>
+    <!-- The header for the card number of a credit card -->
+    <string name="credit_cards_card_number">Número de targeta</string>
+    <!-- The header for the expiration date of a credit card -->
+    <string name="credit_cards_expiration_date">Data de caducitat</string>
+    <!-- The label for the expiration date month of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_month">Mes de la data de caducitat</string>
+    <!-- The label for the expiration date year of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_year">Any de la data de caducitat</string>
+    <!-- The header for the name on the credit card -->
+    <string name="credit_cards_name_on_card">Nom del titular</string>
+    <!-- The header for the nickname for a credit card -->
+    <string name="credit_cards_card_nickname">Sobrenom de la targeta</string>
+    <!-- The text for the "Delete card" menu item for deleting a credit card -->
+    <string name="credit_cards_menu_delete_card">Suprimeix la targeta</string>
+    <!-- The text for the "Delete card" button for deleting a credit card -->
+    <string name="credit_cards_delete_card_button">Suprimeix la targeta</string>
+    <!-- The title for the "Save" menu item for saving a credit card -->
+    <string name="credit_cards_menu_save">Desa</string>
+    <!-- The text for the "Save" button for saving a credit card -->
+    <string name="credit_cards_save_button">Desa</string>
+    <!-- The text for the "Cancel" button for cancelling adding or updating a credit card -->
+    <string name="credit_cards_cancel_button">Cancel·la</string>
+    <!-- Title of the "Saved cards" screen -->
+    <string name="credit_cards_saved_cards">Targetes desades</string>
+    <!-- Error message for credit card number validation -->
+    <string name="credit_cards_number_validation_error_message">Introduïu un número de targeta de crèdit vàlid</string>
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Empleneu aquest camp</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Desbloqueu per veure les targetes desades</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Protegiu les vostres targetes de crèdit</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Configureu un patró de bloqueig del dispositiu, un PIN o una contrasenya perquè cap persona que accedeixi al vostre dispositiu pugui veure les targetes de crèdit que deseu.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Configura-ho ara</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Més tard</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Desbloqueu el dispositiu</string>
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Desbloqueu per utilitzar la informació emmagatzemada d’una targeta de crèdit</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Afegeix un motor de cerca</string>
     <!-- Title of the Edit search engine screen -->
@@ -1708,23 +1795,19 @@
 	<!-- Dialog button text for canceling the rename top site prompt. -->
 	<string name="top_sites_rename_dialog_cancel">Cancel·la</string>
 
+    <!-- Default browser experiment -->
+    <string name="default_browser_experiment_card_text">Feu que els enllaços dels llocs web, del correu electrònic i dels missatges s’obrin automàticament en el Firefox.</string>
+
     <!-- Content description for close button in collection placeholder. -->
     <string name="remove_home_collection_placeholder_content_description">Elimina</string>
 
-    <!-- Deprecated: text for the firefox account onboarding card header
-    The first parameter is the name of the app (e.g. Firefox Preview) -->
-    <string name="onboarding_firefox_account_header">Traieu tot el profit al %s.</string>
-
     <!-- Content description radio buttons with a link to more information -->
     <string name="radio_preference_info_content_description">Feu clic aquí per a veure més informació</string>
 
-    <!-- Deprecated: No Open Tabs Message Header -->
-    <string name="no_collections_header1">Recolliu tot allò que us insteressa</string>
-    <!-- Deprecated: Label to describe what collections are to a new user without any collections -->
-    <string name="no_collections_description1">Agrupeu les cerques, els llocs i les pestanyes similars per accedir-hi ràpidament en el futur.</string>
-    <!-- Deprecated: text for the firefox account onboarding card header when we detect you're already signed in to -->
-    <string name="onboarding_firefox_account_auto_signin_header_2">Ja heu iniciat la sessió com a %s en un altre navegador Firefox d’aquest telèfon. Voleu iniciar la sessió amb aquest compte?</string>
-    <!-- Deprecated: Describes the add to homescreen functionality -->
-    <string name="add_to_homescreen_description">Podeu afegir fàcilment aquest lloc web a la pantalla d’inici del telèfon per accedir-hi directament i navegar-hi com si fos una aplicació.</string>
+    <!-- Content description for the action bar "up" button -->
+    <string name="action_bar_up_description">Navega cap amunt</string>
+
+    <!-- Content description for privacy content close button -->
+    <string name="privacy_content_close_button_content_description">Tanca</string>
 
-    </resources>
+</resources>
diff --git a/app/src/main/res/values-cak/strings.xml b/app/src/main/res/values-cak/strings.xml
index d39f31f59..38c877950 100644
--- a/app/src/main/res/values-cak/strings.xml
+++ b/app/src/main/res/values-cak/strings.xml
@@ -97,13 +97,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Tewäx</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Tijal kiwachib\'enik jaqon taq ruwi\'. Jät pa Runuk\'ulem k\'a ri\' tacha\' ri kajtz\'ikil pa peraj kitzub\'al taq ruwi\'.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Jät pa runuk\'ulem</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Tewäx</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">K’ak’a’ ruwi’</string>
@@ -567,8 +560,6 @@
     <string name="library_new_tab">K\'ak\'a\' ruwi\'</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Tikanöx pa ruxaq</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Ximon taq ruwi\'</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Rucholajem sik\'inem</string>
     <!-- Menu Item Label for Search in Library -->
@@ -614,6 +605,8 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Jun ik\' tik\'o</string>
 
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Junelïk</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Titz\'apïx chi q\'ab\'aj</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -1637,6 +1630,15 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Titz\'ib\'äx jun okel rajilab\'al rutarjeta\' kre\'ito\'</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Tanojisaj re k\'ojlem re\'</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Tib\'an runuk\'ulem wakami</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Jub\'a\' chik na</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Man taq\'ät chik ri awokisab\'al</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Titz\'aqatisäx kanob\'äl</string>
     <!-- Title of the Edit search engine screen -->
diff --git a/app/src/main/res/values-ckb/strings.xml b/app/src/main/res/values-ckb/strings.xml
new file mode 100644
index 000000000..e6804d187
--- /dev/null
+++ b/app/src/main/res/values-ckb/strings.xml
@@ -0,0 +1,1654 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
+    <string name="app_name_private_5">تایبەت %s</string>
+    <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
+    <string name="app_name_private_4">%s (تایبەت)</string>
+    <!-- Home Fragment -->
+    <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
+    <string name="content_description_menu">هەڵبژاردەی زیاتر</string>
+    <!-- Content description (not visible, for screen readers etc.): "Private Browsing" menu button. -->
+    <string name="content_description_private_browsing_button">گەڕانی تایبەتی شاراوە کارابکە</string>
+    <!-- Content description (not visible, for screen readers etc.): "Private Browsing" menu button. -->
+    <string name="content_description_disable_private_browsing_button">گەڕانی تایبەتی شاراوە ناچالاک بکە</string>
+    <!-- Placeholder text shown in the search bar before a user enters text -->
+    <string name="search_hint">بگەڕێ یان ناونیشان بنووسە</string>
+    <!-- No Open Tabs Message Description -->
+    <string name="no_open_tabs_description">بازدەرە کراوەکانت لێرە پیشان دەدرێت.</string>
+    <!-- No Private Tabs Message Description -->
+    <string name="no_private_tabs_description">بازدەرە تایبەتە شاراوەکان لێرە پیشان دەدرێت</string>
+    <!-- Message announced to the user when tab tray is selected with 1 tab -->
+    <string name="open_tab_tray_single">١ بازدەر کراوەیە. پەنجەدابگرە بۆ گۆڕینی بازدەرەکان.</string>
+    <!-- Message announced to the user when tab tray is selected with 0 or 2+ tabs -->
+    <string name="open_tab_tray_plural">%1$s بازدەر کراوەیە. پەنجەدابگرە بۆ گۆڕینی بازدەرەکان.</string>
+    <!-- Tab tray multi select title in app bar. The first parameter is the number of tabs selected -->
+    <string name="tab_tray_multi_select_title">%1$d دیاریکراوە</string>
+    <!-- Label of button in create collection dialog for creating a new collection  -->
+    <string name="tab_tray_add_new_collection">کۆمەڵەیەکی نوێ زیادبکە</string>
+    <!-- Label of editable text in create collection dialog for naming a new collection  -->
+    <string name="tab_tray_add_new_collection_name">ناو</string>
+    <!-- Label of button in save to collection dialog for selecting a current collection  -->
+    <string name="tab_tray_select_collection">کۆمەڵە هەڵبژێرە</string>
+    <!-- Content description for close button while in multiselect mode in tab tray -->
+    <string name="tab_tray_close_multiselect_content_description">لە دۆخی دیاریکردنی چەندیی دەربچۆ</string>
+    <!-- Content description for save to collection button while in multiselect mode in tab tray -->
+    <string name="tab_tray_collection_button_multiselect_content_description">بازدەرە دیاریکراوەکان هەڵبگرە لە کۆمەڵەکە</string>
+
+
+    <!-- Content description for checkmark while tab is selected while in multiselect mode in tab tray. The first parameter is the title of the tab selected -->
+    <string name="tab_tray_item_selected_multiselect_content_description">%1$s دیاریکرا</string>
+    <!-- Content description when tab is unselected while in multiselect mode in tab tray. The first parameter is the title of the tab unselected -->
+    <string name="tab_tray_item_unselected_multiselect_content_description">%1$s گێڕاوە لە دیاریکردن</string>
+    <!-- Content description announcement when exiting multiselect mode in tab tray -->
+    <string name="tab_tray_exit_multiselect_content_description">دەرچووی لە دۆخی دیارتکردنی چەندی</string>
+    <!-- Content description announcement when entering multiselect mode in tab tray -->
+    <string name="tab_tray_enter_multiselect_content_description">دۆخی دیاریکردنی چەندانەیی، بازدەرەکان هەڵبژێرە بۆ ختنە کۆکەرەوە</string>
+    <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
+    <string name="tab_tray_multiselect_selected_content_description">دیاریکرا</string>
+
+    <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
+    <string name="about_content">%1$s بەرهەم هێنراوە لە لایەن مۆزیلاوە.</string>
+
+    <!-- Private Browsing -->
+    <!-- Title for private session option -->
+    <string name="private_browsing_title">تۆ لە دانیشتنێکی تایبەتدایت</string>
+    <string name="private_browsing_common_myths">
+       چەند ئەفسانەییەک دەربارەی گەڕانی تایبەتیی
+    </string>
+    <!-- Delete session button to erase your history in a private session -->
+    <string name="private_browsing_delete_session">دانیشتن بسڕەوە</string>
+
+    <!-- Private mode shortcut "contextual feature recommendation" (CFR) -->
+    <!-- Text for the main message -->
+    <string name="cfr_message">قەدبڕێک درووستبکە بۆ کردنەوەی بازدەری تایبەتی شاراوە لە شاشەی سەرەکەییەوە.</string>
+    <!-- Text for the positive button -->
+    <string name="cfr_pos_button_text">قەدبڕ زیادبکە</string>
+    <!-- Text for the negative button -->
+    <string name="cfr_neg_button_text">نا سوپاس</string>
+
+    <!-- Open in App "contextual feature recommendation" (CFR) -->
+    <!-- Text for the info message. 'Firefox' intentionally hardcoded here.-->
+    <string name="open_in_app_cfr_info_message">دەتوانیت وا لە فایەرفۆکس بکەیت کە خۆاکارانە بەستەرەکان لەناو بەرنامەکان بکاتەوە.</string>
+    <!-- Text for the positive action button -->
+    <string name="open_in_app_cfr_positive_button_text">بڕۆ بۆ ڕێکخستن</string>
+    <!-- Text for the negative action button -->
+    <string name="open_in_app_cfr_negative_button_text">پشتگوێخستن</string>
+
+    <!-- Text for the info dialog when camera permissions have been denied but user tries to access a camera feature. -->
+    <string name="camera_permissions_needed_message">داواکاری کامێرا چالاک کرا. بڕۆ بۆ ڕێکخستنەکانی ئاندرۆید، پەنجەبنێ بە دەسەڵاتەکان و ئینجا ڕێگەپێدان هەڵبژێرە.</string>
+    <!-- Text for the positive action button to go to Android Settings to grant permissions. -->
+    <string name="camera_permissions_needed_positive_button_text">بڕۆ بۆ ڕێکخستن</string>
+    <!-- Text for the negative action button to dismiss the dialog. -->
+    <string name="camera_permissions_needed_negative_button_text">پشتگوێخستن</string>
+
+    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
+    <string name="tab_tray_close_tabs_banner_positive_button_text">هەڵبژاردەکان پیشان بدە</string>
+    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
+    <string name="tab_tray_close_tabs_banner_negative_button_text">پشتگوێخستن</string>
+
+    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
+    <string name="tab_tray_grid_view_banner_positive_button_text">بڕۆ بۆ ڕێکخستن</string>
+    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
+    <string name="tab_tray_grid_view_banner_negative_button_text">پشتگوێخستن</string>
+
+    <!-- Home screen icons - Long press shortcuts -->
+    <!-- Shortcut action to open new tab -->
+    <string name="home_screen_shortcut_open_new_tab_2">بازدەری نوێ</string>
+    <!-- Shortcut action to open new private tab -->
+    <string name="home_screen_shortcut_open_new_private_tab_2">بازدەری تایبەتی نوێ</string>
+    <!-- Heading for the Top Sites block -->
+    <string name="home_screen_top_sites_heading">ماڵپەڕە بەرزەکان</string>
+
+    <!-- Browser Fragment -->
+    <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
+    <string name="browser_tabs_button">بازدەرەکان بکەرەوە</string>
+    <!-- Content description (not visible, for screen readers etc.): Navigate backward (browsing history) -->
+    <string name="browser_menu_back">دواوە</string>
+    <!-- Content description (not visible, for screen readers etc.): Navigate forward (browsing history) -->
+    <string name="browser_menu_forward">پێشەوە</string>
+    <!-- Content description (not visible, for screen readers etc.): Refresh current website -->
+    <string name="browser_menu_refresh">نوێکردنەوە</string>
+    <!-- Content description (not visible, for screen readers etc.): Stop loading current website -->
+    <string name="browser_menu_stop">بوەستە</string>
+    <!-- Content description (not visible, for screen readers etc.): Bookmark the current page -->
+    <string name="browser_menu_bookmark">دڵخواز</string>
+    <!-- Content description (not visible, for screen readers etc.): Un-bookmark the current page -->
+    <string name="browser_menu_edit_bookmark">دڵخوازەکان دەستکاریبکە</string>
+    <!-- Browser menu button that opens the addon manager -->
+    <string name="browser_menu_add_ons">پێوەکراوەکان</string>
+    <!-- Browser menu button that opens the addon extensions manager -->
+    <string name="browser_menu_extensions">زیادکراوەکان</string>
+    <!-- Text displayed when there are no add-ons to be shown -->
+    <string name="no_add_ons">هیچ پێوەکراوێک نیە</string>
+    <!-- Browser menu button that sends a user to help articles -->
+    <string name="browser_menu_help">یارمەتی</string>
+    <!-- Browser menu button that sends a to a the what's new article -->
+    <string name="browser_menu_whats_new">چی نوێ هەیە</string>
+    <!-- Browser menu button that opens the settings menu -->
+    <string name="browser_menu_settings">ڕێکخستنەکان</string>
+    <!-- Browser menu button that opens a user's library -->
+    <string name="browser_menu_library">کتێبخانە</string>
+    <!-- Browser menu toggle that requests a desktop site -->
+    <string name="browser_menu_desktop_site">پیشاندانی ماڵپەڕ وەک ڕوومێز</string>
+    <!-- Browser menu toggle that adds a shortcut to the site on the device home screen. -->
+    <string name="browser_menu_add_to_homescreen">زیادی بکە بۆ شاشەی سەرەکی</string>
+    <!-- Browser menu toggle that installs a Progressive Web App shortcut to the site on the device home screen. -->
+    <string name="browser_menu_install_on_homescreen">دامەزراندن</string>
+    <!-- Menu option on the toolbar that takes you to synced tabs page-->
+    <string name="synced_tabs">بازدەرە هاوکاتپێکراوەکان</string>
+
+
+    <!-- Content description (not visible, for screen readers etc.) for the Resync tabs button -->
+    <string name="resync_button_content_description">هاوکاتپێکردنەوە</string>
+    <!-- Browser menu button that opens the find in page menu -->
+    <string name="browser_menu_find_in_page">لە ناو پەڕگە بگەڕێ</string>
+    <!-- Browser menu button that creates a private tab -->
+    <string name="browser_menu_private_tab">بازدەری تایبەت</string>
+    <!-- Browser menu button that saves the current tab to a collection -->
+    <string name="browser_menu_save_to_collection_2">هەڵگرتن لە کۆمەڵە</string>
+    <!-- Browser menu button that open a share menu to share the current site -->
+    <string name="browser_menu_share">بڵاوکردنەوە</string>
+    <!-- Share menu title, displayed when a user is sharing their current site -->
+    <string name="menu_share_with">بڵاوەپێکردن لەگەڵ...</string>
+    <!-- Browser menu button shown in custom tabs that opens the current tab in Fenix
+        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
+    <string name="browser_menu_open_in_fenix">کردنەوە لە %1$s</string>
+    <!-- Browser menu text shown in custom tabs to indicate this is a Fenix tab
+        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
+    <string name="browser_menu_powered_by">پشتگیریکراوە لە لایەن %1$s</string>
+    <!-- Browser menu text shown in custom tabs to indicate this is a Fenix tab
+        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
+    <string name="browser_menu_powered_by2">پشتگیریکراوە لە لایەن %1$s</string>
+    <!-- Browser menu button to put the current page in reader mode -->
+    <string name="browser_menu_read">شێوازی دۆخی خوێندنەوە</string>
+    <!-- Browser menu button content description to close reader mode and return the user to the regular browser -->
+    <string name="browser_menu_read_close">شێوازی دۆخی خوێندنەوە دابخە</string>
+    <!-- Browser menu button to open the current page in an external app -->
+    <string name="browser_menu_open_app_link">کردنەوە لە بەرنامە</string>
+    <!-- Browser menu button to configure reader mode appearance e.g. the used font type and size -->
+    <string name="browser_menu_read_appearance">ڕووکار</string>
+    <!-- Browser menu button to show reader view appearance controls e.g. the used font type and size -->
+    <string name="browser_menu_customize_reader_view">شێوازی خوێندنەوە ڕێکبخە</string>
+    <!-- Browser menu label for adding a bookmark -->
+    <string name="browser_menu_add">زیادکردن</string>
+    <!-- Browser menu label for editing a bookmark -->
+    <string name="browser_menu_edit">دەستکاریکردن</string>
+
+    <!-- Error message to show when the user tries to access a scheme not
+        handled by the app (Ex: blob, tel etc) -->
+    <string name="unknown_scheme_error_message">نەتوانرا پەیوەندی بکرێت. شێوەی بەستەرەکە نەناسراوە.</string>
+
+    <!-- Locale Settings Fragment -->
+    <!-- Content description for tick mark on selected language -->
+    <string name="a11y_selected_locale_content_description">زمانی هەڵبژێردراو</string>
+    <!-- Content description for search icon -->
+    <string name="a11y_search_icon_content_description">گەڕان</string>
+    <!-- Text for default locale item -->
+    <string name="default_locale_text">وەکوو زمانی ئامێرەکە</string>
+    <!-- Placeholder text shown in the search bar before a user enters text -->
+    <string name="locale_search_hint">گەڕان بۆ زمان</string>
+
+    <!-- Search Fragment -->
+    <!-- Button in the search view that lets a user search by scanning a QR code -->
+    <string name="search_scan_button">گەڕانی QR</string>
+    <!-- Button in the search view that lets a user change their search engine -->
+    <string name="search_engine_button">بزوێنەری گەڕان</string>
+    <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
+    <string name="search_shortcuts_engine_settings">ڕێکخستنەکانی بزوێنەری گەڕان</string>
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_engines_search_with">لەم کاتەدا، بگەڕێ لەگەڵ:</string>
+    <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
+    <string name="awesomebar_clipboard_title">بەستەر بهێنە لە گرتەتەختەوە</string>
+    <!-- Button in the search suggestions onboarding that allows search suggestions in private sessions -->
+    <string name="search_suggestions_onboarding_allow_button">ڕێگەبدە</string>
+    <!-- Button in the search suggestions onboarding that does not allow search suggestions in private sessions -->
+    <string name="search_suggestions_onboarding_do_not_allow_button">ڕێگە مەدە</string>
+    <!-- Search suggestion onboarding hint title text -->
+    <string name="search_suggestions_onboarding_title">ڕێگە دەدەی  بە پێشنیاری گەڕان لە دانییشتنی شاراوەی تایبەت؟</string>
+    <!-- Search suggestion onboarding hint Learn more link text -->
+    <string name="search_suggestions_onboarding_learn_more_link">زیاتر بزانە</string>
+    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <string name="search_engine_suggestions_title">بگەڕێ بۆ %s</string>
+
+
+    <!-- Search engine suggestion description text -->
+    <string name="search_engine_suggestions_description">ڕاستەوخۆ گەڕان بکە لە توڵی ناونیشانەوە</string>
+
+    <!-- Search Widget -->
+    <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
+    <string name="search_widget_content_description">بازدەرێکی نوێی فایەرفۆکس بکەرەوە</string>
+    <!-- Text preview for smaller sized widgets -->
+    <string name="search_widget_text_short">گەڕان</string>
+    <!-- Text preview for larger sized widgets -->
+    <string name="search_widget_text_long">بگەڕێ کە وێبدا</string>
+    <!-- Content description (not visible, for screen readers etc.): Voice search -->
+    <string name="search_widget_voice">گەڕانی دەنگی</string>
+
+    <!-- Preferences -->
+    <!-- Title for the settings page-->
+    <string name="settings">ڕێکخستنەکان</string>
+
+
+    <!-- Preference category for basic settings -->
+    <string name="preferences_category_basics">بنەڕەتیی</string>
+    <!-- Preference category for general settings -->
+    <string name="preferences_category_general">گشتی</string>
+    <!-- Preference category for all links about Fenix -->
+    <string name="preferences_category_about">دەربارە</string>
+    <!-- Preference for settings related to changing the default search engine -->
+    <string name="preferences_default_search_engine">بزوێنەری گەڕانی بنەڕەتی</string>
+    <!-- Preference for settings related to Search -->
+    <string name="preferences_search">گەڕان</string>
+    <!-- Preference for settings related to Search address bar -->
+    <string name="preferences_search_address_bar">توڵی ناونیشان</string>
+    <!-- Preference linking to help about Fenix -->
+    <string name="preferences_help">یارمەتی</string>
+
+
+    <!-- Preference link to rating Fenix on the Play Store -->
+    <string name="preferences_rate">هەڵسەنگاندن لە گووگڵ پلەی</string>
+    <!-- Preference for giving feedback about Fenix -->
+    <string name="preferences_feedback">پێشنیار بنێرە</string>
+    <!-- Preference linking to about page for Fenix
+        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
+    <string name="preferences_about">دەربارەی %1$s</string>
+    <!-- Preference linking to the your rights SUMO page -->
+    <string name="preferences_your_rights">مافەکانت</string>
+    <!-- Preference for settings related to saved passwords -->
+    <string name="preferences_passwords">وشەی تێپەڕبوونەکان</string>
+    <!-- Preference for settings related to saved credit cards and addresses -->
+    <string name="preferences_credit_cards_addresses">کارتی بانکی و ناونیشانەکان</string>
+    <!-- Preference for settings related to changing the default browser -->
+    <string name="preferences_set_as_default_browser">بیکە وێبگەڕی سەرەکی</string>
+    <!-- Preference category for advanced settings -->
+    <string name="preferences_category_advanced">پێشکەوتوو</string>
+    <!-- Preference category for privacy settings -->
+    <string name="preferences_category_privacy">تایبەتیی</string>
+    <!-- Preference category for privacy and security settings -->
+    <string name="preferences_category_privacy_security">تایبەتیی و پاراستن</string>
+    <!-- Preference for advanced site permissions -->
+    <string name="preferences_site_permissions">ڕێگەپێدانەکانی ماڵپەڕ</string>
+    <!-- Preference for private browsing options -->
+    <string name="preferences_private_browsing_options">وێبگەڕانی تایبەتی</string>
+    <!-- Preference for opening links in a private tab-->
+    <string name="preferences_open_links_in_a_private_tab">کردنەوەی بەستەر لە بازدەری تایبەت</string>
+    <!-- Preference for allowing screenshots to be taken while in a private tab-->
+    <string name="preferences_allow_screenshots_in_private_mode">ڕێگە بە وێنەگرتنی شاشە بدە لە وێبگەڕانی تایبەتی</string>
+    <!-- Will inform the user of the risk of activating Allow screenshots in private browsing option -->
+    <string name="preferences_screenshots_in_private_mode_disclaimer">ئەگەر ڕێگەدرا، بازدەرە تایبەتەکانیش بینراو دەبن کاتێک چەند بەرنامەیەک کراونەتەوە</string>
+    <!-- Preference for adding private browsing shortcut -->
+    <string name="preferences_add_private_browsing_shortcut">قەدبڕێ وێبگەڕانی تایبەتی زیاد بکە</string>
+    <!-- Preference for accessibility -->
+    <string name="preferences_accessibility">دەستپێگەیشتن</string>
+    <!-- Preference to override the Firefox Account server -->
+    <string name="preferences_override_fxa_server">ڕاژەی خوازراو بۆ هەژماری فایەرفۆکس</string>
+    <!-- Preference to override the Sync token server -->
+    <string name="preferences_override_sync_tokenserver">ڕاژەی خوازراو بۆ هاوکاتگەری</string>
+    <!-- Preference category for account information -->
+    <string name="preferences_category_account">هەژمار</string>
+    <!-- Preference shown on banner to sign into account -->
+    <string name="preferences_sign_in">بچۆژوورەوە</string>
+    <!-- Preference for changing where the toolbar is positioned -->
+    <string name="preferences_toolbar">توڵامراز</string>
+    <!-- Preference for changing default theme to dark or light mode -->
+    <string name="preferences_theme">ڕووکار</string>
+    <!-- Preference for customizing the home screen -->
+    <string name="preferences_home">ماڵەوە</string>
+    <!-- Preference for gestures based actions -->
+    <string name="preferences_gestures">جوڵاندنەکان</string>
+    <!-- Preference for settings related to visual options -->
+    <string name="preferences_customize">دەستکاریکردن</string>
+    <!-- Preference description for banner about signing in -->
+    <string name="preferences_sign_in_description">نیشانەکراوەکان، مێژووی کار، وزیاتر لەگەڵ هەژماری فایەرفۆکس</string>
+    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
+    <string name="preferences_account_default_name">هەژماری Firefox</string>
+    <!-- Preference text for account title when there was an error syncing FxA -->
+    <string name="preferences_account_sync_error">دووبارە پەیوەندی بکەرەوە بۆ هێنانەوەی هاوکاتگەری</string>
+    <!-- Preference for language -->
+    <string name="preferences_language">زمان</string>
+    <!-- Preference for data choices -->
+    <string name="preferences_data_choices">هەڵبژاردنەکانی زانیاری</string>
+    <!-- Preference for data collection -->
+    <string name="preferences_data_collection">کۆمەڵی زانیاری</string>
+    <!-- Preference linking to the privacy notice -->
+    <string name="preferences_privacy_link">سەرنجی تایبەتیی</string>
+    <!-- Preference category for developer tools -->
+    <string name="developer_tools_category">ئامرازی گەشەپێدەر</string>
+    <!-- Preference for developers -->
+    <string name="preferences_remote_debugging">هەڵەدۆزی دوور لەڕێگەی USB</string>
+    <!-- Preference title for switch preference to show search engines -->
+    <string name="preferences_show_search_engines">بزوێنەرەکانی گەڕان پیشان بدە</string>
+    <!-- Preference title for switch preference to show search suggestions -->
+    <string name="preferences_show_search_suggestions">پێشنیارەکانی گەڕان پیشان بدە</string>
+
+
+    <!-- Preference title for switch preference to show voice search button -->
+    <string name="preferences_show_voice_search">گەڕانی دەنگی پیشان بدە</string>
+    <!-- Preference title for switch preference to show search suggestions also in private mode -->
+    <string name="preferences_show_search_suggestions_in_private">لە دانیشتنی تایبەت پیشانی بدە</string>
+    <!-- Preference title for switch preference to suggest browsing history when searching -->
+    <string name="preferences_search_browsing_history">بگەڕێ لە مێژووی کار </string>
+    <!-- Preference title for switch preference to suggest bookmarks when searching -->
+    <string name="preferences_search_bookmarks">گەڕان لە نیشانەکراوەکان</string>
+    <!-- Preference title for switch preference to suggest synced tabs when searching -->
+    <string name="preferences_search_synced_tabs">بگەڕێ لەناو بازدەرە هاوکاتگەری کراوەکان</string>
+    <!-- Preference for account settings -->
+    <string name="preferences_account_settings">ڕێکخستنی هەژمار</string>
+    <!-- Preference for enabling url autocomplete-->
+    <string name="preferences_enable_autocomplete_urls">تەواوکەری خۆکاری URLs</string>
+    <!-- Preference for open links in third party apps -->
+    <string name="preferences_open_links_in_apps">کردنەوەی بەستەر لە بەرنامەکان</string>
+    <!-- Preference for open download with an external download manager app -->
+    <string name="preferences_external_download_manager">بەڕێوەبردنی داگرتنی دەرەکی</string>
+    <!-- Preference for add_ons -->
+    <string name="preferences_addons">پێوەکراوەکان</string>
+    <!-- Preference for notifications -->
+    <string name="preferences_notifications">ئاگانامەکان</string>
+
+    <!-- Add-on Preferences -->
+    <!-- Preference to customize the configured AMO (addons.mozilla.org) collection -->
+    <string name="preferences_customize_amo_collection">کۆمەڵەیەکی پێوەکراوی دڵخواز</string>
+    <!-- Button caption to confirm the add-on collection configuration -->
+    <string name="customize_addon_collection_ok">باشە</string>
+    <!-- Button caption to abort the add-on collection configuration -->
+    <string name="customize_addon_collection_cancel">پاشگەزبوونەوە</string>
+    <!-- Hint displayed on input field for custom collection name -->
+    <string name="customize_addon_collection_hint">ناوی کۆکراوە</string>
+    <!-- Hint displayed on input field for custom collection user ID-->
+    <string name="customize_addon_collection_user_hint">خاوەنی کۆکراوە (ناونیشانی بەکارهێنەر)</string>
+
+
+    <!-- Add-on Installation from AMO-->
+    <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
+    <string name="addon_not_supported_error">پێوەکراو پشتگیری ناکرێت</string>
+    <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
+    <string name="addon_already_installed">پێوەکراو پێشتر دامەزراوە</string>
+
+    <!-- Account Preferences -->
+    <!-- Preference for triggering sync -->
+    <string name="preferences_sync_now">هاوکاتگەری پێکردن</string>
+    <!-- Preference category for sync -->
+    <string name="preferences_sync_category">هەڵبژێرە چ هاوکاتگەری پێبکرێت</string>
+    <!-- Preference for syncing history -->
+    <string name="preferences_sync_history">مێژوو</string>
+    <!-- Preference for syncing bookmarks -->
+    <string name="preferences_sync_bookmarks">جێنیشانه‌که‌ر</string>
+    <!-- Preference for syncing logins -->
+    <string name="preferences_sync_logins">چوونەژوورەوەکان</string>
+    <!-- Preference for syncing tabs -->
+    <string name="preferences_sync_tabs_2">بازدەرەکان بکەرەوە</string>
+    <!-- Preference for signing out -->
+    <string name="preferences_sign_out">بچۆ دەرەوە</string>
+    <!-- Preference displays and allows changing current FxA device name -->
+    <string name="preferences_sync_device_name">ناوی ئامێر</string>
+    <!-- Text shown when user enters empty device name -->
+    <string name="empty_device_name_error">ناوی ئامێر نابێت بەتاڵ بێت</string>
+    <!-- Label indicating that sync is in progress -->
+    <string name="sync_syncing_in_progress">هاوکاتگەری دەکرێت...</string>
+    <!-- Label summary indicating that sync failed. The first parameter is the date stamp showing last time it succeeded -->
+    <string name="sync_failed_summary">هاوکاتگەری هەڵوەشا. کۆتا هەوڵ: %s</string>
+    <!-- Label summary showing never synced -->
+    <string name="sync_failed_never_synced_summary">هاوکاتگەری هەڵوەشا. کۆتا هاوکاتگەری: هەرگیز</string>
+    <!-- Label summary the date we last synced. The first parameter is date stamp showing last time synced -->
+    <string name="sync_last_synced_summary">کۆتا هاوکاتگەری: %s</string>
+    <!-- Label summary showing never synced -->
+    <string name="sync_never_synced_summary">کۆتا هاوکاتگەری: هەرگیز</string>
+    <!-- Text for displaying the default device name.
+        The first parameter is the application name, the second is the device manufacturer name
+        and the third is the device model. -->
+    <string name="default_device_name_2">%1$s لە %2$s%3$s</string>
+
+    <!-- Preference for syncing credit cards -->
+    <string name="preferences_sync_credit_cards">کارتی پڕکردنەوەی بانکی</string>
+    <!-- Preference for syncing addresses -->
+    <string name="preferences_sync_address">ناونیشانەکان</string>
+
+    <!-- Send Tab -->
+    <!-- Name of the "receive tabs" notification channel. Displayed in the "App notifications" system settings for the app -->
+    <string name="fxa_received_tab_channel_name">بازدەری بەدەستگەیشتوو</string>
+
+    <!-- Description of the "receive tabs" notification channel. Displayed in the "App notifications" system settings for the app -->
+    <string name="fxa_received_tab_channel_description">ئاگانامەکان بۆ بازدەر هاتووە لە ئامێرێکی تری فایەرفۆکسەوە.</string>
+    <!--  The body for these is the URL of the tab received  -->
+    <string name="fxa_tab_received_notification_name">بازدەر گەیشت</string>
+    <!-- When multiple tabs have been received -->
+    <string name="fxa_tabs_received_notification_name">بازدەرەکان گەیشتن</string>
+
+    <!-- %s is the device name -->
+    <string name="fxa_tab_received_from_notification_name">بازدەر لە %s</string>
+
+    <!-- Advanced Preferences -->
+    <!-- Preference for tracking protection settings -->
+    <string name="preferences_tracking_protection_settings">پارێزگاری لە چاودێری</string>
+    <!-- Preference switch for tracking protection -->
+    <string name="preferences_tracking_protection">پارێزگاری لە چاودێری</string>
+    <!-- Preference switch description for tracking protection -->
+    <string name="preferences_tracking_protection_description">ئەو ناوەڕۆک و سکریپتانە بکە کە چاودێریت دەکەن لەسەر هێڵ</string>
+    <!-- Preference for tracking protection exceptions -->
+    <string name="preferences_tracking_protection_exceptions">هەڵاوێردی</string>
+    <!-- Preference description for tracking protection exceptions -->
+    <string name="preferences_tracking_protection_exceptions_description">پارێزگاری چاودێری ناکارایە بۆ ئەو ماڵپەڕانە</string>
+    <!-- Button in Exceptions Preference to turn on tracking protection for all sites (remove all exceptions) -->
+    <string name="preferences_tracking_protection_exceptions_turn_on_for_all">بیکە کار بۆ هەموو ماڵپەڕەکان</string>
+    <!-- Text displayed when there are no exceptions -->
+    <string name="exceptions_empty_message_description">هەڵاوێردی ڕێگەتپێدەدات کە پارێزگاریکردن لە چاودێری ناکارا بکەیت بۆ چەند ماڵپەڕێکی دیاریکراو.</string>
+    <!-- Text displayed when there are no exceptions, with learn more link that brings users to a tracking protection SUMO page -->
+    <string name="exceptions_empty_message_learn_more_link">زیاتر بزانە</string>
+
+    <!-- Preference switch for Telemetry -->
+    <string name="preferences_telemetry">پێوانەی دووری</string>
+    <!-- Preference switch for usage and technical data collection -->
+    <string name="preference_usage_data">بەکارهێنان و زانیاری تەکنیکی</string>
+    <!-- Preference description for usage and technical data collection -->
+    <string name="preferences_usage_data_description">چوستی وێبگەڕ، بەکارهێنانی و زانیاری خوازراوی وێبگەڕەکەت بڵاوەپێدەکات لەگەڵ مۆزیلا بۆ ئەوەی یارمەتیمان بدات %1$s باشتر بکەین</string>
+    <!-- Preference switch for marketing data collection -->
+    <string name="preferences_marketing_data">زانیاری بازاڕیکردن</string>
+    <!-- Preference description for marketing data collection, parameter is the app name (e.g. Firefox) -->
+    <string name="preferences_marketing_data_description">ئەو زانیارییانە بڵاودەکاتەوە کە چ تایبەتمەندییەک بەکاردێنیت لە %1$s لەگەڵ Leanplum، کە بریتییە لە فرۆشیاری بازاڕی مۆبایل ئێمە کاری لەگەڵ دەکەین.</string>
+    <!-- Preference description for marketing data collection -->
+    <string name="preferences_marketing_data_description2">زانیاری سەرەتایی بڵاودەکاتەوە لەگەڵ Adjust، کە بریتییە لە فرۆشیارێکی ئێمە بۆ بازاڕی مۆبایل.</string>
+    <!-- Title for studies preferences -->
+    <string name="preference_experiments_2">توێژینەوە</string>
+    <!-- Summary for studies preferences -->
+    <string name="preference_experiments_summary_2">ڕێگە بدە مۆزیلا توێژینەوە دابمەزرێنێت و کاری پێبکات</string>
+    <!-- Title for experiments preferences -->
+    <string name="preference_experiments">تاقیکردنەوەکان</string>
+
+    <!-- Summary for experiments preferences -->
+    <string name="preference_experiments_summary">ڕێگەدەدات کە مۆزیلا زانیاری وەدەستبخات دامەزراندن ئەنجام بدات بۆ ئەو تایبەتمەندییە تاقیکارییانەی پێشکەشی دەکەین</string>
+    <!-- Preference switch for crash reporter -->
+    <string name="preferences_crash_reporter">ڕاپۆرت لێدەری تێکشکان</string>
+    <!-- Preference switch for Mozilla location service -->
+    <string name="preferences_mozilla_location_service">خزمەتگوزاری شوێنی مۆزیلا</string>
+    <!-- Preference switch for app health report. The first parameter is the name of the application (For example: Fenix) -->
+    <string name="preferences_fenix_health_report">ڕاپۆرت تەندروستی %s</string>
+
+    <!-- Turn On Sync Preferences -->
+    <!-- Header of the Turn on Sync preference view -->
+    <string name="preferences_sync">هاوکاتگەری پێبکە</string>
+    <!-- Preference for pairing -->
+    <string name="preferences_sync_pair">کۆدی پێکبەستنەوە سکان بکە لە فایەرفۆکس (ڕوومێز)</string>
+    <!-- Preference for account login -->
+    <string name="preferences_sync_sign_in">بچۆژوورەوە</string>
+    <!-- Preference for reconnecting to FxA sync -->
+    <string name="preferences_sync_sign_in_to_reconnect">بچۆژوورەوە بۆ بۆ پەیوەندی گرتنەوە</string>
+    <!-- Preference for removing FxA account -->
+    <string name="preferences_sync_remove_account">هەژمار بسڕەوە</string>
+
+    <!-- Pairing Feature strings -->
+    <!-- Instructions on how to access pairing -->
+    <string name="pair_instructions_2"><![CDATA[کۆدی QR سکان بکە کە لە <b>firefox.com/pair</b> پیشان دەدرێت]]></string>
+    <!-- Button to open camera for pairing -->
+    <string name="pair_open_camera">کامێرا بکەرەوە</string>
+    <!-- Button to cancel pairing -->
+    <string name="pair_cancel">پاشگەزبوونەوە</string>
+
+    <!-- Toolbar Preferences -->
+    <!-- Preference for using top toolbar -->
+    <string name="preference_top_toolbar">سەرەوە</string>
+    <!-- Preference for using bottom toolbar -->
+    <string name="preference_bottom_toolbar">خوارەوە</string>
+
+    <!-- Theme Preferences -->
+    <!-- Preference for using light theme -->
+    <string name="preference_light_theme">ڕوون</string>
+    <!-- Preference for using dark theme -->
+    <string name="preference_dark_theme">تاریک</string>
+    <!-- Preference for using using dark or light theme automatically set by battery -->
+    <string name="preference_auto_battery_theme">دیاریکراوە لە لایەن پارێزەری باتریەوە</string>
+    <!-- Preference for using following device theme -->
+    <string name="preference_follow_device_theme">وەکوو ڕووکاری سیستم</string>
+
+    <!-- Gestures Preferences-->
+    <!-- Preferences for using pull to refresh in a webpage -->
+    <string name="preference_gestures_website_pull_to_refresh">بیخزێنە بۆ نوێکردنەوە</string>
+    <!-- Preference for using the dynamic toolbar -->
+    <string name="preference_gestures_dynamic_toolbar">بیخزێنە بۆ شاردنەوەی توڵامراز</string>
+    <!-- Preference for switching tabs by swiping horizontally on the toolbar -->
+    <string name="preference_gestures_swipe_toolbar_switch_tabs">توڵامراز ببە بۆ لاکان بۆ گۆڕین لە نێوان بازدەرەکان</string>
+
+
+    <!-- Preference for showing the opened tabs by swiping up on the toolbar-->
+    <string name="preference_gestures_swipe_toolbar_show_tabs">توڵامراز ببە بۆ سەرەوە بۆ کردنەوەی بازدەرەکان</string>
+
+    <!-- Library -->
+    <!-- Option in Library to open Sessions page -->
+    <string name="library_sessions">دانیشتنەکان</string>
+    <!-- Option in Library to open Screenshots page -->
+    <string name="library_screenshots">وێنەی ڕووپەر(شاشە)</string>
+    <!-- Option in Library to open Downloads page -->
+    <string name="library_downloads">داگرتنەکان</string>
+    <!-- Option in library to open Bookmarks page -->
+    <string name="library_bookmarks">نیشانەکراوەکان</string>
+    <!-- Option in library to open Desktop Bookmarks root page -->
+    <string name="library_desktop_bookmarks_root">نیشانەکراوەکانی ڕوومێز</string>
+    <!-- Option in library to open Desktop Bookmarks "menu" page -->
+    <string name="library_desktop_bookmarks_menu">پێرستی نیشانەکراوەکان</string>
+    <!-- Option in library to open Desktop Bookmarks "toolbar" page -->
+    <string name="library_desktop_bookmarks_toolbar">توڵامرازی نیشانەکراوەکان</string>
+    <!-- Option in library to open Desktop Bookmarks "unfiled" page -->
+    <string name="library_desktop_bookmarks_unfiled">نیشانکراوەکانی تر</string>
+    <!-- Option in Library to open History page -->
+    <string name="library_history">مێژوو</string>
+    <!-- Option in Library to open a new tab -->
+    <string name="library_new_tab">بازدەری نوێ</string>
+    <!-- Option in Library to find text in page -->
+    <string name="library_find_in_page">لە ناو پەڕە بگەڕێ</string>
+    <!-- Option in Library to open Synced Tabs page -->
+    <string name="library_synced_tabs">بازدەرە هاوکاتپێکراوەکان</string>
+    <!-- Option in Library to open Reading List -->
+    <string name="library_reading_list">لیستەی خوێندراوەکان</string>
+    <!-- Menu Item Label for Search in Library -->
+    <string name="library_search">گەڕان</string>
+    <!-- Settings Page Title -->
+    <string name="settings_title">ڕێکخستنەکان</string>
+    <!-- Content description (not visible, for screen readers etc.): "Menu icon for items on a history item" -->
+    <string name="content_description_history_menu">پێڕستی بڕگەی مێژووی کار</string>
+    <!-- Content description (not visible, for screen readers etc.): "Close button for library settings" -->
+    <string name="content_description_close_button">داخستن</string>
+
+    <!-- Option in library for Recently Closed Tabs -->
+    <string name="library_recently_closed_tabs">کۆتا بازدەری داخراو</string>
+    <!-- Option in library to open Recently Closed Tabs page -->
+    <string name="recently_closed_show_full_history">هەمووی مێژووی کار پیشان بدە</string>
+    <!-- Text to show users they have multiple tabs saved in the Recently Closed Tabs section of history.
+    %d is a placeholder for the number of tabs selected. -->
+    <string name="recently_closed_tabs">%d بازدەر</string>
+    <!-- Text to show users they have one tab saved in the Recently Closed Tabs section of history.
+    %d is a placeholder for the number of tabs selected. -->
+    <string name="recently_closed_tab">%d بازدەر</string>
+    <!-- Recently closed tabs screen message when there are no recently closed tabs -->
+    <string name="recently_closed_empty_message">هیچ بازدەرێکی داخراوی نوێ نیە</string>
+
+    <!-- Tab Management -->
+    <!-- Title of preference for tabs management -->
+    <string name="preferences_tabs">بازدەرەکان</string>
+    <!-- Title of preference that allows a user to specify the tab view -->
+    <string name="preferences_tab_view">پێشبینینی بازدەر</string>
+    <!-- Option for a list tab view -->
+    <string name="tab_view_list">لیست</string>
+    <!-- Option for a grid tab view -->
+    <string name="tab_view_grid">هێڵەکی</string>
+    <!-- Title of preference that allows a user to auto close tabs after a specified amount of time -->
+    <string name="preferences_close_tabs">بازدەرەکان دابخە</string>
+    <!-- Option for auto closing tabs that will never auto close tabs, always allows user to manually close tabs -->
+    <string name="close_tabs_manually">دەستیی</string>
+    <!-- Option for auto closing tabs that will auto close tabs after one day -->
+    <string name="close_tabs_after_one_day">دووای یەک ڕۆژ</string>
+    <!-- Option for auto closing tabs that will auto close tabs after one week -->
+    <string name="close_tabs_after_one_week">دووای یەک هەفتە</string>
+    <!-- Option for auto closing tabs that will auto close tabs after one month -->
+    <string name="close_tabs_after_one_month">دووای یەک مانگ</string>
+
+    <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
+    <string name="close_tabs_manually_summary">داخستنی دەستیی</string>
+    <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
+    <string name="close_tabs_after_one_day_summary">داخستن دووای یەک ڕۆژ</string>
+    <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one week-->
+    <string name="close_tabs_after_one_week_summary">داخستن دووای یەک هەفتە</string>
+    <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one month-->
+    <string name="close_tabs_after_one_month_summary">داخستن دووای یەک مانگ</string>
+
+    <!-- Sessions -->
+    <!-- Title for the list of tabs -->
+    <string name="tab_header_label">بازدەرەکان بکەرەوە</string>
+    <!-- Title for the list of tabs in the current private session -->
+    <string name="tabs_header_private_title">دانیشتنی تایبەت</string>
+    <!-- Title for the list of tabs in the current private session -->
+    <string name="tabs_header_private_tabs_title">بازدەرە تایبەتەکان</string>
+    <!-- Title for the list of tabs in the synced tabs -->
+    <string name="tabs_header_synced_tabs_title">بازدەرە هاوکاتپێکراوەکان</string>
+    <!-- Content description (not visible, for screen readers etc.): Add tab button. Adds a news tab when pressed -->
+    <string name="add_tab">بازدەر زیادبکە</string>
+    <!-- Content description (not visible, for screen readers etc.): Add tab button. Adds a news tab when pressed -->
+    <string name="add_private_tab">بازدەری تایبەت زیاد بکە</string>
+    <!-- Text for the new tab button to indicate adding a new private tab in the tab -->
+    <string name="tab_drawer_fab_content">تایبەت</string>
+    <!-- Text for the new tab button to indicate syncing command on the synced tabs page -->
+    <string name="tab_drawer_fab_sync">هاوکاتگەری</string>
+    <!-- Text shown as the title of the open tab tray -->
+    <string name="tab_tray_title">بازدەرەکان بکەرەوە</string>
+    <!-- Text shown in the menu for saving tabs to a collection -->
+    <string name="tab_tray_menu_item_save">هەڵگرتن لە کۆکەرەوە</string>
+    <!-- Text shown in the menu for the collection selector -->
+    <string name="tab_tray_menu_select">هەڵبژێرە</string>
+    <!-- Text shown in the menu for sharing all tabs -->
+    <string name="tab_tray_menu_item_share">هەموو بازدەرەکانی بڵاوەپێبکە</string>
+    <!-- Text shown in the menu to view recently closed tabs -->
+    <string name="tab_tray_menu_recently_closed">کۆتا بازدەری داخراو</string>
+    <!-- Text shown in the menu to view account settings -->
+    <string name="tab_tray_menu_account_settings">ڕێکخستنی هەژمار</string>
+    <!-- Text shown in the menu to view tab settings -->
+    <string name="tab_tray_menu_tab_settings">ڕێکخستنەکانی بازدەر</string>
+    <!-- Text shown in the menu for closing all tabs -->
+    <string name="tab_tray_menu_item_close">هەموو بازدەرەکان دابخە</string>
+    <!-- Shortcut action to open new tab -->
+    <string name="tab_tray_menu_open_new_tab">بازدەری نوێ</string>
+    <!-- Shortcut action to open the home screen -->
+    <string name="tab_tray_menu_home">بڕۆ پەڕەی سەرەکی</string>
+    <!-- Shortcut action to toggle private mode -->
+    <string name="tab_tray_menu_toggle">دۆخی گۆڕینی بازدەر</string>
+    <!-- Text shown in the multiselect menu for bookmarking selected tabs. -->
+    <string name="tab_tray_multiselect_menu_item_bookmark">نیشانەکراو</string>
+    <!-- Text shown in the multiselect menu for closing selected tabs. -->
+    <string name="tab_tray_multiselect_menu_item_close">داخستن</string>
+    <!-- Content description for tabs tray multiselect share button -->
+    <string name="tab_tray_multiselect_share_content_description">بازدەری دیاریکراو بڵاوبکەرەوە</string>
+    <!-- Content description for tabs tray multiselect menu -->
+    <string name="tab_tray_multiselect_menu_content_description">پێڕستی بازدەری دیاریکراو</string>
+    <!-- Content description (not visible, for screen readers etc.): Removes tab from collection button. Removes the selected tab from collection when pressed -->
+    <string name="remove_tab_from_collection">بازدەر بسڕەوە لە کۆکەرەوە</string>
+    <!-- Text for button to enter multiselect mode in tabs tray -->
+    <string name="tabs_tray_select_tabs">بازدەر دیاریبکە</string>
+    <!-- Content description (not visible, for screen readers etc.): Close tab button. Closes the current session when pressed -->
+    <string name="close_tab">بازدەر دابخە</string>
+    <!-- Content description (not visible, for screen readers etc.): Close tab <title> button. First parameter is tab title  -->
+    <string name="close_tab_title">بازدەری %s دابخە</string>
+    <!-- Content description (not visible, for screen readers etc.): Opens the open tabs menu when pressed -->
+    <string name="open_tabs_menu">پێڕستی بازدەرەکان بکەرەوە</string>
+    <!-- Open tabs menu item to close all tabs -->
+    <string name="tabs_menu_close_all_tabs">هەموو بازدەرەکان دابخە</string>
+    <!-- Open tabs menu item to share all tabs -->
+    <string name="tabs_menu_share_tabs">بازدەرەکان بڵاوبکەرەوە</string>
+    <!-- Open tabs menu item to save tabs to collection -->
+    <string name="tabs_menu_save_to_collection1">بازدەرەکان هەڵبگرە لە کۆکەرەوە</string>
+    <!-- Content description (not visible, for screen readers etc.): Opens the tab menu when pressed -->
+    <string name="tab_menu">پێڕستی بازدەر</string>
+    <!-- Tab menu item to share the tab -->
+    <string name="tab_share">بازدەری بڵاوکردنەوە</string>
+    <!-- Button in the current session menu. Deletes the session when pressed -->
+    <string name="current_session_delete">سڕینەوە</string>
+    <!-- Button in the current session menu. Saves the session when pressed -->
+    <string name="current_session_save">پاشەکەوتکردن</string>
+    <!-- Button in the current session menu. Opens the share menu when pressed -->
+    <string name="current_session_share">بڵاوکردنەوە</string>
+    <!-- Content description (not visible, for screen readers etc.): Title icon for current session menu -->
+    <string name="current_session_image">وێنەی دانیشتنی ئێستا</string>
+    <!-- Button to save the current set of tabs into a collection -->
+    <string name="save_to_collection">هەڵگرتن لە کۆکەرەوە</string>
+    <!-- Text for the menu button to delete a collection -->
+    <string name="collection_delete">کۆکەرەوە بسڕەوە</string>
+    <!-- Text for the menu button to rename a collection -->
+    <string name="collection_rename">ناونانەوەی کۆکەرەوە</string>
+    <!-- Text for the button to open tabs of the selected collection -->
+    <string name="collection_open_tabs">بازدەرەکان بکەرەوە</string>
+    <!-- Hint for adding name of a collection -->
+    <string name="collection_name_hint">ناوی کۆکراوە</string>
+
+
+    <!-- Text for the menu button to rename a top site -->
+	<string name="rename_top_site">دووبارە ناونانەوە</string>
+	<!-- Text for the menu button to remove a top site -->
+	<string name="remove_top_site">بیسڕەوە</string>
+    <!-- Text for the menu button to delete a top site from history -->
+    <string name="delete_from_history">سڕینەوە لە مێژووی کار</string>
+    <!-- Postfix for private WebApp titles, placeholder is replaced with app name -->
+    <string name="pwa_site_controls_title_private">%1$s (دۆخی تایبەت)</string>
+    <!-- Button in the current tab tray header in multiselect mode. Saved the selected tabs to a collection when pressed. -->
+    <string name="tab_tray_save_to_collection">پاشەکەوتکردن</string>
+
+    <!-- History -->
+    <!-- Text for the button to clear all history -->
+    <string name="history_delete_all">مێژووی کار بسڕەوە</string>
+    <!-- Text for the dialog to confirm clearing all history -->
+    <string name="history_delete_all_dialog">ئایا تۆ دڵنیایت کە دەتەویت مێژووی کار پاکبکەیتەوە/بسڕیتەوە؟</string>
+    <!-- Text for the snackbar to confirm that multiple browsing history items has been deleted -->
+    <string name="history_delete_multiple_items_snackbar">مێژوو سڕایەوە</string>
+    <!-- Text for the snackbar to confirm that a single browsing history item has been deleted. The first parameter is the shortened URL of the deleted history item. -->
+    <string name="history_delete_single_item_snackbar">%1$s سڕایەوە</string>
+    <!-- Text for positive action to delete history in deleting history dialog -->
+    <string name="history_clear_dialog">پاککردنەوە</string>
+    <!-- History overflow menu copy button -->
+    <string name="history_menu_copy_button">لەبەرگرتنەوە</string>
+    <!-- History overflow menu share button -->
+    <string name="history_menu_share_button">بڵاوکردنەوە</string>
+    <!-- History overflow menu open in new tab button -->
+    <string name="history_menu_open_in_new_tab_button">کردنەوە لە بازدەری نوێ</string>
+    <!-- History overflow menu open in private tab button -->
+    <string name="history_menu_open_in_private_tab_button">کردنەوە لە بازدەری تایبەت</string>
+    <!-- Text for the button to delete a single history item -->
+    <string name="history_delete_item">سڕینەوە</string>
+    <!-- History multi select title in app bar
+    The first parameter is the number of bookmarks selected -->
+    <string name="history_multi_select_title">%1$d دیاریکراوە</string>
+    <!-- Text for the button to clear selected history items. The first parameter
+        is a digit showing the number of items you have selected -->
+    <string name="history_delete_some">%1$d بڕگە سڕایەوە</string>
+    <!-- Text for the header that groups the history for today -->
+    <string name="history_today">ئەمڕۆ</string>
+    <!-- Text for the header that groups the history for yesterday -->
+    <string name="history_yesterday">دوێنێ</string>
+    <!-- Text for the header that groups the history for last 24 hours -->
+    <string name="history_24_hours">کۆتا 24 کاژێر</string>
+    <!-- Text for the header that groups the history the past 7 days -->
+    <string name="history_7_days">کۆتا 7 ڕۆژ</string>
+    <!-- Text for the header that groups the history the past 30 days -->
+    <string name="history_30_days">کۆتا 30 ڕۆژ</string>
+    <!-- Text for the header that groups the history older than the last month -->
+    <string name="history_older">کۆنتر</string>
+    <!-- Text shown when no history exists -->
+    <string name="history_empty_message">هیچ مێژووییەک نیە</string>
+
+    <!-- Downloads -->
+    <!-- Text for the button to clear all downloads -->
+    <string name="download_delete_all">سڕینەوەی داگرتنەکان</string>
+    <!-- Text for the dialog to confirm clearing all downloads -->
+    <string name="download_delete_all_dialog">ئایا تۆ دڵنیاییت کە دەتەوێت داگرتنەکان پاکبکەیتەوە؟</string>
+    <!-- Text for the snackbar to confirm that multiple downloads items have been removed -->
+    <string name="download_delete_multiple_items_snackbar_1">داگرتنەکان سڕانەوە</string>
+    <!-- Text for the snackbar to confirm that a single download item has been removed. The first parameter is the name of the download item. -->
+    <string name="download_delete_single_item_snackbar">%1$s سڕایەوە</string>
+    <!-- Text shown when no download exists -->
+    <string name="download_empty_message_1">هیچ پەڕەیەکی داگیراو نیە</string>
+    <!-- History multi select title in app bar
+    The first parameter is the number of downloads selected -->
+    <string name="download_multi_select_title">%1$d دیاریکراوە</string>
+    <!-- History overflow menu open in new tab button -->
+    <string name="download_menu_open">کردنەوە</string>
+    <!-- Text for the button to remove a single download item -->
+    <string name="download_delete_item_1">بیسڕەوە</string>
+
+
+    <!-- Crashes -->
+    <!-- Title text displayed on the tab crash page. This first parameter is the name of the application (For example: Fenix) -->
+    <string name="tab_crash_title_2">ببورە. %1$s ناتوانێت ئەو پەڕەیە باربکات.</string>
+    <!-- Description text displayed on the tab crash page -->
+    <string name="tab_crash_description">دەتوانیت هەوڵبدەیت بۆ گێڕانەوە یان ئەم بازدەرەی خوارەوە دابخەیت</string>
+    <!-- Send crash report checkbox text on the tab crash page -->
+    <string name="tab_crash_send_report">ڕاپۆرتی کێشە بنێرە بۆ مۆزیلا</string>
+    <!-- Close tab button text on the tab crash page -->
+    <string name="tab_crash_close">بازدەر دابخە</string>
+    <!-- Restore tab button text on the tab crash page -->
+    <string name="tab_crash_restore">بازدەر بهێنرەوە</string>
+
+    <!-- Content Description for session item menu button -->
+    <string name="content_description_session_menu">هەڵبژاردنەکانی دانیشتن</string>
+
+    <!-- Content Description for session item share button -->
+    <string name="content_description_session_share">دانیشتنی بڵاوکردنەوە</string>
+
+    <!-- Bookmarks -->
+    <!-- Content description for bookmarks library menu -->
+    <string name="bookmark_menu_content_description">پێڕستی نیشانەکراوەکان</string>
+    <!-- Screen title for editing bookmarks -->
+    <string name="bookmark_edit">نیشانەکراوەکان دەستکاریبکە</string>
+    <!-- Screen title for selecting a bookmarks folder -->
+    <string name="bookmark_select_folder">بوخچە هەڵبژێرە</string>
+    <!-- Confirmation message for a dialog confirming if the user wants to delete the selected folder -->
+    <string name="bookmark_delete_folder_confirmation_dialog">ئایا تۆ دڵنیایت دەتەوێت ئەم بوخچەیە بسریتەوە؟</string>
+
+    <!-- Confirmation message for a dialog confirming if the user wants to delete multiple items including folders. Parameter will be replaced by app name. -->
+    <string name="bookmark_delete_multiple_folders_confirmation_dialog">%s برگە دیاریکراوەکان دەسڕێتەوە.</string>
+    <!-- Snackbar title shown after a folder has been deleted. This first parameter is the name of the deleted folder -->
+    <string name="bookmark_delete_folder_snackbar">%1$s سڕایەوە</string>
+    <!-- Screen title for adding a bookmarks folder -->
+    <string name="bookmark_add_folder">بوخچە زیادبکە</string>
+    <!-- Snackbar title shown after a bookmark has been created. -->
+    <string name="bookmark_saved_snackbar">نیشانکراو پاشەکەوتکرا!</string>
+    <!-- Snackbar edit button shown after a bookmark has been created. -->
+    <string name="edit_bookmark_snackbar_action">دەستکاریکردن</string>
+    <!-- Bookmark overflow menu edit button -->
+    <string name="bookmark_menu_edit_button">دەستکاریکردن</string>
+    <!-- Bookmark overflow menu select button -->
+    <string name="bookmark_menu_select_button">هەڵبژێرە</string>
+    <!-- Bookmark overflow menu copy button -->
+    <string name="bookmark_menu_copy_button">لەبەرگرتنەوە</string>
+    <!-- Bookmark overflow menu share button -->
+    <string name="bookmark_menu_share_button">بڵاوکردنەوە</string>
+    <!-- Bookmark overflow menu open in new tab button -->
+    <string name="bookmark_menu_open_in_new_tab_button">کردنەوە لە بازدەری نوێ</string>
+    <!-- Bookmark overflow menu open in private tab button -->
+    <string name="bookmark_menu_open_in_private_tab_button">کردنەوە لە بازدەری تایبەت</string>
+    <!-- Bookmark overflow menu delete button -->
+    <string name="bookmark_menu_delete_button">سڕینەوە</string>
+    <!--Bookmark overflow menu save button -->
+    <string name="bookmark_menu_save_button">پاشەکەوتکردن</string>
+    <!-- Bookmark multi select title in app bar
+     The first parameter is the number of bookmarks selected -->
+    <string name="bookmarks_multi_select_title">%1$d دیاریکراوە</string>
+    <!-- Bookmark editing screen title -->
+    <string name="edit_bookmark_fragment_title">نیشانەکراوەکان دەستکاریبکە</string>
+    <!-- Bookmark folder editing screen title -->
+    <string name="edit_bookmark_folder_fragment_title">بوخچە دەستکاریبکە</string>
+    <!-- Bookmark sign in button message -->
+    <string name="bookmark_sign_in_button">بچۆ ژوورەوە بۆ بینینی نیشانکراوە هاوکاتگەری پێکراوەکان</string>
+    <!-- Bookmark URL editing field label -->
+    <string name="bookmark_url_label">بەستەر</string>
+    <!-- Bookmark FOLDER editing field label -->
+    <string name="bookmark_folder_label">بوخچە</string>
+    <!-- Bookmark NAME editing field label -->
+    <string name="bookmark_name_label">ناو</string>
+    <!-- Bookmark add folder screen title -->
+    <string name="bookmark_add_folder_fragment_label">بوخچە زیادبکە</string>
+    <!-- Bookmark select folder screen title -->
+    <string name="bookmark_select_folder_fragment_label">بوخچە هەڵبژێرە</string>
+    <!-- Bookmark editing error missing title -->
+    <string name="bookmark_empty_title_error">پێویستە ناونیشانی هەبێت</string>
+    <!-- Bookmark editing error missing or improper URL -->
+    <string name="bookmark_invalid_url_error">بەستەر نەگونجاوە</string>
+    <!-- Bookmark screen message for empty bookmarks folder -->
+    <string name="bookmarks_empty_message">هیچ نیشانکراوێک نیە لێرە</string>
+    <!-- Bookmark snackbar message on deletion
+     The first parameter is the host part of the URL of the bookmark deleted, if any -->
+    <string name="bookmark_deletion_snackbar_message">%1$s سڕایەوە</string>
+    <!-- Bookmark snackbar message on deleting multiple bookmarks not including folders-->
+    <string name="bookmark_deletion_multiple_snackbar_message_2">نیشانکراوەکان سڕانەوە</string>
+    <!-- Bookmark snackbar message on deleting multiple bookmarks including folders-->
+    <string name="bookmark_deletion_multiple_snackbar_message_3">بوخچەی دیاریکراو دەسڕدرێتەوە</string>
+    <!-- Bookmark undo button for deletion snackbar action -->
+    <string name="bookmark_undo_deletion">گێڕانەوە</string>
+
+    <!-- Site Permissions -->
+    <!-- Site permissions preferences header -->
+    <string name="permissions_header">ڕێگەپێدانەکان</string>
+    <!-- Button label that take the user to the Android App setting -->
+    <string name="phone_feature_go_to_settings">بڕۆ بۆ ڕێکخستنەکان</string>
+    <!-- Content description (not visible, for screen readers etc.): Quick settings sheet
+        to give users access to site specific information / settings. For example:
+        Secure settings status and a button to modify site permissions -->
+    <string name="quick_settings_sheet">شیتی ڕێکخستنی خێرا</string>
+    <!-- Label that indicates that this option it the recommended one -->
+    <string name="phone_feature_recommended">پێشنیارکراو</string>
+    <!-- button that allows editing site permissions settings -->
+    <string name="quick_settings_sheet_manage_site_permissions">بەڕێوەبردنی ڕێگەپێدانەکانی ماڵپەڕ</string>
+    <!-- Button label for clearing all the information of site permissions-->
+    <string name="clear_permissions">ڕێگەپێدانەکان پاکبکەرەوە</string>
+    <!-- Button label for clearing a site permission-->
+    <string name="clear_permission">ڕێگەپێدانەکان پاکبکەرەوە</string>
+    <!-- Button label for clearing all the information on all sites-->
+    <string name="clear_permissions_on_all_sites">ڕێگەپێدانەکان پاکبکەرەوە لە هەموو ماڵپەڕەکان</string>
+    <!-- Preference for altering video and audio autoplay for all websites -->
+    <string name="preference_browser_feature_autoplay">خۆپێکردن</string>
+    <!-- Preference for altering the camera access for all websites -->
+    <string name="preference_phone_feature_camera">کامێرا</string>
+    <!-- Preference for altering the microphone access for all websites -->
+    <string name="preference_phone_feature_microphone">مایکرۆفۆن</string>
+    <!-- Preference for altering the location access for all websites -->
+    <string name="preference_phone_feature_location">شوێن</string>
+    <!-- Preference for altering the notification access for all websites -->
+    <string name="preference_phone_feature_notification">ئاگانامەکان</string>
+    <!-- Preference for altering the persistent storage access for all websites -->
+    <string name="preference_phone_feature_persistent_storage">بیرگەی هەمیشەیی</string>
+    <!-- Preference for altering the EME access for all websites -->
+    <string name="preference_phone_feature_media_key_system_access">ناوەڕۆکی کۆنتڕۆڵکراوی DRM</string>
+    <!-- Label that indicates that a permission must be asked always -->
+    <string name="preference_option_phone_feature_ask_to_allow">داوای ڕێگەپێدان بکە</string>
+    <!-- Label that indicates that a permission must be blocked -->
+    <string name="preference_option_phone_feature_blocked">بلۆککراوە</string>
+    <!-- Label that indicates that a permission must be allowed -->
+    <string name="preference_option_phone_feature_allowed">ڕێگەپێدراوە</string>
+    <!--Label that indicates a permission is by the Android OS-->
+    <string name="phone_feature_blocked_by_android">بلۆککراوە لە لایەن ئەندرۆیدەوە</string>
+    <!-- Preference for showing a list of websites that the default configurations won't apply to them -->
+    <string name="preference_exceptions">هەڵاوێردییەکان</string>
+    <!-- Summary of tracking protection preference if tracking protection is set to on -->
+    <string name="tracking_protection_on">کارا</string>
+    <!-- Summary of tracking protection preference if tracking protection is set to off -->
+    <string name="tracking_protection_off">ناکارا</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is allowed -->
+    <string name="preference_option_autoplay_allowed2">ڕێگەبدە بە دەنگ و ڕەنگ</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">ڕێگەبدە بە دەنگ و ڕەنگ</string>
+    <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
+    <string name="preference_option_autoplay_allowed_wifi_only2">دەنگ و ڕەنگ بلۆک بکە تەنها لە کاتی بەکارهێنانی ئینتەرنێتی مۆبایل (دەستی)</string>
+    <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
+    <string name="preference_option_autoplay_allowed_wifi_subtext">دەنگ و ڕەنگ کاردەکەن لە وای-فای</string>
+    <!-- Label for global setting that indicates that video autoplay is allowed, but audio autoplay is blocked -->
+    <string name="preference_option_autoplay_block_audio2">تەنها دەنگ بلۆک بکە</string>
+    <!-- Label for site specific setting that indicates that video autoplay is allowed, but audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_block_audio">تەنها دەنگ بلۆک بکە</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
+    <string name="preference_option_autoplay_blocked3">دەنگ و ڕەنگ بلۆک بکە</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">دەنگ و ڕەنگ بلۆک بکە</string>
+    <!-- Summary of delete browsing data on quit preference if it is set to on -->
+    <string name="delete_browsing_data_quit_on">کارا</string>
+    <!-- Summary of delete browsing data on quit preference if it is set to off -->
+    <string name="delete_browsing_data_quit_off">ناکارا</string>
+
+    <!-- Collections -->
+    <!-- Collections header on home fragment -->
+    <string name="collections_header">کۆکەرەوەکان</string>
+    <!-- Content description (not visible, for screen readers etc.): Opens the collection menu when pressed -->
+    <string name="collection_menu_button_content_description">پێڕستی کۆکەرەوەکان</string>
+
+    <!-- Title for the "select tabs" step of the collection creator -->
+    <string name="create_collection_select_tabs">بازدەرەکان دیاریبکە</string>
+    <!-- Title for the "select collection" step of the collection creator -->
+    <string name="create_collection_select_collection">کۆکەرەوە هەڵبژێرە</string>
+    <!-- Title for the "name collection" step of the collection creator -->
+    <string name="create_collection_name_collection">کۆکەرەوە ناوبنی</string>
+    <!-- Button to add new collection for the "select collection" step of the collection creator -->
+    <string name="create_collection_add_new_collection">کۆکەرەوەیەکی نوێ زیادبکە</string>
+    <!-- Button to select all tabs in the "select tabs" step of the collection creator -->
+    <string name="create_collection_select_all">هەمووی دیاریبکە</string>
+    <!-- Button to deselect all tabs in the "select tabs" step of the collection creator -->
+    <string name="create_collection_deselect_all">دیاریکردنی هەموو لابدە</string>
+    <!-- Text to prompt users to select the tabs to save in the "select tabs" step of the collection creator -->
+    <string name="create_collection_save_to_collection_empty">بازدەر هەڵبژیرە بە هەڵگرتن</string>
+    <!-- Text to show users how many tabs they have selected in the "select tabs" step of the collection creator.
+     %d is a placeholder for the number of tabs selected. -->
+    <string name="create_collection_save_to_collection_tabs_selected">%d بازدەر دیاریکراوە</string>
+    <!-- Text to show users they have one tab selected in the "select tabs" step of the collection creator.
+    %d is a placeholder for the number of tabs selected. -->
+    <string name="create_collection_save_to_collection_tab_selected">%d بازدەر دیاریکراوە</string>
+    <!-- Text shown in snackbar when multiple tabs have been saved in a collection -->
+    <string name="create_collection_tabs_saved">بازدەرەکان پاشەکەوتکرا!</string>
+    <!-- Text shown in snackbar when one or multiple tabs have been saved in a new collection -->
+    <string name="create_collection_tabs_saved_new_collection">کۆکەرەوە پاشەکەوتکرا!</string>
+    <!-- Text shown in snackbar when one tab has been saved in a collection -->
+    <string name="create_collection_tab_saved">بازدەر پاشەکەوتکرا!</string>
+    <!-- Content description (not visible, for screen readers etc.): button to close the collection creator -->
+    <string name="create_collection_close">داخستن</string>
+    <!-- Button to save currently selected tabs in the "select tabs" step of the collection creator-->
+    <string name="create_collection_save">پاشەکەوتکردن</string>
+    <!-- Snackbar action to view the collection the user just created or updated -->
+    <string name="create_collection_view">پیشاندان</string>
+
+    <!-- Default name for a new collection in "name new collection" step of the collection creator. %d is a placeholder for the number of collections-->
+    <string name="create_collection_default_name">کۆکەرەوەی %d</string>
+
+    <!-- Share -->
+    <!-- Share screen header -->
+    <string name="share_header">بینێرە و بڵاویبکەرەوە</string>
+    <!-- Share screen header -->
+    <string name="share_header_2">بڵاوکردنەوە</string>
+    <!-- Content description (not visible, for screen readers etc.):
+        "Share" button. Opens the share menu when pressed. -->
+    <string name="share_button_content_description">بڵاوکردنەوە</string>
+    <!-- Sub-header in the dialog to share a link to another app -->
+    <string name="share_link_subheader">بەستەر بڵاوبکەرەوە</string>
+    <!-- Sub-header in the dialog to share a link to another sync device -->
+    <string name="share_device_subheader">بینێرە بۆ ئامێر</string>
+    <!-- Sub-header in the dialog to share a link to an app from the full list -->
+    <string name="share_link_all_apps_subheader">هەموو کردارەکان</string>
+    <!-- Sub-header in the dialog to share a link to an app from the most-recent sorted list -->
+    <string name="share_link_recent_apps_subheader">دووا بەکارهێنراو</string>
+    <!-- An option from the three dot menu to into sync -->
+    <string name="sync_menu_sign_in">بۆ هاوکاتکردن بچۆژوورەوە</string>
+    <!-- An option from the share dialog to sign into sync -->
+    <string name="sync_sign_in">بچۆژوورەوە بۆ هاوکاتگەری</string>
+    <!-- An option from the share dialog to send link to all other sync devices -->
+    <string name="sync_send_to_all">بینێرە بۆ هەموو ئامێرەکان</string>
+    <!-- An option from the share dialog to reconnect to sync -->
+    <string name="sync_reconnect">بیبەستەرەوە بۆ هاوکاتگەری</string>
+    <!-- Text displayed when sync is offline and cannot be accessed -->
+    <string name="sync_offline">دەرهێڵ</string>
+    <!-- An option to connect additional devices -->
+    <string name="sync_connect_device">پەیوەندی بکە بە ئامێرێکی تر</string>
+    <!-- The dialog text shown when additional devices are not available -->
+    <string name="sync_connect_device_dialog">بۆ ناردنی بازدەر، پێویستە بەلایەنی کەمەوە بچیتە ژوورەوە لە ئامێرێکی تری فایەرفۆکس.</string>
+    <!-- Confirmation dialog button -->
+    <string name="sync_confirmation_button">تێگەیشتم</string>
+
+    <!-- Share error message -->
+    <string name="share_error_snackbar">ناتوانرێت بڵاوبکرێتەوە بۆ ئەم بەرنامەیە</string>
+    <!-- Add new device screen title -->
+    <string name="sync_add_new_device_title">بینێرە بۆ ئامێر</string>
+    <!-- Text for the warning message on the Add new device screen -->
+    <string name="sync_add_new_device_message">هیچ ئامێرێک پەیوەست نیە</string>
+    <!-- Text for the button to learn about sending tabs -->
+    <string name="sync_add_new_device_learn_button">زیاتر بزانە دەربارەی ناردنی بازدەرەکان...</string>
+    <!-- Text for the button to connect another device -->
+    <string name="sync_add_new_device_connect_button">پەیوەندی بکە بە ئامێرێکی تر...</string>
+
+    <!-- Notifications -->
+    <!-- The user visible name of the "notification channel" (Android 8+ feature) for the ongoing notification shown while a browsing session is active. -->
+    <string name="notification_pbm_channel_name">دانیشتنی گەڕانی تایبەت</string>
+    <!-- Text shown in the notification that pops up to remind the user that a private browsing session is active. -->
+    <string name="notification_pbm_delete_text">بازدەری تایبەت بسڕەوە</string>
+    <!-- Text shown in the notification that pops up to remind the user that a private browsing session is active. -->
+    <string name="notification_pbm_delete_text_2">بازدەری تایبەت دابخە</string>
+    <!-- Notification action to open Fenix and resume the current browsing session. -->
+    <string name="notification_pbm_action_open">کردنەوە</string>
+    <!-- Notification action to delete all current private browsing sessions AND switch to Fenix (bring it to the foreground) -->
+    <string name="notification_pbm_action_delete_and_open">سڕینەوە و کردنەوە</string>
+    <!-- Name of the "Powered by Fenix" notification channel. Displayed in the "App notifications" system settings for the app -->
+    <string name="notification_powered_by_channel_name">پشتگیریکراوە لە لایەن</string>
+    <!-- Text shown in snackbar when user deletes a collection -->
+    <string name="snackbar_collection_deleted">کۆکەرەوە سڕایەوە</string>
+    <!-- Text shown in snackbar when user renames a collection -->
+    <string name="snackbar_collection_renamed">کۆکەرەوە ناولێنرایەوە</string>
+    <!-- Text shown in snackbar when user deletes a tab -->
+    <string name="snackbar_tab_deleted">بازدەر سڕایەوە</string>
+    <!-- Text shown in snackbar when user deletes all tabs -->
+    <string name="snackbar_tabs_deleted">بازدەرەکان سڕانەوە</string>
+    <!-- Text shown in snackbar when user closes a tab -->
+    <string name="snackbar_tab_closed">بازدەر داخرا</string>
+    <!-- Text shown in snackbar when user closes all tabs -->
+    <string name="snackbar_tabs_closed">بازدەرەکان داخران</string>
+    <!-- Text shown in snackbar when user closes tabs -->
+    <string name="snackbar_message_tabs_closed">بازدەرەکان داخران!</string>
+    <!-- Text shown in snackbar when user bookmarks a list of tabs -->
+    <string name="snackbar_message_bookmarks_saved">نیشانەکراو هەڵگیرا!</string>
+    <!-- Text shown in snackbar action for viewing bookmarks -->
+    <string name="snackbar_message_bookmarks_view">پیشاندان</string>
+    <!-- Text shown in snackbar when user adds a site to top sites -->
+    <string name="snackbar_added_to_top_sites">زیادکرا بۆ ماڵپەڕە بەرزەکان</string>
+    <!-- Text shown in snackbar when user closes a private tab -->
+    <string name="snackbar_private_tab_closed">بازدەری تایبەت داخرا</string>
+    <!-- Text shown in snackbar when user closes all private tabs -->
+    <string name="snackbar_private_tabs_closed">بازدەرە تایبەتەکان داخران</string>
+    <!-- Text shown in snackbar when user deletes all private tabs -->
+    <string name="snackbar_private_tabs_deleted">بازدەرە تایبەتەکان سڕانەوە</string>
+    <!-- Text shown in snackbar to undo deleting a tab, top site or collection -->
+    <string name="snackbar_deleted_undo">گێڕانەوە</string>
+    <!-- Text shown in snackbar when user removes a top site -->
+    <string name="snackbar_top_site_removed">ماڵپەڕ سڕایەوە</string>
+    <!-- Text for action to undo deleting a tab or collection shown in a11y dialog -->
+    <string name="a11y_dialog_deleted_undo">گەڕانەوە</string>
+    <!-- Text for action to confirm deleting a tab or collection shown in a11y dialog -->
+    <string name="a11y_dialog_deleted_confirm">دڵنیابوونەوە</string>
+    <!-- QR code scanner prompt which appears after scanning a code, but before navigating to it
+        First parameter is the name of the app, second parameter is the URL or text scanned-->
+    <string name="qr_scanner_confirmation_dialog_message">ڕێگەبدە %1$s کە %2$s بکاتەوە</string>
+    <!-- QR code scanner prompt dialog positive option to allow navigation to scanned link -->
+    <string name="qr_scanner_dialog_positive">ڕێگەپێدان</string>
+    <!-- QR code scanner prompt dialog positive option to deny navigation to scanned link -->
+    <string name="qr_scanner_dialog_negative">ڕێگەنەدان</string>
+    <!-- Tab collection deletion prompt dialog message. Placeholder will be replaced with the collection name -->
+    <string name="tab_collection_dialog_message">ئایا تۆ دڵنیایت کە دەتەوێت %1$s بسڕیتەوە؟</string>
+
+    <!-- Collection and tab deletion prompt dialog message. This will show when the last tab from a collection is deleted -->
+    <string name="delete_tab_and_collection_dialog_message">سڕینەوەی ئەم بازدەرە هەموو کۆکەرەوەکە دەسڕێتەوە. دەتوانیت کۆکەرەوەیەکی تر درووست بکەیت لە هەر کاتێکی تردا.</string>
+    <!-- Collection and tab deletion prompt dialog title. Placeholder will be replaced with the collection name. This will show when the last tab from a collection is deleted -->
+    <string name="delete_tab_and_collection_dialog_title">%1$s دەسڕیتەوە؟</string>
+    <!-- Tab collection deletion prompt dialog option to delete the collection -->
+    <string name="tab_collection_dialog_positive">سڕینەوە</string>
+    <!-- Tab collection deletion prompt dialog option to cancel deleting the collection -->
+    <string name="tab_collection_dialog_negative">پاشگەزبوونەوە</string>
+    <!-- Text displayed in a notification when the user enters full screen mode -->
+    <string name="full_screen_notification">چوونە دۆخی پراوپڕی شاشە</string>
+    <!-- Message for copying the URL via long press on the toolbar -->
+    <string name="url_copied">بەستەر لەبەرگیرا</string>
+    <!-- Sample text for accessibility font size -->
+    <string name="accessibility_text_size_sample_text_1">ئەم دەقێکی نمونەییە. لێرە پیشان دەدرێت بۆ ئەوەی بزانی چۆن دەردەچێت کاتێک قەبارەی نووسدینەکە زیاد و کەم دەکەیت.</string>
+    <!-- Summary for Accessibility Text Size Scaling Preference -->
+    <string name="preference_accessibility_text_size_summary">وابکە دەقەکان لە ماڵپەڕەکان گەورەتر یان بچووکتر بن</string>
+    <!-- Title for Accessibility Text Size Scaling Preference -->
+    <string name="preference_accessibility_font_size_title">قەبارەی جۆرەپیت</string>
+
+    <!-- Title for Accessibility Text Automatic Size Scaling Preference -->
+    <string name="preference_accessibility_auto_size_2">قەبارەۆێدانی خۆکاری دەقەکان</string>
+    <!-- Summary for Accessibility Text Automatic Size Scaling Preference -->
+    <string name="preference_accessibility_auto_size_summary">قەبارەی جۆرەپیت خۆی دەگونجێنێت لەگەڵ ڕێکخستنەکانی ئەندرۆید، ناکارای بکە بۆ ئەوەی خۆت ئەنجامی بدەیت.</string>
+
+    <!-- Title for the Delete browsing data preference -->
+    <string name="preferences_delete_browsing_data">سڕێنەوەی زانیاری گەڕان</string>
+    <!-- Title for the tabs item in Delete browsing data -->
+    <string name="preferences_delete_browsing_data_tabs_title_2">بازدەرەکان بکەرەوە</string>
+    <!-- Subtitle for the tabs item in Delete browsing data, parameter will be replaced with the number of open tabs -->
+    <string name="preferences_delete_browsing_data_tabs_subtitle">%d بازدەر</string>
+    <!-- Title for the data and history items in Delete browsing data -->
+    <string name="preferences_delete_browsing_data_browsing_data_title">مێژووی گەڕان و زانیاری ماڵپەڕ</string>
+    <!-- Subtitle for the data and history items in delete browsing data, parameter will be replaced with the
+        number of history items the user has -->
+    <string name="preferences_delete_browsing_data_browsing_data_subtitle">%d ناونیشان</string>
+    <!-- Title for history items in Delete browsing data -->
+    <string name="preferences_delete_browsing_data_browsing_history_title">مێژوو</string>
+    <!-- Subtitle for the history items in delete browsing data, parameter will be replaced with the
+        number of history pages the user has -->
+    <string name="preferences_delete_browsing_data_browsing_history_subtitle">%d پەڕە</string>
+    <!-- Title for the cookies item in Delete browsing data -->
+    <string name="preferences_delete_browsing_data_cookies">شەکرۆکەکان</string>
+    <!-- Subtitle for the cookies item in Delete browsing data -->
+    <string name="preferences_delete_browsing_data_cookies_subtitle">تۆ دەچیتە دەرەوە لە زۆربەی ماڵپەڕەکان</string>
+    <!-- Title for the cached images and files item in Delete browsing data -->
+    <string name="preferences_delete_browsing_data_cached_files">پەڕگە و وێنەی حەشاردراو</string>
+    <!-- Subtitle for the cached images and files item in Delete browsing data -->
+    <string name="preferences_delete_browsing_data_cached_files_subtitle">بۆشایی بیرگە زیاتر دەکات</string>
+    <!-- Title for the site permissions item in Delete browsing data -->
+    <string name="preferences_delete_browsing_data_site_permissions">ڕێگەپێدانەکانی ماڵپەڕ</string>
+    <!-- Title for the downloads item in Delete browsing data -->
+    <string name="preferences_delete_browsing_data_downloads">داگرتنەکان</string>
+    <!-- Text for the button to delete browsing data -->
+    <string name="preferences_delete_browsing_data_button">سڕینەوەی زانیاری گەڕان</string>
+    <!-- Title for the Delete browsing data on quit preference -->
+    <string name="preferences_delete_browsing_data_on_quit">سڕێنەوەی زانیاری گەڕان دووای دەرچوون</string>
+    <!-- Summary for the Delete browsing data on quit preference. "Quit" translation should match delete_browsing_data_on_quit_action translation. -->
+    <string name="preference_summary_delete_browsing_data_on_quit">خۆکارانەوە زانیارییەکانی گەڕان دەسڕێتەوە کاتێک دەردەچیت لە پێڕستی سەرەکیەوە</string>
+    <!-- Summary for the Delete browsing data on quit preference. "Quit" translation should match delete_browsing_data_on_quit_action translation. -->
+    <string name="preference_summary_delete_browsing_data_on_quit_2">خۆکارانەوە زانیارییەکانی گەڕان دەسڕێتەوە کاتێک دەردەچیت لە پێڕستی سەرەکیەوە</string>
+    <!-- Action item in menu for the Delete browsing data on quit feature -->
+    <string name="delete_browsing_data_on_quit_action">وازهێنان</string>
+
+    <!-- Dialog message to the user asking to delete browsing data. -->
+    <string name="delete_browsing_data_prompt_message">ئەمە هەموو زانیارییەکانی گەڕانت دەسڕێتەوە</string>
+    <!-- Dialog message to the user asking to delete browsing data. Parameter will be replaced by app name. -->
+    <string name="delete_browsing_data_prompt_message_3">%s زانیاری گەڕانی دیاریکراو دەسڕێتەوە.</string>
+    <!-- Text for the cancel button for the data deletion dialog -->
+    <string name="delete_browsing_data_prompt_cancel">پاشگەزبوونەوە</string>
+
+    <!-- Text for the allow button for the data deletion dialog -->
+    <string name="delete_browsing_data_prompt_allow">سڕینەوە</string>
+    <!-- Text for the snackbar confirmation that the data was deleted -->
+    <string name="preferences_delete_browsing_data_snackbar">زانیاری گەڕان سڕایەوە</string>
+    <!-- Text for the snackbar to show the user that the deletion of browsing data is in progress -->
+    <string name="deleting_browsing_data_in_progress">سڕینەوەی زانیارییەکانی گەڕان...</string>
+
+    <!-- Tips -->
+    <!-- text for firefox preview moving tip header "Firefox Preview" and "Firefox Nightly" are intentionally hardcoded -->
+    <string name="tip_firefox_preview_moved_header">Firefox Preview ئێستا بووە بە Firefox Nightly</string>
+    <!-- text for firefox preview moving tip button. "Firefox for Android Beta" is intentionally hardcoded -->
+    <string name="tip_firefox_preview_moved_button_2">فایەرفۆکسی بێتا بەدەست بێنە بۆ ئەندرۆید</string>
+
+    <!-- text for firefox preview moving tip header. "Firefox Nightly" is intentionally hardcoded -->
+    <string name="tip_firefox_preview_moved_header_preview_installed">فایەرفۆکسی شەوانەیی(nightly) لێرە گوازرایەوە</string>
+    <!-- text for firefox preview moving tip button  -->
+    <string name="tip_firefox_preview_moved_button_preview_installed">بچۆ وەشانی نوێی شەوانەیی (Nightly)</string>
+
+    <!-- text for firefox preview moving tip header. "Firefox Nightly" is intentionally hardcoded -->
+    <string name="tip_firefox_preview_moved_header_preview_not_installed">فایەرفۆکسی شەوانەیی(nightly) لێرە گوازرایەوە</string>
+    <!-- text for firefox preview moving tip button  -->
+    <string name="tip_firefox_preview_moved_button_preview_not_installed">شەوانەیی (Nightly) نوێ بەدەست بهێنە</string>
+
+    <!-- Onboarding -->
+    <!-- Text for onboarding welcome message
+    The first parameter is the name of the app (e.g. Firefox Preview) -->
+    <string name="onboarding_header">بەخێربێی بۆ %s!</string>
+    <!-- text for the Firefox Accounts section header -->
+    <string name="onboarding_fxa_section_header">پێشتر هەژمارت هەبووە؟</string>
+    <!-- text for the "What's New" onboarding card header -->
+    <string name="onboarding_whats_new_header1">بزانە چی نوێ هەیە</string>
+    <!-- text for the "what's new" onboarding card description
+    The first parameter is the short name of the app (e.g. Firefox) -->
+    <string name="onboarding_whats_new_description">پرسیارت هەیە دەربارەی نوێکردنەوەی ڕووکاری %s؟ دەتەوێت بزانیت چی گۆڕاوە؟</string>
+    <!-- text for underlined clickable link that is part of "what's new" onboarding card description that links to an FAQ -->
+    <string name="onboarding_whats_new_description_linktext">وەڵامەکان لێرە بەدەست بهێنە</string>
+    <!-- text for the Firefox account onboarding sign in card header. The word "Firefox" should not be translated -->
+    <string name="onboarding_account_sign_in_header_1">فایەرفۆکس هاوکاتگەری پێبکە لە نێوان ئامێرەکان</string>
+    <!-- Text for the button to learn more about signing in to your Firefox account -->
+    <string name="onboarding_manual_sign_in_description">نیشانکراوەکان، مێژووی کار، و وشەی تێپەڕەکان بهێنە بۆ ئەم ئامێرە.</string>
+    <!-- text for the button to confirm automatic sign-in -->
+    <string name="onboarding_firefox_account_auto_signin_confirm">بەڵێ، بمکە ژوورەوە</string>
+    <!-- text for the automatic sign-in button while signing in is in process -->
+    <string name="onboarding_firefox_account_signing_in">دەچیتە ژوورەوە...</string>
+    <!-- text for the button to manually sign into Firefox account. -->
+    <string name="onboarding_firefox_account_sign_in_1">خۆتۆمارکردن</string>
+    <!-- text for the button to stay signed out when presented with an option to automatically sign-in. -->
+    <string name="onboarding_firefox_account_stay_signed_out">بە دەرچووی بمێنەرەوە</string>
+    <!-- text to display in the snackbar once account is signed-in -->
+    <string name="onboarding_firefox_account_sync_is_on">هاوکاتگەری کارایە</string>
+    <!-- text to display in the snackbar if automatic sign-in fails. user may try again -->
+    <string name="onboarding_firefox_account_automatic_signin_failed">نەتوانرا بچیتە ژوورەوە</string>
+    <!-- text for the tracking protection onboarding card header -->
+    <string name="onboarding_tracking_protection_header_3">هەموو-کات لەسەر تایبەتیی</string>
+    <!-- text for the tracking protection card description. 'Firefox' intentionally hardcoded here -->
+    <string name="onboarding_tracking_protection_description_3">فایەرفۆکس خۆکارانە کۆمپانیاکان ڕادەگرێت لەوەی چاودێریت بکەن لەسەر وێب.</string>
+    <!-- text for tracking protection radio button option for standard level of blocking -->
+    <string name="onboarding_tracking_protection_standard_button_2">ئاسایی (بنەڕەتیی)</string>
+
+    <!-- text for standard blocking option button description -->
+    <string name="onboarding_tracking_protection_standard_button_description_3">هاوتایی لەنێوان چوستی و تایبەتیی. پەڕەکان ئاسایی باردەکرێن.</string>
+    <!-- text for tracking protection radio button option for strict level of blocking -->
+    <string name="onboarding_tracking_protection_strict_button">پتەو (پێشنیازکراو)</string>
+    <!-- text for tracking protection radio button option for strict level of blocking -->
+    <string name="onboarding_tracking_protection_strict_option">پتەو</string>
+    <!-- text for strict blocking option button description -->
+    <string name="onboarding_tracking_protection_strict_button_description_3">چاودێریکەران بلۆک دەکات بۆ پەڕەکان زووتر باردەکرێن. بەڵام لەوانەیە هەندێ کرداری ناو ماڵپەڕەکان بوەستێت.</string>
+    <!-- text for the toolbar position card header  -->
+    <string name="onboarding_toolbar_placement_header_1">شوێنی توڵامراز هەڵبژێرە</string>
+    <!-- text for the toolbar position card description -->
+    <string name="onboarding_toolbar_placement_description_1">توڵامراز بکەرە شوێنێک زوو دەستت پێیبگات، لە خوارەوە، یان بیخە سەرەوە.</string>
+    <!-- text for the private browsing onboarding card header -->
+    <string name="onboarding_private_browsing_header">بگەڕێ بە تایبەتیی (شاراوەیی)</string>
+    <!-- text for the private browsing onboarding card description
+    The first parameter is an icon that represents private browsing -->
+    <string name="onboarding_private_browsing_description1">یەکسەر بازدەرێکی تایبەت بکەرەوە: پەنجە بنێ بە وێنۆچکەی %s.</string>
+    <!-- text for the private browsing onboarding card description, explaining how to always using private browsing -->
+    <string name="onboarding_private_browsing_always_description">بازدەری تایبەت هەموو کات بکەرەوە: ڕێکخستنەکانی گەڕانی تایبەتی نوێبکەرەوە.</string>
+    <!-- text for the private browsing onbording card button, that launches settings -->
+    <string name="onboarding_private_browsing_button">ڕێکخستنەکان بکەرەوە</string>
+    <!-- text for the privacy notice onboarding card header -->
+    <string name="onboarding_privacy_notice_header">تایبەتێتی بکەرەوە</string>
+    <!-- text for the privacy notice onboarding card description
+    The first parameter is the name of the app (e.g. Firefox Preview) Substitute %s for long browser name. -->
+    <string name="onboarding_privacy_notice_description2">ئێمە %s داڕشتووە بەشێوەیەک بتوانیت کۆنتڕۆڵی ئەوە بکەیت چی لەسەرهێڵ بڵاوبکەیتەوە یان چی لەگەڵ ئێمە بڵاوبکەیتەوە.</string>
+    <!-- Text for the button to read the privacy notice -->
+    <string name="onboarding_privacy_notice_read_button">تێبینییەکانی تایبەتێتی بخوێنەوە</string>
+    <!-- Content description (not visible, for screen readers etc.): Close onboarding screen -->
+    <string name="onboarding_close">داخستن</string>
+
+    <!-- text for the button to finish onboarding -->
+    <string name="onboarding_finish">دەستبکە بە گەڕان</string>
+
+    <!-- Onboarding theme -->
+    <!-- text for the theme picker onboarding card header -->
+    <string name="onboarding_theme_picker_header">ڕووکار هەڵبژێرە</string>
+    <!-- text for the theme picker onboarding card description -->
+    <string name="onboarding_theme_picker_description_2">هەندێک وزەی پاتری و چاوت بپارێزە لەڕێگەی دۆخی ڕووکاری تاریکەوە.</string>
+    <!-- Automatic theme setting (will follow device setting) -->
+    <string name="onboarding_theme_automatic_title">خۆکار</string>
+    <!-- Summary of automatic theme setting (will follow device setting) -->
+    <string name="onboarding_theme_automatic_summary">دەگونجێت بەپێی ڕێکخستنی ئامێرەکەت</string>
+    <!-- Theme setting for dark mode -->
+    <string name="onboarding_theme_dark_title">ڕووکاری تاریک</string>
+    <!-- Theme setting for light mode -->
+    <string name="onboarding_theme_light_title">ڕووکاری ڕوون</string>
+
+    <!-- Text shown in snackbar when multiple tabs have been sent to device -->
+    <string name="sync_sent_tabs_snackbar">بازدەرەکان نێردران!</string>
+    <!-- Text shown in snackbar when one tab has been sent to device  -->
+    <string name="sync_sent_tab_snackbar">بازدەر نێردرا!</string>
+    <!-- Text shown in snackbar when sharing tabs failed  -->
+    <string name="sync_sent_tab_error_snackbar">نەتوانرا بنێردرێت</string>
+    <!-- Text shown in snackbar for the "retry" action that the user has after sharing tabs failed -->
+    <string name="sync_sent_tab_error_snackbar_action">هەوڵ بدەرەوە</string>
+    <!-- Title of QR Pairing Fragment -->
+    <string name="sync_scan_code">کۆدەکە سکان بکە</string>
+    <!-- Instructions on how to access pairing -->
+    <string name="sign_in_instructions"><![CDATA[لەسەر کۆمپیوتەرەکەت فایەرفۆکس بکەرەوە بچۆ <b>https://firefox.com/pair</b>]]></string>
+    <!-- Text shown for sign in pairing when ready -->
+    <string name="sign_in_ready_for_scan">ئامادەیە بۆ سکان</string>
+    <!-- Text shown for settings option for sign with pairing -->
+    <string name="sign_in_with_camera">بچۆ ژوورەوە لەرێگەی کامێراکەتەوە</string>
+    <!-- Text shown for settings option for sign with email -->
+    <string name="sign_in_with_email">دەتوانیت پۆستی ئەلیکترۆنی بەکارببەیت</string>
+
+    <!-- Text shown for settings option for create new account text.'Firefox' intentionally hardcoded here.-->
+    <string name="sign_in_create_account_text"><![CDATA[هەژمارت نیە؟ <u> دانەیەک درووست بکە</u> بۆ هاوکاتگەری پێکردن لەنێوان ئامێرەکان.]]></string>
+    <!-- Option to continue signing out of account shown in confirmation dialog to sign out of account -->
+    <string name="sign_out_disconnect">دەرچوون</string>
+    <!-- Option to cancel signing out shown in confirmation dialog to sign out of account -->
+    <string name="sign_out_cancel">پاشگەزبوونەوە</string>
+    <!-- Error message snackbar shown after the user tried to select a default folder which cannot be altered -->
+    <string name="bookmark_cannot_edit_root">ناتوانرێت بوخچەی بنەڕەتی دەستکاریبکرێت</string>
+
+    <!-- Enhanced Tracking Protection -->
+    <!-- Link displayed in enhanced tracking protection panel to access tracking protection settings -->
+    <string name="etp_settings">ڕێکخستنەکانی پارێزگاری</string>
+    <!-- Preference title for enhanced tracking protection settings -->
+    <string name="preference_enhanced_tracking_protection">باشترکردنی پارێزگاری لە چاودێریکردن</string>
+    <!-- Title for the description of enhanced tracking protection -->
+    <string name="preference_enhanced_tracking_protection_explanation_title">بگەڕێ بێئەوەی چاودێری بکرێیت</string>
+    <!-- Description of enhanced tracking protection. The first parameter is the name of the application (For example: Fenix) -->
+    <string name="preference_enhanced_tracking_protection_explanation">زانیارییەکانت بپارێزە. %s دەتپارێزێت لە زۆرێک لەو پەیگرانەی کە شوێنپێت هەڵ دەگرن لە سەرهێڵ.</string>
+    <!-- Text displayed that links to website about enhanced tracking protection -->
+    <string name="preference_enhanced_tracking_protection_explanation_learn_more">زیاتر بزانە</string>
+    <!-- Preference for enhanced tracking protection for the standard protection settings -->
+    <string name="preference_enhanced_tracking_protection_standard_default_1">ئاسایی (بنەڕەتیی)</string>
+    <!-- Preference description for enhanced tracking protection for the standard protection settings -->
+    <string name="preference_enhanced_tracking_protection_standard_description_4">هاوتایی لەنێوان چوستی و تایبەتیی. پەڕەکان ئاسایی باردەکرێن.</string>
+    <!--  Accessibility text for the Standard protection information icon  -->
+    <string name="preference_enhanced_tracking_protection_standard_info_button">چی بلۆک کراوە لە لایەن پارێزگاریکردن لە چاودێری ئاساییەوە</string>
+    <!-- Preference for enhanced tracking protection for the strict protection settings -->
+    <string name="preference_enhanced_tracking_protection_strict">پتەو</string>
+    <!-- Preference description for enhanced tracking protection for the strict protection settings -->
+    <string name="preference_enhanced_tracking_protection_strict_description_3">چاودێریکەران بلۆک دەکات بۆ پەڕەکان زووتر باردەکرێن. بەڵام لەوانەیە هەندێ کرداری ناو ماڵپەڕەکان بوەستێت.</string>
+    <!--  Accessibility text for the Strict protection information icon  -->
+    <string name="preference_enhanced_tracking_protection_strict_info_button">چی بلۆک کراوە لە لایەن پارێزگاریکردن لە چاودێری پتەوەوە</string>
+    <!-- Preference for enhanced tracking protection for the custom protection settings -->
+    <string name="preference_enhanced_tracking_protection_custom">خوازراو</string>
+    <!-- Preference description for enhanced tracking protection for the strict protection settings -->
+    <string name="preference_enhanced_tracking_protection_custom_description_2">دیاریبکە کام چاودێریکەر یان نووسە بلۆک بکرێت.</string>
+    <!--  Accessibility text for the Strict protection information icon  -->
+    <string name="preference_enhanced_tracking_protection_custom_info_button">چی بلۆک کراوە لا لەیەن پارێزگاریکردن لە چاودێری خوازراوەوە</string>
+    <!-- Header for categories that are being blocked by current Enhanced Tracking Protection settings -->
+    <!-- Preference for enhanced tracking protection for the custom protection settings for cookies-->
+    <string name="preference_enhanced_tracking_protection_custom_cookies">شەکرۆکەکان</string>
+    <!-- Option for enhanced tracking protection for the custom protection settings for cookies-->
+    <string name="preference_enhanced_tracking_protection_custom_cookies_1">چاودێریکەری ناو ماڵپەڕ و تۆڕی کۆمەڵایەتی</string>
+    <!-- Option for enhanced tracking protection for the custom protection settings for cookies-->
+    <string name="preference_enhanced_tracking_protection_custom_cookies_2">شەکرۆکە لەو ماڵپەڕانەی کە سەردانت نەکردوون</string>
+    <!-- Option for enhanced tracking protection for the custom protection settings for cookies-->
+    <string name="preference_enhanced_tracking_protection_custom_cookies_3">هەموو شەکرۆکەکانی لایەنی سێهەم (لەوانەیە ببێتە هۆی وەستانی ماڵپەڕەکان)</string>
+    <!-- Option for enhanced tracking protection for the custom protection settings for cookies-->
+    <string name="preference_enhanced_tracking_protection_custom_cookies_4">هەموو شەکرۆکەکان ( لەوانەیە ببێتە هۆی وەستانی ماڵپەڕەکان)</string>
+    <!-- Preference for enhanced tracking protection for the custom protection settings for tracking content -->
+    <string name="preference_enhanced_tracking_protection_custom_tracking_content">چاودێریکردنی ناوەڕۆک</string>
+    <!-- Option for enhanced tracking protection for the custom protection settings for tracking content-->
+    <string name="preference_enhanced_tracking_protection_custom_tracking_content_1">لە هەموو بازدەرەکان</string>
+    <!-- Option for enhanced tracking protection for the custom protection settings for tracking content-->
+    <string name="preference_enhanced_tracking_protection_custom_tracking_content_2">تەنها لە بازدەری تایبەت</string>
+    <!-- Option for enhanced tracking protection for the custom protection settings for tracking content-->
+    <string name="preference_enhanced_tracking_protection_custom_tracking_content_3">تەنها لە بازدەری دیاریکراو (خوازراو)</string>
+    <!-- Preference for enhanced tracking protection for the custom protection settings -->
+    <string name="preference_enhanced_tracking_protection_custom_cryptominers">شیفرە-کانەکەر</string>
+    <!-- Preference for enhanced tracking protection for the custom protection settings -->
+    <string name="preference_enhanced_tracking_protection_custom_fingerprinters">پەنجەمۆرەکان</string>
+    <string name="enhanced_tracking_protection_blocked">بلۆککراوە</string>
+    <!-- Header for categories that are being not being blocked by current Enhanced Tracking Protection settings -->
+    <string name="enhanced_tracking_protection_allowed">ڕێگەپێدراوە</string>
+    <!-- Category of trackers (social media trackers) that can be blocked by Enhanced Tracking Protection -->
+    <string name="etp_social_media_trackers_title">چاودێریکردنی تۆڕی کۆمەڵایەتی</string>
+    <!-- Category of trackers (cryptominers) that can be blocked by Enhanced Tracking Protection -->
+    <string name="etp_cryptominers_title">شیفرە-کانەکەر</string>
+    <!-- Category of trackers (fingerprinters) that can be blocked by Enhanced Tracking Protection -->
+    <string name="etp_fingerprinters_title">پەنجەمۆرەکان</string>
+    <!-- Category of trackers (tracking content) that can be blocked by Enhanced Tracking Protection -->
+    <string name="etp_tracking_content_title">چاودێریکردنی ناوەڕۆک</string>
+    <!-- Enhanced Tracking Protection message that protection is currently on for this site -->
+    <string name="etp_panel_on">پاراستن کارایە بۆ ئەم ماڵپەڕە</string>
+    <!-- Enhanced Tracking Protection message that protection is currently off for this site -->
+    <string name="etp_panel_off">پاراستن ناکارایە بۆ ئەم ماڵپەڕە</string>
+    <!-- Header for exceptions list for which sites enhanced tracking protection is always off -->
+    <string name="enhanced_tracking_protection_exceptions">پاراستنی چاودێری پێشکەوتوو ناکارایە بۆ ئەم ماڵپەڕانە</string>
+    <!-- Content description (not visible, for screen readers etc.): Navigate
+    back from ETP details (Ex: Tracking content) -->
+    <string name="etp_back_button_content_description">بچۆ دواوە</string>
+    <!-- About page Your rights link text -->
+    <string name="about_your_rights">مافەکانت</string>
+    <!-- About page link text to open open source licenses screen -->
+    <string name="about_open_source_licenses">ئەو سەرچاوە کراوانەی ئێمە بەکاریان دێنین</string>
+    <!-- About page link text to open what's new link -->
+    <string name="about_whats_new">چی نوێ هەیە لە %s</string>
+    <!-- Open source licenses page title
+    The first parameter is the app name -->
+    <string name="open_source_licenses_title">%s | کتێبخانەی سەرچاوە کراوە</string>
+
+    <!-- Category of trackers (redirect trackers) that can be blocked by Enhanced Tracking Protection -->
+    <string name="etp_redirect_trackers_title">چاودێریکەر بنێرەوە</string>
+
+    <!-- About page link text to open support link -->
+    <string name="about_support">پشتگیری</string>
+    <!-- About page link text to list of past crashes (like about:crashes on desktop) -->
+    <string name="about_crashes">تێکشکانەکان</string>
+    <!-- About page link text to open privacy notice link -->
+    <string name="about_privacy_notice">سەرنجی تایبەتێتی</string>
+    <!-- About page link text to open know your rights link -->
+    <string name="about_know_your_rights">مافەکانت بزانە</string>
+    <!-- About page link text to open licensing information link -->
+    <string name="about_licensing_information">زانیاری مۆڵەت</string>
+    <!-- About page link text to open a screen with libraries that are used -->
+    <string name="about_other_open_source_libraries">ئەو سەرچاوانەی بەکاریدێنین</string>
+
+    <!-- Content description of the tab counter toolbar button when one tab is open -->
+    <string name="tab_counter_content_description_one_tab">1 بازدەر</string>
+    <!-- Content description of the tab counter toolbar button when multiple tabs are open. First parameter will be replaced with the number of tabs (always more than one) -->
+    <string name="tab_counter_content_description_multi_tab">%d بازدەر</string>
+
+    <!-- Browser long press popup menu -->
+    <!-- Copy the current url -->
+    <string name="browser_toolbar_long_press_popup_copy">لەبەرگرتنەوە</string>
+    <!-- Paste & go the text in the clipboard. '&amp;' is replaced with the ampersand symbol: & -->
+    <string name="browser_toolbar_long_press_popup_paste_and_go">لکاندن و ڕۆشتن</string>
+    <!-- Paste the text in the clipboard -->
+    <string name="browser_toolbar_long_press_popup_paste">لکاندن</string>
+    <!-- Snackbar message shown after an URL has been copied to clipboard. -->
+    <string name="browser_toolbar_url_copied_to_clipboard_snackbar">بەستەر لەبەرگیرا بۆ گرتەتەختە</string>
+
+    <!-- Title text for the Add To Homescreen dialog -->
+    <string name="add_to_homescreen_title">زیادی بکە بۆ شاشەی سەرەکی</string>
+    <!-- Cancel button text for the Add to Homescreen dialog -->
+    <string name="add_to_homescreen_cancel">پاشگەزبوونەوە</string>
+    <!-- Add button text for the Add to Homescreen dialog -->
+    <string name="add_to_homescreen_add">زیادکردن</string>
+    <!-- Continue to website button text for the first-time Add to Homescreen dialog -->
+    <string name="add_to_homescreen_continue">بەردەوام بە بۆ ماڵپەڕەکە</string>
+    <!-- Placeholder text for the TextView in the Add to Homescreen dialog -->
+    <string name="add_to_homescreen_text_placeholder">ناوی قەدبڕ</string>
+
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords">چوونەژوورەوە و وشەی تێپەڕەکان</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins">چوونەژوورەوە وشەی تێپەڕەکان پاشەکەوت بکە</string>
+    <!-- Preference option for asking to save passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_ask_to_save">داوابکە بۆ پاشەکەوتکردن</string>
+    <!-- Preference option for never saving passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_never_save">هەرگیز پاشەکەوت مەکە</string>
+    <!-- Preference for autofilling saved logins in Fenix -->
+    <string name="preferences_passwords_autofill">پڕکردنەوەی خۆکار</string>
+    <!-- Preference for syncing saved logins in Fenix -->
+    <string name="preferences_passwords_sync_logins">چوونەژوورەوەکان هاوکاتگەری پێبکە</string>
+    <!-- Preference for syncing saved logins in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices">چوونەژوورەوەکان هاوکاتگەری پێبکە لە نێوان ئامێرەکان</string>
+    <!-- Syncing saved logins in Fenix needs reconnect to sync -->
+    <string name="preferences_passwords_sync_logins_reconnect">پەیوەندی کردنەوە</string>
+    <!-- Syncing saved logins in Fenix needs login -->
+    <string name="preferences_passwords_sync_logins_sign_in">بچۆژوورەوە بۆ هاوکاتگەری</string>
+    <!-- Preference to access list of saved logins -->
+    <string name="preferences_passwords_saved_logins">چوونەژوورەوەی پاشەکەوتکراو</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text">ئەو چوونەژوورەوانەی پاشەکەوتی دەکەیت یان هاوکاتگەری پێدەکەیت لەگەڵ %s لێرە دەردەکەوێت.</string>
+    <!-- Preference to access list of saved logins -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">زیاتر بزانە دەربارەی هاوکاتگەری.</string>
+    <!-- Preference to access list of login exceptions that we never save logins for -->
+    <string name="preferences_passwords_exceptions">هەڵاوێردییەکان</string>
+
+    <!-- Empty description of list of login exceptions that we never save logins for -->
+    <string name="preferences_passwords_exceptions_description_empty">ئەو چوونەژوور و وشەی تێەپەڕانەی پاشەکەوتی ناکەیت لێرە دەردەکەوێت.</string>
+    <!-- Description of list of login exceptions that we never save logins for -->
+    <string name="preferences_passwords_exceptions_description">چوونەژوورەوە و وشەی تێپەڕ پاشەکەوت ناکرێت بۆ ئەم ماڵپەڕانە.</string>
+    <!-- Text on button to remove all saved login exceptions -->
+    <string name="preferences_passwords_exceptions_remove_all">هەموو هەڵاوێردییەکان بسڕەوە</string>
+    <!-- Hint for search box in logins list -->
+    <string name="preferences_passwords_saved_logins_search">بگەڕێ لە ناو چوونەژوورەوەکان</string>
+    <!-- Option to sort logins list A-Z, alphabetically -->
+    <string name="preferences_passwords_saved_logins_alphabetically">شێوەی ئەلفوبێی</string>
+    <!-- Option to sort logins list by most recently used -->
+    <string name="preferences_passwords_saved_logins_recently_used">دووا بەکارهێنراو</string>
+    <!-- The header for the site that a login is for -->
+    <string name="preferences_passwords_saved_logins_site">ماڵپەڕ</string>
+    <!-- The header for the username for a login -->
+    <string name="preferences_passwords_saved_logins_username">ناوی بەکارهێنەر</string>
+    <!-- The header for the password for a login -->
+    <string name="preferences_passwords_saved_logins_password">وشەی تێپەڕبوون</string>
+    <!-- Message displayed in security prompt to reenter a secret pin to access saved logins -->
+    <string name="preferences_passwords_saved_logins_enter_pin">PIN لێبدەرەوە</string>
+    <!-- Message displayed in security prompt to access saved logins -->
+    <string name="preferences_passwords_saved_logins_enter_pin_description">بیکەرەوە بۆ ئەوەی چوونەژوورەوەکان ببینی</string>
+    <!-- Message displayed when a connection is insecure and we detect the user is entering a password -->
+    <string name="logins_insecure_connection_warning">ئەم پەیوەندییە پارێزراو نیە. ئەو زانیاریانەی دەنووسیت لەوانەیە بڵاوەیپێبکرێت</string>
+    <!-- Learn more link that will link to a page with more information displayed when a connection is insecure and we detect the user is entering a password -->
+    <string name="logins_insecure_connection_warning_learn_more">زیاتر بزانە</string>
+    <!-- Prompt message displayed when Fenix detects a user has entered a password and user decides if Fenix should save it. The first parameter is the name of the application (For example: Fenix)  -->
+    <string name="logins_doorhanger_save">دەتەوێت ئەم چوونەژوورەوەیە پاشەکەوت بکەیت؟</string>
+    <!-- Positive confirmation that Fenix should save the new or updated login -->
+    <string name="logins_doorhanger_save_confirmation">پاشەکەوتکردن</string>
+    <!-- Negative confirmation that Fenix should not save the new or updated login -->
+    <string name="logins_doorhanger_save_dont_save">پاشەکەوتی مەکە</string>
+    <!-- Shown in snackbar to tell user that the password has been copied -->
+    <string name="logins_password_copied">وشەی تێپەڕبوون لەبەرگیرایەوە</string>
+    <!-- Shown in snackbar to tell user that the username has been copied -->
+    <string name="logins_username_copied">ناوی بەکارهێنەر لەبەرگیرایەوە</string>
+    <!-- Shown in snackbar to tell user that the site has been copied -->
+    <string name="logins_site_copied">ماڵپەڕ لەبەرگیرایەوە</string>
+    <!-- Content Description (for screenreaders etc) read for the button to copy a password in logins-->
+    <string name="saved_logins_copy_password">وشەی تێپەڕبوون لەبەربگرەوە</string>
+    <!-- Content Description (for screenreaders etc) read for the button to clear a password while editing a login-->
+    <string name="saved_logins_clear_password">وشەی تێپەڕبوون پاکبکەرەوە</string>
+    <!-- Content Description (for screenreaders etc) read for the button to copy a username in logins -->
+    <string name="saved_login_copy_username">ناوی بەکارهێنەر لەبەربگرەوە</string>
+    <!-- Content Description (for screenreaders etc) read for the button to clear a username while editing a login -->
+    <string name="saved_login_clear_username">ناوی بەکارهێنەر پاکبکەرەوە</string>
+    <!-- Content Description (for screenreaders etc) read for the button to copy a site in logins -->
+    <string name="saved_login_copy_site">ماڵپەڕ لەبەربگرەوە</string>
+    <!-- Content Description (for screenreaders etc) read for the button to open a site in logins -->
+    <string name="saved_login_open_site">ماڵپەڕ لە وێبگەڕ بکەرەوە</string>
+    <!-- Content Description (for screenreaders etc) read for the button to reveal a password in logins -->
+    <string name="saved_login_reveal_password">وشەی تێپەڕبوون پیشان بدە</string>
+    <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
+    <string name="saved_login_hide_password">وشەی تێپەڕبوون بشارەوە</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
+    <string name="logins_biometric_prompt_message">بیکەرەوە بۆ ئەوەی چوونەژوورەوەکان ببینی</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title">چوونەژوورەوەکان و وشەی تێپەڕبوون بپارێزە</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_later">دوواتر</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_set_up_now">ئێستا بیکە</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their logins -->
+    <string name="logins_biometric_prompt_message_pin">ئامێرەکەت بکەرەوە</string>
+    <!-- Title for Accessibility Force Enable Zoom Preference -->
+    <string name="preference_accessibility_force_enable_zoom">هێنانە پێش لە هەموو ماڵپەڕەکان</string>
+    <!-- Summary for Accessibility Force Enable Zoom Preference -->
+    <string name="preference_accessibility_force_enable_zoom_summary">کارای بکە بۆ ئەوەی ڕێگە بدات نزیککردنەوە و دوورکردنەوە، لەکاتێکا ئەگەر ماڵپەڕەکەش رێگەت پێ نەدات.</string>
+    <!-- Saved logins sorting strategy menu item -by name- (if selected, it will sort saved logins alphabetically) -->
+    <string name="saved_logins_sort_strategy_alphabetically">ناو(A-Z)</string>
+    <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
+    <string name="saved_logins_sort_strategy_last_used">کۆتا بەکارهێنراو</string>
+    <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">پێڕستی چوونەژوورەوەکان ڕێکخبە</string>
+
+    <!-- Credit Cards Autofill -->
+    <!-- Preference and title for managing the settings for credit cards -->
+    <string name="preferences_credit_cards">کارتی پڕکردنەوەی بانکی</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards">هەڵیبگرە و کارتەکان خۆکار پڕبکەرەوە</string>
+    <!-- Preference summary for saving and autofilling credit card data -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary">زانیارییەکان بە کۆدکراون</string>
+    <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
+    <string name="preferences_credit_cards_sync_cards_across_devices">هاوکاتگەری کردنی کارت لە نێوان ئامێرەکان</string>
+    <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
+    <string name="preferences_credit_cards_sync_cards">هاوکاتگەری کارتەکان</string>
+    <!-- Preference option for adding a credit card -->
+    <string name="preferences_credit_cards_add_credit_card">کارتی پڕکردنەوەی بانکی زیادبکە</string>
+    <!-- The title for the "Save" menu item for saving a credit card -->
+    <string name="credit_cards_menu_save">پاشەکەوتکردن</string>
+    <!-- The text for the "Save" button for saving a credit card -->
+    <string name="credit_cards_save_button">پاشەکەوتکردن</string>
+    <!-- The text for the "Cancel" button for cancelling adding or updating a credit card -->
+    <string name="credit_cards_cancel_button">پاشگەزبوونەوە</string>
+
+    <!-- Title of the Add search engine screen -->
+    <string name="search_engine_add_custom_search_engine_title">بزوێنەری گەڕان زیادبکە</string>
+    <!-- Title of the Edit search engine screen -->
+    <string name="search_engine_edit_custom_search_engine_title">بزوێنەری گەڕان دەستکاریبکە</string>
+    <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
+    <string name="search_engine_add_button_content_description">زیادکردن</string>
+    <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
+    <string name="search_engine_add_custom_search_engine_edit_button_content_description">پاشەکەوتکردن</string>
+    <!-- Text for the menu button to edit a search engine -->
+    <string name="search_engine_edit">دەستکاریکردن</string>
+    <!-- Text for the menu button to delete a search engine -->
+    <string name="search_engine_delete">سڕینەوە</string>
+
+    <!-- Text for the button to create a custom search engine on the Add search engine screen -->
+    <string name="search_add_custom_engine_label_other">هی تر</string>
+    <!-- Placeholder text shown in the Search Engine Name TextField before a user enters text -->
+    <string name="search_add_custom_engine_name_hint">ناو</string>
+    <!-- Text for the button to learn more about adding a custom search engine -->
+    <string name="search_add_custom_engine_learn_more_label">زیاتر بزانە</string>
+
+    <!-- Accessibility description for the form in which details about the custom search engine are entered -->
+    <string name="search_add_custom_engine_form_description">وردەکاری بزوێنەری گەڕانی خوزراو</string>
+    <!-- Accessibility description for the 'Learn more' link -->
+    <string name="search_add_custom_engine_learn_more_description">بەستەری زیاتر بزانە</string>
+
+    <!-- Text shown when a user leaves the name field empty -->
+    <string name="search_add_custom_engine_error_empty_name">ناوی بزوێنەری گەڕان بنووسە</string>
+    <!-- Text shown when a user tries to add a search engine that already exists -->
+    <string name="search_add_custom_engine_error_existing_name">گەڕان بە دووای وشەی “%s” پێشتر بوونی هەیە.</string>
+    <!-- Text shown when a user leaves the search string field empty -->
+    <string name="search_add_custom_engine_error_empty_search_string">دەقێکی گەڕان بنووسە</string>
+    <!-- Text shown when a user leaves out the required template string -->
+    <string name="search_add_custom_engine_error_missing_template">دڵنیابە کە دەقی نووسراو دەگنوجێت لەگەڵ شێوازی نموونەکە</string>
+    <!-- Text shown when we aren't able to validate the custom search query. The first parameter is the url of the custom search engine -->
+    <string name="search_add_custom_engine_error_cannot_reach">هەڵە لە پەیوەندیکردن بە “%s”</string>
+    <!-- Text shown when a user creates a new search engine -->
+    <string name="search_add_custom_engine_success_message">%s درووستکرا</string>
+    <!-- Text shown when a user successfully edits a custom search engine -->
+    <string name="search_edit_custom_engine_success_message">%s پاشەکەوتکرا</string>
+    <!-- Text shown when a user successfully deletes a custom search engine -->
+    <string name="search_delete_search_engine_success_message">%s سڕایەوە</string>
+
+    <!-- Title text shown for the migration screen to the new browser. Placeholder replaced with app name -->
+    <string name="migration_title">بەخێر بێی بۆ %s نوێ</string>
+    <!-- Text on the disabled button while in progress. Placeholder replaced with app name -->
+    <string name="migration_updating_app_button_text">نوێکردنەوە %s…</string>
+    <!-- Text on the enabled button. Placeholder replaced with app name-->
+    <string name="migration_update_app_button">دەستپێکردنی %s</string>
+    <!-- Accessibility description text for a completed migration item -->
+    <string name="migration_icon_description">تێهەڵکێشکردن تەواو بوو</string>
+    <!--Text on list of migrated items (e.g. Settings, History, etc.)-->
+    <string name="migration_text_passwords">وشەی تێپەڕبوونەکان</string>
+
+    <!-- Heading for the instructions to allow a permission -->
+    <string name="phone_feature_blocked_intro">بۆ ڕێگەدا:</string>
+    <!-- First step for the allowing a permission -->
+    <string name="phone_feature_blocked_step_settings">1. بڕۆ بۆ ڕێکسختنەکانی ئەندرۆید</string>
+    <!-- Second step for the allowing a permission -->
+    <string name="phone_feature_blocked_step_permissions"><![CDATA[2. پەنجە بنێ بە <b>ڕێگەپێدانەکان</b>]]></string>
+    <!-- Third step for the allowing a permission (Fore example: Camera) -->
+    <string name="phone_feature_blocked_step_feature"><![CDATA[<b>%1$s</b> بجوڵێنە بۆ کاراکردن]]></string>
+
+    <!-- Label that indicates a site is using a secure connection -->
+    <string name="quick_settings_sheet_secure_connection">پەیوەندیگرتنی پارێزراو</string>
+    <!-- Label that indicates a site is using a insecure connection -->
+    <string name="quick_settings_sheet_insecure_connection">پەیوەندیگرتنێکی ناپارێزراو</string>
+    <!-- Confirmation message for a dialog confirming if the user wants to delete all the permissions for all sites-->
+    <string name="confirm_clear_permissions_on_all_sites">تۆ دڵنیایت لە لابردنی هەموو دەسەڵاتەکان لە هەموو ماڵپەڕەکان؟</string>
+    <!-- Confirmation message for a dialog confirming if the user wants to delete all the permissions for a site-->
+    <string name="confirm_clear_permissions_site">تۆ دڵنیایت لە لابردنی هەموو دەسەڵاتەکان لەم ماڵپەڕە؟</string>
+    <!-- Confirmation message for a dialog confirming if the user wants to set default value a permission for a site-->
+    <string name="confirm_clear_permission_site">تۆ دڵنیایت لە لابردنی ئەم دەسەڵاتە لەم ماڵپەڕە؟</string>
+    <!-- label shown when there are not site exceptions to show in the site exception settings -->
+    <string name="no_site_exceptions">هیچ ماڵپەڕێک بەدەر نەبێت</string>
+    <!-- Label for the Pocket default top site -->
+    <string name="pocket_top_articles">گرنگترین وتارەکان</string>
+    <!-- Bookmark deletion confirmation -->
+    <string name="bookmark_deletion_confirmation">ئایا تۆ دڵنیاییت کە دەتەوێت ئەم نیشانکراوە بسڕیتەوە؟</string>
+    <!-- Browser menu button that adds a top site to the home fragment -->
+    <string name="browser_menu_add_to_top_sites">زیادی بکە ماڵپەڕە زۆر سەردانکراوەکان</string>
+    <!-- text shown before the issuer name to indicate who its verified by, parameter is the name of
+     the certificate authority that verified the ticket-->
+    <string name="certificate_info_verified_by">سەلمێنراوە لە لایەن: %1$s</string>
+    <!-- Login overflow menu delete button -->
+    <string name="login_menu_delete_button">سڕینەوە</string>
+    <!-- Login overflow menu edit button -->
+    <string name="login_menu_edit_button">دەستکاریکردن</string>
+
+    <!-- Message in delete confirmation dialog for logins -->
+    <string name="login_deletion_confirmation">تۆ دڵنیایت کە دەویت ئەم چوونەژوورەوەیە بسڕیتەوە؟</string>
+    <!-- Positive action of a dialog asking to delete  -->
+    <string name="dialog_delete_positive">سڕینەوە</string>
+    <!--  The saved login options menu description. -->
+    <string name="login_options_menu">هەڵبژاردەکانی چوونەژوورەوە</string>
+    <!--  The button description to save changes to an edited login. -->
+    <string name="save_changes_to_login">گۆڕانکارییەکە پاشەکەوت بکە بۆ چوونەژوورەوە.</string>
+    <!--  The button description to discard changes to an edited login. -->
+    <string name="discard_changes">گۆڕانکارییەکان پشتگوێبخە</string>
+    <!--  The page title for editing a saved login. -->
+    <string name="edit">دەستکاریکردن</string>
+    <!--  The error message in edit login view when password field is blank. -->
+    <string name="saved_login_password_required">وشەی تێپڕبوون داواکراوە</string>
+    <!-- Voice search button content description  -->
+    <string name="voice_search_content_description">گەڕانی دەنگی</string>
+    <!-- Voice search prompt description displayed after the user presses the voice search button -->
+    <string name="voice_search_explainer">ئێستا قسە بکە</string>
+
+    <!--  The error message in edit login view when a duplicate username exists. -->
+    <string name="saved_login_duplicate">چوونەژوورەوە بەناوە پێستر بوونی هەیە</string>
+
+    <!-- Synced Tabs -->
+    <!-- Text displayed to ask user to connect another device as no devices found with account -->
+    <string name="synced_tabs_connect_another_device">ئامێریکی تر ببەستەوە</string>
+    <!-- Text displayed asking user to re-authenticate -->
+    <string name="synced_tabs_reauth">تکایە دووبارە ڕێپێدان ئەنجام بدەرەوە</string>
+    <!-- Text displayed when user has disabled tab syncing in Firefox Sync Account -->
+    <string name="synced_tabs_enable_tab_syncing">تکایە هاوکاتگەری بازدەر پێبکە.</string>
+    <!-- Text displayed when user has no tabs that have been synced -->
+    <string name="synced_tabs_no_tabs">هیچ بازدەرێکی کراوەت نیە لە ئامێرەکانی تری فایەرفۆکس.</string>
+    <!-- Text displayed in the synced tabs screen when a user is not signed in to Firefox Sync describing Synced Tabs -->
+    <string name="synced_tabs_sign_in_message">لیستەی بازدەرەکان پیشان بدە لە ئامێرەکانی ترەوە.</string>
+    <!-- Text displayed on a button in the synced tabs screen to link users to sign in when a user is not signed in to Firefox Sync -->
+    <string name="synced_tabs_sign_in_button">بۆ هاوکاتکردن بچۆژوورەوە</string>
+    <!-- The text displayed when a synced device has no tabs to show in the list of Synced Tabs. -->
+    <string name="synced_tabs_no_open_tabs">بازدەری کراوە نیە</string>
+
+    <!-- Confirmation dialog button text when top sites limit is reached. -->
+    <string name="top_sites_max_limit_confirmation_button">باشە، تێگەیشتم</string>
+    <!-- Label for the show most visited sites preference -->
+    <string name="top_sites_toggle_top_frecent_sites">زۆترین ماڵپەڕە سەردانکراوەکان پیشان بدە</string>
+	<!-- Title text displayed in the rename top site dialog. -->
+	<string name="top_sites_rename_dialog_title">ناو</string>
+	<!-- Hint for renaming title of a top site -->
+	<string name="top_site_name_hint">ناوی زۆرترین ماڵپەڕی سەردانیکراو</string>
+	<!-- Button caption to confirm the renaming of the top site. -->
+	<string name="top_sites_rename_dialog_ok">باشە</string>
+	<!-- Dialog button text for canceling the rename top site prompt. -->
+	<string name="top_sites_rename_dialog_cancel">پاشگەزبوونەوە</string>
+
+    <!-- Content description for close button in collection placeholder. -->
+    <string name="remove_home_collection_placeholder_content_description">سڕینەوە</string>
+
+    <!-- Content description radio buttons with a link to more information -->
+    <string name="radio_preference_info_content_description">کرتە بکە بۆ زانیاری زیاتر</string>
+
+    <!-- Content description for the action bar "up" button -->
+    <string name="action_bar_up_description">بچۆ سەرەوە</string>
+
+    <!-- Content description for privacy content close button -->
+    <string name="privacy_content_close_button_content_description">داخستن</string>
+
+</resources>
diff --git a/app/src/main/res/values-co/strings.xml b/app/src/main/res/values-co/strings.xml
index 32445af8a..e7c78f7aa 100644
--- a/app/src/main/res/values-co/strings.xml
+++ b/app/src/main/res/values-co/strings.xml
@@ -5,6 +5,7 @@
     <string name="app_name_private_5">%s privatu</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (nav. privata)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">Ozzioni addiziunale</string>
@@ -49,6 +50,16 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">Selezziunatu</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">Arregistrate pocu fà</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">Indette arregistrate pocu fà</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">Tuttu affissà</string>
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">Buttone Affissà tutte l’indette arregistrate</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s hè sviluppatu da Mozilla.</string>
 
@@ -96,14 +107,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Ricusà</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Mudificà l’accunciamentu di l’unghjette aperte. Andate in e preferenze è selezziunate « Quadrittere » sottu « Vista di l’unghjette ».</string>
-
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Andà à e preferenze</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Ignurà</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Nova unghjetta</string>
@@ -114,6 +117,12 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">Siti principale</string>
 
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">Rivene in st’unghjetta</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">Tuttu affissà</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">Unghjette aperte</string>
@@ -188,6 +197,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Mudificà</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Screnu d’accolta</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">Impussibule di cunnettesi. Schema d’URL scunnisciutu.</string>
@@ -553,8 +566,6 @@
     <string name="library_new_tab">Nova unghjetta</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Circà in a pagina</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Unghjette sincrunizate</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Lista di lettura</string>
     <!-- Menu Item Label for Search in Library -->
@@ -601,6 +612,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Dopu un mese</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Principià da u screnu d’accolta</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">Dopu quattru ore</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Sempre</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Mai</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Chjusura manuale</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -1502,7 +1522,7 @@
     <!-- Message displayed in security prompt to reenter a secret pin to access saved logins -->
     <string name="preferences_passwords_saved_logins_enter_pin">Scrivite torna u vostru codice PIN</string>
     <!-- Message displayed in security prompt to access saved logins -->
-    <string name="preferences_passwords_saved_logins_enter_pin_description">Ci vole à spalancà per affissà l’identificazioni di cunnessione arregistrate</string>
+    <string name="preferences_passwords_saved_logins_enter_pin_description">Spalancate per affissà l’identificazioni di cunnessione arregistrate</string>
 
     <!-- Message displayed when a connection is insecure and we detect the user is entering a password -->
     <string name="logins_insecure_connection_warning">Sta cunnessione ùn hè micca assicurata. L’identificazioni di cunnessione scritti quì puderianu esse ingannati.</string>
@@ -1585,6 +1605,10 @@
 
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">Data di scadenza</string>
+    <!-- The label for the expiration date month of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_month">Mese di a data di scadenza</string>
+    <!-- The label for the expiration date year of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_year">Annu di a data di scadenza</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">Nome di u titulare</string>
     <!-- The header for the nickname for a credit card -->
@@ -1605,6 +1629,24 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Ci vole à scrive un numeru accettevule di carta bancaria</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Ci vole à riempie stu campu</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Spalancate per affissà e vostre carte arregistrate</string>
+
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Prutege e vostre carte bancarie</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Definite un dissegnu di chjusura, un codice PIN o una parolla d’entrata per prutege e vostre carte arregistrate s’ellu ci era qualchissia chì accidissi à u vostru apparechju.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Cunfigurà subitu</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Dopu</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Spalancate u vostru apparechju</string>
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Spalancate per impiegà l’infurmazione di e carte bancarie arregistrate</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Aghjunghje un mutore di ricerca</string>
     <!-- Title of the Edit search engine screen -->
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 33d4a557f..a17a819b6 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -5,6 +5,7 @@
     <string name="app_name_private_5">Anonymní %s</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (anonymní)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">Více možností</string>
@@ -49,6 +50,16 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">Vybráno</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">Naposledy uložené</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">Naposledy uložené záložky</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">Zobrazit vše</string>
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">Tlačítko pro zobrazení všech uložených záložek</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">Autorem aplikace %1$s je Mozilla.</string>
 
@@ -94,13 +105,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Ne, děkuji</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Zobrazení otevřených panelů můžete změnit v nastavení aplikace.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Přejít do nastavení</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Zavřít</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Nový panel</string>
@@ -110,6 +114,12 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">Top stránky</string>
 
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">Návrat zpět</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">Zobrazit vše</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">Otevřít panely</string>
@@ -187,6 +197,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Upravit</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Domovská obrazovka</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">Nelze se připojit. Schéma URL nebylo rozpoznáno.</string>
@@ -555,8 +569,6 @@
     <string name="library_new_tab">Nový panel</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Najít na stránce</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Synchronizované panely</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Seznam ke čtení</string>
     <!-- Menu Item Label for Search in Library -->
@@ -601,6 +613,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Po měsíci</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Při spuštění zobrazit domovskou obrazovku</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">Po pár hodinách od zavření</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Vždy</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Nikdy</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Zavírat ručně</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -1589,6 +1610,10 @@
     <string name="credit_cards_card_number">Číslo karty</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">Datum platnosti</string>
+    <!-- The label for the expiration date month of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_month">Datum platnosti (měsíc)</string>
+    <!-- The label for the expiration date year of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_year">Datum platnosti (rok)</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">Jméno na kartě</string>
     <!-- The header for the nickname for a credit card -->
@@ -1610,6 +1635,24 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Zadejte prosím platné číslo platební karty</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Vyplňte prosím toto pole</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Odemknout pro zobrazení uložených karet</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Zabezpečte své platební karty</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Nastavte si gesto, PIN nebo heslo zámku obrazovky, který ochrání vaše uložené platební karty, pokud by se vaše zařízení dostalo do ruky někomu jinému.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Nastavit</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Později</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Odemkněte zařízení</string>
+
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Odemkněte pro použití informací o platební kartě</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Přidat vyhledávač</string>
     <!-- Title of the Edit search engine screen -->
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index 92cad6812..952393240 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_name_private_5">%s Preifat</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (Preifat)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">Rhagor o opsiynau</string>
@@ -48,6 +49,16 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">Dewiswyd</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">Cadwyd yn ddiweddar</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">Nodau tudalen wedi’u cadw’n ddiweddar</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">Dangos y cyfan</string>
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">Dangos fotwm nodau tudalen wedi’u cadw</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">Mae %1$s yn cael ei greu gan Mozilla.</string>
 
@@ -93,13 +104,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Cau</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Newid cynllun tabiau agored. Ewch i’r Gosodiadau a dewis grid o dan golwg tabiau.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Mynd i’r Gosodiadau</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Cau</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Tab newydd</string>
@@ -109,6 +113,12 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">Hoff wefannau</string>
 
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">Mynd nôl i</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">Dangos y cyfan</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">Tabiau Agored</string>
@@ -183,6 +193,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Golygu</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Sgrin cartref</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">Methu cysylltu. Cynllun URL anadnabyddadwy.</string>
@@ -545,8 +559,6 @@
     <string name="library_new_tab">Tab newydd</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Canfod yn y dudalen</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Tabiau wedi’u Cydweddu</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Rhestr Ddarllen</string>
     <!-- Menu Item Label for Search in Library -->
@@ -591,6 +603,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Ar ôl un mis</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Dechrau o gartref</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">Ar ôl pedair awr</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Bob tro</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Byth</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Cau â llaw</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -1569,6 +1590,10 @@ Fodd bynnag, gall fod yn llai sefydlog. Llwythwch ein porwr Beta i gael profiad
     <string name="credit_cards_card_number">Rhif y Cerdyn</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">Dyddiad Dod i Ben</string>
+    <!-- The label for the expiration date month of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_month">Mis Dod i Ben</string>
+    <!-- The label for the expiration date year of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_year">Blwyddyn Dod i Ben</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">Enw ar y Cerdyn</string>
     <!-- The header for the nickname for a credit card -->
@@ -1590,6 +1615,24 @@ Fodd bynnag, gall fod yn llai sefydlog. Llwythwch ein porwr Beta i gael profiad
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Rhowch rif cerdyn credyd dilys</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Llanwch y maes yma.</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Datgloi i weld y cardiau rydych wedi’u cadw</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Diogelwch eich cerdyn credyd</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Gosodwch batrwm cloi dyfais, PIN, neu gyfrinair i ddiogelu eich mewngofnodion a’ch cyfrineiriau sydd wedi’u cadw rhag i rhywun arall sydd â mynediad i’ch dyfais.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Gosod nawr</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Yn hwyrach</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Datgloi’ch dyfais</string>
+
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Datglowch i ddefnyddio manylion cerdyn credyd wedi’i storio</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Ychwanegu peiriant chwilio</string>
     <!-- Title of the Edit search engine screen -->
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 2edd89c05..546eabc46 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -410,6 +410,11 @@
         and the third is the device model. -->
     <string name="default_device_name_2">%1$s på %2$s %3$s</string>
 
+    <!-- Preference for syncing credit cards -->
+    <string name="preferences_sync_credit_cards">Betalingskort</string>
+    <!-- Preference for syncing addresses -->
+    <string name="preferences_sync_address">Adresser</string>
+
     <!-- Send Tab -->
     <!-- Name of the "receive tabs" notification channel. Displayed in the "App notifications" system settings for the app -->
     <string name="fxa_received_tab_channel_name">Modtagne faneblade</string>
@@ -440,9 +445,6 @@
     <!-- Text displayed when there are no exceptions, with learn more link that brings users to a tracking protection SUMO page -->
     <string name="exceptions_empty_message_learn_more_link">Læs mere</string>
 
-    <!-- Description in Quick Settings that tells user tracking protection is off globally for all sites, and links to Settings to turn it on -->
-    <string name="preferences_tracking_protection_turned_off_globally">Slået fra overalt. Gå til Indstillinger for at slå beskyttelse til.</string>
-
     <!-- Preference switch for Telemetry -->
     <string name="preferences_telemetry">Telemetry</string>
     <!-- Preference switch for usage and technical data collection -->
@@ -453,6 +455,8 @@
     <string name="preferences_marketing_data">Markedsføringsdata</string>
     <!-- Preference description for marketing data collection, parameter is the app name (e.g. Firefox) -->
     <string name="preferences_marketing_data_description">Deler data om de funktioner, du bruger i %1$s, med Leanplum, vores samarbejdspartner inden for markedsføring.</string>
+    <!-- Preference description for marketing data collection -->
+    <string name="preferences_marketing_data_description2">Deler grundlæggende data for anvendelse med Adjust, vores samarbejdspartner inden for markedsføring.</string>
     <!-- Title for studies preferences -->
     <string name="preference_experiments_2">Undersøgelser</string>
     <!-- Summary for studies preferences -->
@@ -789,8 +793,6 @@
     <string name="bookmark_delete_folder_snackbar">%1$s slettet</string>
     <!-- Screen title for adding a bookmarks folder -->
     <string name="bookmark_add_folder">Tilføj mappe</string>
-    <!-- deprecated: Snackbar title shown after a bookmark has been created. -->
-    <string name="bookmark_created_snackbar">Bogmærke oprettet.</string>
     <!-- Snackbar title shown after a bookmark has been created. -->
     <string name="bookmark_saved_snackbar">Bogmærke gemt!</string>
     <!-- Snackbar edit button shown after a bookmark has been created. -->
@@ -1441,10 +1443,8 @@
     <string name="preferences_passwords_autofill">Autofyld</string>
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Synkroniser logins</string>
-    <!-- Syncing saved logins in Fenix is on -->
-    <string name="preferences_passwords_sync_logins_on">Til</string>
-    <!-- Syncing saved logins in Fenix is off -->
-    <string name="preferences_passwords_sync_logins_off">Fra</string>
+    <!-- Preference for syncing saved logins in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices">Synkroniser logins på tværs af enheder</string>
     <!-- Syncing saved logins in Fenix needs reconnect to sync -->
     <string name="preferences_passwords_sync_logins_reconnect">Genopret forbindelse</string>
     <!-- Syncing saved logins in Fenix needs login -->
@@ -1545,6 +1545,8 @@
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Data er krypteret</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Synkroniser kort på tværs af enheder</string>
+    <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
+    <string name="preferences_credit_cards_sync_cards">Synkroniser kort</string>
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Tilføj betalingskort</string>
     <!-- Preference option for managing saved credit cards -->
@@ -1575,6 +1577,24 @@
     <!-- Title of the "Saved cards" screen -->
     <string name="credit_cards_saved_cards">Gemte kort</string>
 
+    <!-- Error message for credit card number validation -->
+    <string name="credit_cards_number_validation_error_message">Indtast et gyldigt betalingskortnummer</string>
+
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Lås op for at se dine gemte betalingskort</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Beskyt dine betalingskort</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Indstil en pinkode, en adgangskode eller et låsemønster på din enhed for at forhindre, at andre mennesker får adgang til dine gemte betalingskort, hvis de har adgang til din enhed.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Indstil nu</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Senere</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Lås din enhed op</string>
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Lås op for at anvende gemte informationer om betalingskort</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Tilføj søgetjeneste</string>
     <!-- Title of the Edit search engine screen -->
@@ -1738,20 +1758,13 @@
     <!-- Content description for close button in collection placeholder. -->
     <string name="remove_home_collection_placeholder_content_description">Fjern</string>
 
-    <!-- Deprecated: text for the firefox account onboarding card header
-    The first parameter is the name of the app (e.g. Firefox Preview) -->
-    <string name="onboarding_firefox_account_header">Få det meste ud af %s.</string>
-
     <!-- Content description radio buttons with a link to more information -->
     <string name="radio_preference_info_content_description">Tryk for at se flere detaljer</string>
 
-    <!-- Deprecated: No Open Tabs Message Header -->
-    <string name="no_collections_header1">Saml de ting, der betyder noget for dig</string>
-    <!-- Deprecated: Label to describe what collections are to a new user without any collections -->
-    <string name="no_collections_description1">Saml relaterede søgninger, websteder og faneblade i grupper. Så kan du hurtigt finde dem igen.</string>
-    <!-- Deprecated: text for the firefox account onboarding card header when we detect you're already signed in to -->
-    <string name="onboarding_firefox_account_auto_signin_header_2">Du er logget ind som %s i en anden version af Firefox på denne telefon. Vil du logge ind med denne konto?</string>
-    <!-- Deprecated: Describes the add to homescreen functionality -->
-    <string name="add_to_homescreen_description">Du kan nemt føje dette websted til din telefons startskærm for at have hurtig adgang til det og browse hurtigere med en app-lignende oplevelse.</string>
+    <!-- Content description for the action bar "up" button -->
+    <string name="action_bar_up_description">Naviger op</string>
+
+    <!-- Content description for privacy content close button -->
+    <string name="privacy_content_close_button_content_description">Luk</string>
 
-    </resources>
+</resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 6df4e993a..86d1df0a9 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -6,6 +6,7 @@
     <string name="app_name_private_5">%s privat</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (privat)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">Weitere Optionen</string>
@@ -50,6 +51,17 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">Ausgewählt</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">Kürzlich gespeichert</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">Kürzlich gespeicherte Lesezeichen</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">Alle anzeigen</string>
+
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">Schaltfläche: Alle gespeicherten Lesezeichen anzeigen</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s wird von Mozilla hergestellt.</string>
 
@@ -96,13 +108,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Schließen</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Ändern Sie das Layout offener Tabs. Öffnen Sie die Einstellungen und wählen Sie „Raster“ bei der Tab-Ansicht.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Einstellungen öffnen</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Verwerfen</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Neuer Tab</string>
@@ -112,6 +117,12 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">Wichtige Seiten</string>
 
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">Zurückspringen</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">Alle anzeigen</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">Offene Tabs</string>
@@ -188,6 +199,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Bearbeiten</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Startbildschirm</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">Verbindung nicht möglich. Nicht erkennbares URL-Schema.</string>
@@ -555,8 +570,6 @@
     <string name="library_new_tab">Neuer Tab</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">In Seite suchen</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Synchronisierte Tabs</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Leseliste</string>
     <!-- Menu Item Label for Search in Library -->
@@ -602,6 +615,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Nach einem Monat</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Am Startbildschirm neu beginnen</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">Nach vier Stunden</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Immer</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Nie</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Manuell schließen</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -1602,6 +1624,10 @@
     <string name="credit_cards_card_number">Kartennummer</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">Ablaufdatum</string>
+    <!-- The label for the expiration date month of a credit card -->
+    <string name="credit_cards_expiration_date_month">Monat des Ablaufdatums</string>
+    <!-- The label for the expiration date year of a credit card -->
+    <string name="credit_cards_expiration_date_year">Jahr des Ablaufdatums</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">Name auf Karte</string>
     <!-- The header for the nickname for a credit card -->
@@ -1623,6 +1649,24 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Bitte geben Sie eine gültige Kreditkartennummer ein</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Bitte füllen Sie dieses Feld aus</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Zum Anzeigen Ihrer gespeicherten Karten entsperren</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Sichern Sie Ihre Kreditkarten</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Richten Sie ein Gerätesperrmuster, eine PIN oder ein Passwort ein, um zu verhindern, dass auf Ihre gespeicherten Karten zugegriffen wird, wenn jemand anderes über Ihr Gerät verfügt.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Jetzt einrichten</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Später</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Entsperren Sie Ihr Gerät</string>
+
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Entsperren, um gespeicherte Kreditkartendaten zu verwenden</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Suchmaschine hinzufügen</string>
     <!-- Title of the Edit search engine screen -->
diff --git a/app/src/main/res/values-dsb/strings.xml b/app/src/main/res/values-dsb/strings.xml
index 5bc928a5b..1b15e5f5a 100644
--- a/app/src/main/res/values-dsb/strings.xml
+++ b/app/src/main/res/values-dsb/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_name_private_5">Priwatny %s</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (priwatny)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">Dalšne nastajenja</string>
@@ -47,6 +48,16 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">Wubrany</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">Njedawno skłaźone</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">Njedawno skłaźone cytańske znamjenja</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">Wšykne pokazaś</string>
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">Tłocašk „Wšykne skłaźone cytańske znamjenja pokazaś“</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s se pśez Mozilla zgótujo.</string>
 
@@ -93,13 +104,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Zachyśiś</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Wubjeŕśo wugótowanje za wócynjone rejtariki. Pśejźćo k nastajenjam a wubjeŕśo kśidno pód rejtarikowym naglědom.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">K nastajenjam</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Zachyśiś</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Nowy rejtarik</string>
@@ -109,6 +113,12 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">Nejcesćej woglědane sedła</string>
 
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">Slědk skócyś</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">Wšykne pokazaś</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">Wócynjone rejtariki</string>
@@ -183,6 +193,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Wobźěłaś</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Startowa wobrazowka</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">Zwisk njejo móžny. Njespóznawajobna URL-šema.</string>
@@ -545,8 +559,6 @@
     <string name="library_new_tab">Nowy rejtarik</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Na boku pytaś</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Synchronizěrowane rejtariki</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Cytańska lisćina</string>
     <!-- Menu Item Label for Search in Library -->
@@ -591,6 +603,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Pó jadnom mjasecu</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Na startowej wobrazowce zachopiś</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">Pó styrich góźinach</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Pśecej</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Nigda</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Manuelnje zacyniś</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -1571,6 +1592,10 @@
     <string name="credit_cards_card_number">Kórtowy numer</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">Datum płaśiwosći</string>
+    <!-- The label for the expiration date month of a credit card -->
+    <string name="credit_cards_expiration_date_month">Datum płaśiwosći (mjasec)</string>
+    <!-- The label for the expiration date year of a credit card -->
+    <string name="credit_cards_expiration_date_year">Datum płaśiwosći (lěto)</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">Mě na kórśe</string>
     <!-- The header for the nickname for a credit card -->
@@ -1592,6 +1617,24 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Pšosym zapódajśo płaśiwy numer kreditoweje kórty</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Pšosym wupołńśo toś to pólo</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Za zwobraznjowanje wašych skłaźonych kreditowych kórtow wótwóriś</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Kreditowe kórty zawěsćiś</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Nastajśo rědowy zastajeński muster, PIN abo gronidło, aby pśistupoju k swójim skłaźonym kreditowym kórtam zajźował, jolic něchten drugi ma waš rěd.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Něnto konfigurěrowaś</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Pózdźej</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Wótwóŕśo swój rěd</string>
+
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Blokěrowanje wótpóraś, aby se skłaźone informacije kreditoweje kórty wužywali</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Pytnicu pśidaś</string>
     <!-- Title of the Edit search engine screen -->
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index c7411e2ef..96bebd936 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -5,6 +5,7 @@
     <string name="app_name_private_5">Ιδιωτικό %s</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (Ιδιωτικό)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">Περισσότερες επιλογές</string>
@@ -54,6 +55,17 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">Επιλέχθηκε</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">Πρόσφατα αποθηκευμένα</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">Πρόσφατα αποθηκευμένοι σελιδοδείκτες</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">Εμφάνιση όλων</string>
+
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">Κουμπί εμφάνισης όλων των αποθηκευμένων σελιδοδεικτών</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">Το %1$s αναπτύσσεται από τη Mozilla.</string>
 
@@ -98,13 +110,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Απόρριψη</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Αλλάξτε τη διάταξη των ανοικτών καρτελών. Μεταβείτε στις ρυθμίσεις και επιλέξτε &quot;Πλέγμα&quot; στο μενού προβολής καρτελών.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Μετάβαση στις ρυθμίσεις</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Απόρριψη</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Νέα καρτέλα</string>
@@ -114,6 +119,12 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">Κορυφαίες σελίδες</string>
 
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">Επιστροφή</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">Εμφάνιση όλων</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">Ανοικτές καρτέλες</string>
@@ -189,6 +200,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Επεξεργασία</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Αρχική οθόνη</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">Αδυναμία σύνδεσης. Μη αναγνωρίσιμο σχήμα URL.</string>
@@ -554,8 +569,6 @@
     <string name="library_new_tab">Νέα καρτέλα</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Εύρεση στη σελίδα</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Συγχρονισμένες καρτέλες</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Λίστα ανάγνωσης</string>
     <!-- Menu Item Label for Search in Library -->
@@ -602,6 +615,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Μετά από ένα μήνα</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Εκκίνηση στην αρχική οθόνη</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">Μετά από τέσσερις ώρες</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Πάντα</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Ποτέ</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Χειροκίνητο κλείσιμο</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -1506,7 +1528,7 @@
     <!-- The header for the password for a login -->
     <string name="preferences_passwords_saved_logins_password">Κωδικός πρόσβασης</string>
     <!-- Message displayed in security prompt to reenter a secret pin to access saved logins -->
-    <string name="preferences_passwords_saved_logins_enter_pin">Εισάγετε ξανά το PIN σας</string>
+    <string name="preferences_passwords_saved_logins_enter_pin">Εισαγάγετε ξανά το PIN σας</string>
     <!-- Message displayed in security prompt to access saved logins -->
     <string name="preferences_passwords_saved_logins_enter_pin_description">Ξεκλειδώστε για να δείτε τις αποθηκευμένες συνδέσεις σας</string>
     <!-- Message displayed when a connection is insecure and we detect the user is entering a password -->
@@ -1589,6 +1611,10 @@
     <string name="credit_cards_card_number">Αριθμός κάρτας</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">Ημερομηνία λήξης</string>
+    <!-- The label for the expiration date month of a credit card -->
+    <string name="credit_cards_expiration_date_month">Μήνας ημερομηνίας λήξης</string>
+    <!-- The label for the expiration date year of a credit card -->
+    <string name="credit_cards_expiration_date_year">Έτος ημερομηνίας λήξης</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">Όνομα στην κάρτα</string>
     <!-- The header for the nickname for a credit card -->
@@ -1610,6 +1636,24 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Παρακαλώ εισαγάγετε έναν έγκυρο αριθμό πιστωτικής κάρτας</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Παρακαλώ συμπληρώστε αυτό το πεδίο</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Ξεκλειδώστε για να δείτε τις αποθηκευμένες κάρτες σας</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Ασφαλίστε τις πιστωτικές κάρτες σας</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Ορίστε ένα μοτίβο κλειδώματος συσκευής, ένα ΡΙΝ ή έναν κωδικό πρόσβασης για την προστασία των αποθηκευμένων πιστωτικών καρτών σας, σε περίπτωση που κάποιος τρίτος αποκτήσει πρόσβαση στη συσκευή σας.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Ρύθμιση τώρα</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Αργότερα</string>
+
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Ξεκλειδώστε τη συσκευή σας</string>
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Ξεκλειδώστε για χρήση των στοιχείων πιστωτικής κάρτας</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Προσθήκη μηχανής αναζήτησης</string>
     <!-- Title of the Edit search engine screen -->
diff --git a/app/src/main/res/values-en-rCA/strings.xml b/app/src/main/res/values-en-rCA/strings.xml
index 2b61a8116..76ac2be03 100644
--- a/app/src/main/res/values-en-rCA/strings.xml
+++ b/app/src/main/res/values-en-rCA/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_name_private_5">Private %s</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (Private)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">More options</string>
@@ -48,6 +49,16 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">Selected</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">Recently saved</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">Recently saved bookmarks</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">Show all</string>
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">Show all saved bookmarks button</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s is produced by Mozilla.</string>
 
@@ -93,13 +104,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Dismiss</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Change the layout of open tabs. Go to settings and select grid under tab view.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Go to settings</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Dismiss</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">New tab</string>
@@ -109,6 +113,12 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">Top sites</string>
 
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">Jump back in</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">Show all</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">Open Tabs</string>
@@ -183,6 +193,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Edit</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Home screen</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">Unable to connect. Unrecognizable URL scheme.</string>
@@ -542,8 +556,6 @@
     <string name="library_new_tab">New tab</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Find in page</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Synced tabs</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Reading List</string>
     <!-- Menu Item Label for Search in Library -->
@@ -588,6 +600,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">After one month</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Start on home</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">After four hours</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Always</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Never</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Close manually</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -1557,6 +1578,10 @@
     <string name="credit_cards_card_number">Card Number</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">Expiration Date</string>
+    <!-- The label for the expiration date month of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_month">Expiration Date Month</string>
+    <!-- The label for the expiration date year of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_year">Expiration Date Year</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">Name on Card</string>
     <!-- The header for the nickname for a credit card -->
@@ -1578,6 +1603,23 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Please enter a valid credit card number</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Please fill out this field</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Unlock to view your saved cards</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Secure your credit cards</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Set up a device lock pattern, PIN, or password to protect your saved credit cards from being accessed if someone else has your device.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Set up now</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Later</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Unlock your device</string>
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Unlock to use stored credit card information</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Add search engine</string>
     <!-- Title of the Edit search engine screen -->
diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
index ae6b39c13..2b78ff49f 100644
--- a/app/src/main/res/values-en-rGB/strings.xml
+++ b/app/src/main/res/values-en-rGB/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_name_private_5">Private %s</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (Private)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">More options</string>
@@ -47,6 +48,16 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">Selected</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">Recently saved</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">Recently saved bookmarks</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">Show all</string>
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">Show all saved bookmarks button</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s is produced by Mozilla.</string>
 
@@ -92,13 +103,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Dismiss</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Change the layout of open tabs. Go to settings and select grid under tab view.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Go to settings</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Dismiss</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">New tab</string>
@@ -108,6 +112,12 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">Top sites</string>
 
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">Jump back in</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">Show all</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">Open Tabs</string>
@@ -182,6 +192,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Edit</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Home screen</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">Unable to connect. Unrecognisable URL scheme.</string>
@@ -542,8 +556,6 @@
     <string name="library_new_tab">New tab</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Find in page</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Synchronised tabs</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Reading List</string>
     <!-- Menu Item Label for Search in Library -->
@@ -589,6 +601,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">After one month</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Start on home</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">After four hours</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Always</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Never</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Close manually</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -1560,6 +1581,10 @@
     <string name="credit_cards_card_number">Card Number</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">Expiration Date</string>
+    <!-- The label for the expiration date month of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_month">Expiration Date Month</string>
+    <!-- The label for the expiration date year of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_year">Expiration Date Year</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">Name on Card</string>
     <!-- The header for the nickname for a credit card -->
@@ -1581,6 +1606,23 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Please enter a valid credit card number</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Please fill out this field</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Unlock to view your saved cards</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Secure your credit cards</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Set up a device lock pattern, PIN, or password to protect your saved credit cards from being accessed if someone else has your device.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Set up now</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Later</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Unlock your device</string>
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Unlock to use stored credit card information</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Add search engine</string>
     <!-- Title of the Edit search engine screen -->
diff --git a/app/src/main/res/values-es-rAR/strings.xml b/app/src/main/res/values-es-rAR/strings.xml
index f212f8ea5..45f20cc44 100644
--- a/app/src/main/res/values-es-rAR/strings.xml
+++ b/app/src/main/res/values-es-rAR/strings.xml
@@ -5,6 +5,7 @@
     <string name="app_name_private_5">%s privado</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (Privado)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">Más opciones</string>
@@ -48,6 +49,16 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">Seleccionadas</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">Guardados recientemente</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">Marcadores guardados recientemente</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">Mostrar todos</string>
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">Mostrar todos los marcadores guardados</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s es producido por Mozilla.</string>
 
@@ -94,13 +105,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Descartar</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Cambiar el diseño de las pestañas abiertas. Ir a Ajustes y seleccionar cuadrícula bajo la sección de vista de pestañas.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Ir a Ajustes</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Descartar</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Nueva pestaña</string>
@@ -110,6 +114,12 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">Sitios importantes</string>
 
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">Volver a ver</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">Mostrar todas</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">Abrir pestañas</string>
@@ -186,6 +196,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Editar</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Pantalla de inicio</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">No se puede conectar. Esquema de URL irreconocible.</string>
@@ -558,8 +572,6 @@
     <string name="library_new_tab">Nueva pestaña</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Buscar en la página</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Pestañas sincronizadas</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Lista de lectura</string>
     <!-- Menu Item Label for Search in Library -->
@@ -605,6 +617,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Después de un mes</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Arrancar en inicio</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">Después de cuatro horas</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Siempre</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Nunca</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Cerrar manualmente</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -1589,6 +1610,10 @@
     <string name="credit_cards_card_number">Número de tarjeta</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">Fecha de vencimiento</string>
+    <!-- The label for the expiration date month of a credit card -->
+    <string name="credit_cards_expiration_date_month">Mes de fecha de vencimiento</string>
+    <!-- The label for the expiration date year of a credit card -->
+    <string name="credit_cards_expiration_date_year">Año de fecha de vencimiento</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">Nombre en la tarjeta</string>
     <!-- The header for the nickname for a credit card -->
@@ -1610,6 +1635,25 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Ingresá un número de tarjeta de crédito válido</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Se debe completar este campo</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Desbloqueá para ver los inicios de sesión guardados</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Asegurá tus tarjetas de crédito</string>
+
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Configurá un patrón de bloqueo del dispositivo, PIN o contraseña para proteger el acceso a tus tarjetas de crédito guardadas si alguien más tiene tu dispositivo.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Configurar ahora</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Más tarde</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Desbloqueá tu dispositivo</string>
+
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Desbloquear para usar la información almacenada de la tarjeta de crédito</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Agregar buscador</string>
 
diff --git a/app/src/main/res/values-es-rCL/strings.xml b/app/src/main/res/values-es-rCL/strings.xml
index e95a4a3cf..3a125a846 100644
--- a/app/src/main/res/values-es-rCL/strings.xml
+++ b/app/src/main/res/values-es-rCL/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_name_private_5">%s en modo privado</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (Private)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">Más opciones</string>
@@ -47,6 +48,16 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">Seleccionadas</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">Guardados recientemente</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">Marcadores guardados recientemente</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">Mostrar todo</string>
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">Botón para mostrar todos los marcadores guardados</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s es producido por Mozilla.</string>
 
@@ -92,13 +103,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Ocultar</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Cambia el diseño de las pestañas abiertas. Ve a Ajustes y selecciona cuadrícula bajo la sección de vista de pestañas.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Ir a ajustes</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Ignorar</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Nueva pestaña</string>
@@ -108,6 +112,12 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">Sitios frecuentes</string>
 
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">Regresar a</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">Mostrar todo</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">Pestañas abiertas</string>
@@ -182,6 +192,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Editar</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Pantalla de inicio</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">No se puede conectar. Esquema de URL irreconocible.</string>
@@ -544,8 +558,6 @@
     <string name="library_new_tab">Nueva pestaña</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Buscar en la página</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Pestañas sincronizadas</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Lista de lectura</string>
     <!-- Menu Item Label for Search in Library -->
@@ -590,6 +602,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Después de un mes</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Empezar en la pantalla de inicio</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">Tras cuatro horas</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Siempre</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Nunca</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Cerrar manualmente</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -1567,6 +1588,10 @@
     <string name="credit_cards_card_number">Número de tarjeta</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">Fecha de expiración</string>
+    <!-- The label for the expiration date month of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_month">Mes de expiración</string>
+    <!-- The label for the expiration date year of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_year">Año de expiración</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">Nombre en la tarjeta</string>
     <!-- The header for the nickname for a credit card -->
@@ -1588,6 +1613,23 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Por favor, ingresa un número de tarjeta de crédito válido</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Complete este campo</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Desbloquea para ver tus tarjetas guardadas</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Asegura tus tarjetas de crédito</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Configura un patrón de bloqueo de dispositivo, PIN o contraseña para proteger tus tarjetas de crédito guardadas, y así no sean accedidas si alguien más tiene tu dispositivo.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Configurar ahora</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Más tarde</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Desbloquea tu dispositivo</string>
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Desbloquea para usar información de la tarjeta de crédito almacenada</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Añadir motor de búsqueda</string>
     <!-- Title of the Edit search engine screen -->
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 3932e3c3f..973f80204 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -6,6 +6,7 @@
     <string name="app_name_private_5">%s privado</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (Privado)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">Más opciones</string>
@@ -51,6 +52,17 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">Seleccionada</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">Guardado recientemente</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">Marcadores guardados recientemente</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">Mostrar todos</string>
+
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">Mostrar todos los marcadores guardados</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s es producido por Mozilla.</string>
 
@@ -95,13 +107,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Descartar</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Cambia la disposición de las pestañas abiertas. Ve a ajustes y selecciona cuadrícula en el menú de vista de pestañas.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Ir a ajustes</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Descartar</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Nueva pestaña</string>
@@ -111,6 +116,12 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">Sitios favoritos</string>
 
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">Volver a esta pestaña</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">Mostrar todas</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">Pestañas abiertas</string>
@@ -187,6 +198,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Editar</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Pantalla de inicio</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">No se puede conectar. Esquema de URL irreconocible.</string>
@@ -556,8 +571,6 @@
     <string name="library_new_tab">Nueva pestaña</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Buscar en la página</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Pestañas sincronizadas</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Lista de lectura</string>
     <!-- Menu Item Label for Search in Library -->
@@ -602,6 +615,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Después de un mes</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Empezar desde el inicio</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">Tras cuatro horas</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Siempre</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Nunca</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Cerrar manualmente</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -1606,6 +1628,10 @@
     <string name="credit_cards_card_number">Número de tarjeta</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">Fecha de caducidad</string>
+    <!-- The label for the expiration date month of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_month">Mes de caducidad</string>
+    <!-- The label for the expiration date year of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_year">Año de caducidad</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">Nombre en la tarjeta</string>
     <!-- The header for the nickname for a credit card -->
@@ -1627,6 +1653,23 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Por favor, escriba un número válido de tarjeta de crédito</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Por favor, rellena este campo</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Desbloquear para ver tus tarjetas guardadas</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Asegurar tus tarjetas de crédito</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Configura un patrón de bloqueo, PIN o contraseña para proteger el acceso a tus tarjetas guardadas si alguien más accede a tu dispositivo.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Configurar ahora</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Más tarde</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Desbloquear tu dispositivo</string>
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Desbloquear para usar la información de la tarjeta de crédito almacenada</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Añadir buscador</string>
     <!-- Title of the Edit search engine screen -->
diff --git a/app/src/main/res/values-es-rMX/strings.xml b/app/src/main/res/values-es-rMX/strings.xml
index e7e21b488..32521c407 100644
--- a/app/src/main/res/values-es-rMX/strings.xml
+++ b/app/src/main/res/values-es-rMX/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_name_private_5">%s en modo privado</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (Privado)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">Más opciones</string>
@@ -47,6 +48,16 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">Seleccionadas</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">Guardado recientemente</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">Marcadores recién guardados</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">Mostrar todo</string>
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">Mostrar todos los marcadores guardados</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s es producido por Mozilla.</string>
 
@@ -90,13 +101,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Descartar</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Cambia el diseño de las pestañas abiertas. Ve a Ajustes y selecciona cuadrícula bajo vista de pestañas.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Ir a ajustes</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Ignorar</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Nueva pestaña</string>
@@ -106,6 +110,12 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">Sitios frecuentes</string>
 
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">Saltar hacia atrás</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">Mostrar todo</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">Abrir pestañas</string>
@@ -182,6 +192,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Editar</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Pantalla de inicio</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">No se puede conectar. Esquema de URL irreconocible.</string>
@@ -544,8 +558,6 @@
     <string name="library_new_tab">Nueva pestaña</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Buscar en la página</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Pestañas sincronizadas</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Lista de lectura</string>
     <!-- Menu Item Label for Search in Library -->
@@ -590,6 +602,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Después de un mes</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Comenzar en la página de inicio</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">Después de cuatro horas</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Siempre</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Nunca</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Cerrar manualmente</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -1566,6 +1587,10 @@
     <string name="credit_cards_card_number">Número de tarjeta</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">Fecha de caducidad</string>
+    <!-- The label for the expiration date month of a credit card -->
+    <string name="credit_cards_expiration_date_month">Mes de la fecha de vencimiento</string>
+    <!-- The label for the expiration date year of a credit card -->
+    <string name="credit_cards_expiration_date_year">Año de la fecha de vencimiento</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">Nombre en la tarjeta</string>
     <!-- The header for the nickname for a credit card -->
@@ -1585,6 +1610,24 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Favor de ingresar un número de tarjeta de crédito válido</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Por favor, lleva este campo</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Desbloquear para ver tus tarjetas guardadas</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Asegurar tus tarjetas de crédito</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Configura un patrón de bloqueo de dispositivo, PIN o contraseña para proteger el acceso a tus tarjetas guardadas si alguien más tiene tu dispositivo.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Configurar ahora</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Más tarde</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Desbloquear tu dispositivo</string>
+
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Desbloquear para usar la información almacenada de la tarjeta de crédito</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Agregar motor de búsqueda</string>
     <!-- Title of the Edit search engine screen -->
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 3c3cdaae9..8d77d09fa 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -6,6 +6,7 @@
     <string name="app_name_private_5">%s privado</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (Privado)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">Más opciones</string>
@@ -52,6 +53,16 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">Seleccionado</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">Guardados recientemente</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">Marcadores guardados recientemente</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">Mostrar todos</string>
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">Mostrar todos los marcadores guardados</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s es producido por Mozilla.</string>
 
@@ -99,13 +110,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Descartar</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Cambia el diseño de las pestañas abiertas. Ve a Ajustes y selecciona cuadrícula bajo vista de pestañas.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Ir a ajustes</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Ignorar</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Nueva pestaña</string>
@@ -115,6 +119,12 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">Sitios destacados</string>
 
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">Volver a ver</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">Mostrar todas</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">Pestañas abiertas</string>
@@ -190,6 +200,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Editar</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Pantalla de inicio</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">No se puede conectar. Esquema de URL irreconocible.</string>
@@ -545,7 +559,7 @@
     <!-- Option in library to open Desktop Bookmarks root page -->
     <string name="library_desktop_bookmarks_root">Marcadores de escritorio</string>
     <!-- Option in library to open Desktop Bookmarks "menu" page -->
-    <string name="library_desktop_bookmarks_menu">Menú Marcadores</string>
+    <string name="library_desktop_bookmarks_menu">Menú de marcadores</string>
     <!-- Option in library to open Desktop Bookmarks "toolbar" page -->
     <string name="library_desktop_bookmarks_toolbar">Barra de herramientas de marcadores</string>
     <!-- Option in library to open Desktop Bookmarks "unfiled" page -->
@@ -556,8 +570,6 @@
     <string name="library_new_tab">Nueva pestaña</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Buscar en la página</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Pestañas sincronizadas</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Lista de lectura</string>
     <!-- Menu Item Label for Search in Library -->
@@ -580,7 +592,7 @@
     %d is a placeholder for the number of tabs selected. -->
     <string name="recently_closed_tab">%d pestaña</string>
     <!-- Recently closed tabs screen message when there are no recently closed tabs -->
-    <string name="recently_closed_empty_message">No hay pestañas recientemente cerradas</string>
+    <string name="recently_closed_empty_message">No hay pestañas recientemente cerradas aquí</string>
 
     <!-- Tab Management -->
     <!-- Title of preference for tabs management -->
@@ -602,6 +614,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Después de un mes</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Empezar en la pantalla de inicio</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">Después de cuatro horas</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Siempre</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Nunca</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Cerrar manualmente</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -734,7 +755,7 @@
     <string name="history_delete_item">Eliminar</string>
     <!-- History multi select title in app bar
     The first parameter is the number of bookmarks selected -->
-    <string name="history_multi_select_title">Se seleccionó %1$d</string>
+    <string name="history_multi_select_title">%1$d seleccionados</string>
     <!-- Text for the button to clear selected history items. The first parameter
         is a digit showing the number of items you have selected -->
     <string name="history_delete_some">Eliminar %1$d elementos</string>
@@ -805,7 +826,7 @@
     <!-- Screen title for selecting a bookmarks folder -->
     <string name="bookmark_select_folder">Seleccionar carpeta</string>
     <!-- Confirmation message for a dialog confirming if the user wants to delete the selected folder -->
-    <string name="bookmark_delete_folder_confirmation_dialog">¿Seguro que quieres eliminar esta carpeta?</string>
+    <string name="bookmark_delete_folder_confirmation_dialog">¿Estás seguro de que quieres eliminar esta carpeta?</string>
     <!-- Confirmation message for a dialog confirming if the user wants to delete multiple items including folders. Parameter will be replaced by app name. -->
     <string name="bookmark_delete_multiple_folders_confirmation_dialog">%s eliminará los elementos seleccionados.</string>
     <!-- Snackbar title shown after a folder has been deleted. This first parameter is the name of the deleted folder -->
@@ -835,7 +856,7 @@
     <string name="bookmark_menu_save_button">Guardar</string>
     <!-- Bookmark multi select title in app bar
      The first parameter is the number of bookmarks selected -->
-    <string name="bookmarks_multi_select_title">Se seleccionó %1$d</string>
+    <string name="bookmarks_multi_select_title">%1$d seleccionados</string>
     <!-- Bookmark editing screen title -->
     <string name="edit_bookmark_fragment_title">Editar marcador</string>
     <!-- Bookmark folder editing screen title -->
@@ -1604,7 +1625,11 @@
     <!-- The header for the card number of a credit card -->
     <string name="credit_cards_card_number">Número de tarjeta</string>
     <!-- The header for the expiration date of a credit card -->
-    <string name="credit_cards_expiration_date">Fecha de caducidad</string>
+    <string name="credit_cards_expiration_date">Fecha de expiración</string>
+    <!-- The label for the expiration date month of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_month">Mes de expiración</string>
+    <!-- The label for the expiration date year of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_year">Año de expiración</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">Nombre en la tarjeta</string>
     <!-- The header for the nickname for a credit card -->
@@ -1624,6 +1649,24 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Por favor, ingresa un número de tarjeta de crédito válido</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Por favor completa este campo</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Desbloquea para ver tus tarjetas guardadas</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Asegura tus tarjetas de crédito</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Configura un patrón de bloqueo, PIN o contraseña para proteger el acceso a tus tarjetas guardadas si alguien más accede a tu dispositivo.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Configurar ahora</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Más tarde</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Desbloquea tu dispositivo</string>
+
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Desbloquea para usar la información de la tarjeta de crédito almacenada</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Agregar motor de búsqueda</string>
     <!-- Title of the Edit search engine screen -->
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 0f0419aa4..c957954db 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -174,6 +174,8 @@
     <!-- Browser menu button to configure reader mode appearance e.g. the used font type and size -->
     <string name="browser_menu_read_appearance">ظاهر</string>
 
+    <!-- Browser menu button to show reader view appearance controls e.g. the used font type and size -->
+    <string name="browser_menu_customize_reader_view">سفارشی‌سازی نمای مطالعه</string>
     <!-- Browser menu label for adding a bookmark -->
     <string name="browser_menu_add">افزودن</string>
     <!-- Browser menu label for editing a bookmark -->
@@ -226,7 +228,7 @@
     <!-- Text preview for smaller sized widgets -->
     <string name="search_widget_text_short">جست‌وجو</string>
     <!-- Text preview for larger sized widgets -->
-    <string name="search_widget_text_long">جست در جو اینترنت</string>
+    <string name="search_widget_text_long">جست‌وجو در وب</string>
 
     <!-- Content description (not visible, for screen readers etc.): Voice search -->
     <string name="search_widget_voice">جستجوی صوتی</string>
@@ -407,6 +409,11 @@
         and the third is the device model. -->
     <string name="default_device_name_2">%1$s روی %2$s %3$s</string>
 
+    <!-- Preference for syncing credit cards -->
+    <string name="preferences_sync_credit_cards">کارت‌های اعتباری</string>
+    <!-- Preference for syncing addresses -->
+    <string name="preferences_sync_address">آدرس‌ها</string>
+
     <!-- Send Tab -->
     <!-- Name of the "receive tabs" notification channel. Displayed in the "App notifications" system settings for the app -->
     <string name="fxa_received_tab_channel_name">زبانه‌های دریافت شده</string>
@@ -447,6 +454,8 @@
     <string name="preferences_marketing_data">ارزیابی داده</string>
     <!-- Preference description for marketing data collection, parameter is the app name (e.g. Firefox) -->
     <string name="preferences_marketing_data_description">به اشتراک‌ گذاری داده‌هایی در خصوص ویژیگی که شما در %1$s با  Leanplum تیم فروش موبایل ما.</string>
+    <!-- Preference description for marketing data collection -->
+    <string name="preferences_marketing_data_description2">داده‌های کاربردی اولیه را با Adjust، فراهم‌کنندهٔ بازریابی سیستم موبایل ما، اشتراک بگذارید</string>
     <!-- Title for studies preferences -->
     <string name="preference_experiments_2">مطالعات</string>
     <!-- Summary for studies preferences -->
@@ -613,6 +622,8 @@
     <string name="tab_tray_menu_item_share">به اشتراک‌گذار همه‌ی زبانه‌ها</string>
     <!-- Text shown in the menu to view recently closed tabs -->
     <string name="tab_tray_menu_recently_closed">زبانه‌های تازه بسته شده</string>
+    <!-- Text shown in the menu to view account settings -->
+    <string name="tab_tray_menu_account_settings">تنظیمات حساب</string>
     <!-- Text shown in the menu to view tab settings -->
     <string name="tab_tray_menu_tab_settings">تنظیمات سربرگ</string>
     <!-- Text shown in the menu for closing all tabs -->
@@ -967,6 +978,8 @@
     <string name="share_link_all_apps_subheader">همه عمل‌ها</string>
     <!-- Sub-header in the dialog to share a link to an app from the most-recent sorted list -->
     <string name="share_link_recent_apps_subheader">به تازگی استفاده شده</string>
+    <!-- An option from the three dot menu to into sync -->
+    <string name="sync_menu_sign_in">برای همگام‌سازی وارد شوید</string>
     <!-- An option from the share dialog to sign into sync -->
     <string name="sync_sign_in">برای همگام‌سازی وارد شوید</string>
     <!-- An option from the share dialog to send link to all other sync devices -->
@@ -1165,6 +1178,10 @@
     <string name="onboarding_whats_new_description">در مورد طراحی مجدد %s سؤالی دارید؟ آیا می خواهید بدانید چه چیزی تغییر کرده است؟</string>
     <!-- text for underlined clickable link that is part of "what's new" onboarding card description that links to an FAQ -->
     <string name="onboarding_whats_new_description_linktext">پاسخ را از اینجا دریافت کنید</string>
+    <!-- text for the Firefox account onboarding sign in card header. The word "Firefox" should not be translated -->
+    <string name="onboarding_account_sign_in_header_1">همگام‌سازی Firefox بین دستگاه‌ها</string>
+    <!-- Text for the button to learn more about signing in to your Firefox account -->
+    <string name="onboarding_manual_sign_in_description">نشانک‌ها، تاریخچه و گذرواژه‌های خود را به Firefox در این دستگاه بیاورید.</string>
     <!-- text for the firefox account onboarding card header when we detect you're already signed in to
         another Firefox browser. (The word `Firefox` should not be translated)
         The first parameter is the email of the detected user's account -->
@@ -1181,13 +1198,25 @@
     <string name="onboarding_firefox_account_sync_is_on">همگام سازی روشن است</string>
     <!-- text to display in the snackbar if automatic sign-in fails. user may try again -->
     <string name="onboarding_firefox_account_automatic_signin_failed">ورود شکست خورد</string>
+    <!-- text for the tracking protection onboarding card header -->
+    <string name="onboarding_tracking_protection_header_3">همیشه در حال حفاظت از حریم‌خصوصی</string>
+    <!-- text for the tracking protection card description. 'Firefox' intentionally hardcoded here -->
+    <string name="onboarding_tracking_protection_description_3">Firefox به طور خودکار شرکت‌ها را از پیگیری مخفیانهٔ شما در وب دور می‌کند.</string>
     <!-- text for tracking protection radio button option for standard level of blocking -->
     <string name="onboarding_tracking_protection_standard_button_2">استاندارد (پیش فرض)</string>
+    <!-- text for standard blocking option button description -->
+    <string name="onboarding_tracking_protection_standard_button_description_3">تعادل بین کارآیی و حریم‌خصوصی. بارگیری صفحات با سرعتی عادی.</string>
     <!-- text for tracking protection radio button option for strict level of blocking -->
     <string name="onboarding_tracking_protection_strict_button">سختگیرانه (توصیه می‌شود)</string>
     <!-- text for tracking protection radio button option for strict level of blocking -->
     <string name="onboarding_tracking_protection_strict_option">شدید</string>
 
+    <!-- text for strict blocking option button description -->
+    <string name="onboarding_tracking_protection_strict_button_description_3">مسدودسازی ردیاب‌های بیشتر، اما برخی امکانات داخل صفحات ممکن است از کار بیافتند.</string>
+    <!-- text for the toolbar position card header  -->
+    <string name="onboarding_toolbar_placement_header_1">محل قرارگیری نوار ابزار خود را انتخاب کنید</string>
+    <!-- text for the toolbar position card description -->
+    <string name="onboarding_toolbar_placement_description_1">نوار ابزار را در دسترس قرار دهید. آن را پایین نگه دارید، یا به بالا انتقال دهید.</string>
     <!-- text for the private browsing onboarding card header -->
     <string name="onboarding_private_browsing_header">مرور ناشناس</string>
     <!-- text for the private browsing onboarding card description
@@ -1214,6 +1243,8 @@
     <!-- Onboarding theme -->
     <!-- text for the theme picker onboarding card header -->
     <string name="onboarding_theme_picker_header">انتخاب زمینه</string>
+    <!-- text for the theme picker onboarding card description -->
+    <string name="onboarding_theme_picker_description_2">با حالت تاریک، کمی باتری ذخیره کنید و از چشمان خود محافظت کنید.</string>
     <!-- Automatic theme setting (will follow device setting) -->
     <string name="onboarding_theme_automatic_title">خودکار</string>
     <!-- Summary of automatic theme setting (will follow device setting) -->
@@ -1267,10 +1298,14 @@
     <string name="preference_enhanced_tracking_protection_explanation_learn_more">بیشتر بدانید</string>
     <!-- Preference for enhanced tracking protection for the standard protection settings -->
     <string name="preference_enhanced_tracking_protection_standard_default_1">استاندارد (پیش فرض)</string>
+    <!-- Preference description for enhanced tracking protection for the standard protection settings -->
+    <string name="preference_enhanced_tracking_protection_standard_description_4">تعادل بین کارآیی و حریم‌خصوصی. بارگیری صفحات با سرعتی عادی.</string>
     <!--  Accessibility text for the Standard protection information icon  -->
     <string name="preference_enhanced_tracking_protection_standard_info_button">آنچه توسط حفاظت ردیابی استاندارد مسدود شده است</string>
     <!-- Preference for enhanced tracking protection for the strict protection settings -->
     <string name="preference_enhanced_tracking_protection_strict">سخت گیرانه</string>
+    <!-- Preference description for enhanced tracking protection for the strict protection settings -->
+    <string name="preference_enhanced_tracking_protection_strict_description_3">مسدودسازی ردیاب‌های بیشتر، اما برخی امکانات داخل صفحات ممکن است از کار بیافتند.</string>
     <!--  Accessibility text for the Strict protection information icon  -->
     <string name="preference_enhanced_tracking_protection_strict_info_button">آنچه توسط حفاظت ردیابی سخت‌گیرانه مسدود شده است</string>
     <!-- Preference for enhanced tracking protection for the custom protection settings -->
@@ -1411,6 +1446,8 @@
     <string name="preferences_passwords_autofill">تکمیل خودکار</string>
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">همگام‌سازی ورود‌ها</string>
+    <!-- Preference for syncing saved logins in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices">همگام‌سازی اطلاعات ورودها بین دستگاه‌ها</string>
     <!-- Syncing saved logins in Fenix needs reconnect to sync -->
     <string name="preferences_passwords_sync_logins_reconnect">اتصال مجدد</string>
     <!-- Syncing saved logins in Fenix needs login -->
@@ -1503,6 +1540,37 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">مرتب سازی بر روی فهرست ورود</string>
 
+    <!-- Credit Cards Autofill -->
+    <!-- Preference and title for managing the settings for credit cards -->
+    <string name="preferences_credit_cards">کارت‌های اعتباری</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards">ذخیره و پُرکردن خودکار کارت‌ها</string>
+    <!-- Preference summary for saving and autofilling credit card data -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary">داده‌ها رمزنگاری شده‌اند</string>
+    <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
+    <string name="preferences_credit_cards_sync_cards_across_devices">همگام‌سازی کارت‌ها بین دستگاه‌ها</string>
+    <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
+    <string name="preferences_credit_cards_sync_cards">همگام‌سازی کارت‌ها</string>
+    <!-- Preference option for adding a credit card -->
+    <string name="preferences_credit_cards_add_credit_card">اضافه کردن کارت اعتباری</string>
+    <!-- Preference option for managing saved credit cards -->
+    <string name="preferences_credit_cards_manage_saved_cards">مدیریت کارت‌های ذخیره شده</string>
+    <!-- Title of the "Add card" screen -->
+    <string name="credit_cards_add_card">اضافه کردن کارت</string>
+    <!-- Title of the "Edit card" screen -->
+    <string name="credit_cards_edit_card">ویرایش کارت</string>
+    <!-- The header for the card number of a credit card -->
+    <string name="credit_cards_card_number">شمارهٔ کارت</string>
+    <!-- The header for the expiration date of a credit card -->
+    <string name="credit_cards_expiration_date">تاریخ انقضا</string>
+    <!-- The header for the name on the credit card -->
+    <string name="credit_cards_name_on_card">نام روی کارت</string>
+    <!-- The header for the nickname for a credit card -->
+    <string name="credit_cards_card_nickname">نام مستعار کارت</string>
+    <!-- The text for the "Delete card" menu item for deleting a credit card -->
+    <string name="credit_cards_menu_delete_card">حذف کارت</string>
+    <!-- The text for the "Delete card" button for deleting a credit card -->
+    <string name="credit_cards_delete_card_button">حذف کارت</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
     <string name="credit_cards_menu_save">ذخیره</string>
     <!-- The text for the "Save" button for saving a credit card -->
@@ -1510,6 +1578,26 @@
     <!-- The text for the "Cancel" button for cancelling adding or updating a credit card -->
     <string name="credit_cards_cancel_button">انصراف</string>
 
+    <!-- Title of the "Saved cards" screen -->
+    <string name="credit_cards_saved_cards">کارت‌های ذخیره شده</string>
+
+    <!-- Error message for credit card number validation -->
+    <string name="credit_cards_number_validation_error_message">لطفا یک شمارهٔ کارت اعتباری معتبر وارد کنید</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">برای مشاهدهٔ کارت‌های اعتباری، قفل را باز کنید</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">کارت‌های اعتباری خود را ایمن کنید</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">در صورت دسترسی شخص دیگری از دستگاه شما، یک الگوی قفل دستگاه، PIN یا گذرواژه تنظیم کنید تا از اطلاعات کارت‌های اعتباری ذخیره شدهٔ خود محافظت کنید.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">راه‌اندازی</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">بعدا</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">باز کردن قفل دستگاه</string>
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">برای استفاده از اطلاعات کارت اعتباری ذخیره شده، قفل را باز کنید</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">افزودن موتور جست‌وجو</string>
     <!-- Title of the Edit search engine screen -->
@@ -1668,10 +1756,19 @@
 	<!-- Dialog button text for canceling the rename top site prompt. -->
 	<string name="top_sites_rename_dialog_cancel">انصراف</string>
 
+    <!-- Default browser experiment -->
+    <string name="default_browser_experiment_card_text">پیوندهای وب سایت‌ها، ایمیل‌ها و پیام‌ها را تنظیم کنید تا به طور خودکار در Firefox باز شوند.</string>
+
     <!-- Content description for close button in collection placeholder. -->
     <string name="remove_home_collection_placeholder_content_description">حذف</string>
 
     <!-- Content description radio buttons with a link to more information -->
     <string name="radio_preference_info_content_description">برای جزئیات بیشتر کلیک کنید</string>
 
-    </resources>
+    <!-- Content description for the action bar "up" button -->
+    <string name="action_bar_up_description">پیمایش به بالا</string>
+
+    <!-- Content description for privacy content close button -->
+    <string name="privacy_content_close_button_content_description">بستن</string>
+
+</resources>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 360d9d33e..bedaca5b5 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -5,6 +5,7 @@
     <string name="app_name_private_5">Yksityinen %s</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (Yksityinen)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">Lisää valintoja</string>
@@ -49,6 +50,16 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">Valittu</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">Äskettäin tallennettu</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">Äskettäin tallennetut kirjanmerkit</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">Näytä kaikki</string>
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">Näytä kaikki tallennetut kirjanmerkit -painike</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s on Mozillan tuote.</string>
 
@@ -94,13 +105,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Hylkää</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Muuta avoimien välilehtien asettelua. Siirry asetuksiin ja valitse ruudukko välilehtinäkymästä.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Siirry asetuksiin</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Hylkää</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Uusi välilehti</string>
@@ -110,6 +114,12 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">Ykkössivustot</string>
 
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">Palaa takaisin</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">Näytä kaikki</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">Avoimet välilehdet</string>
@@ -187,6 +197,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Muokkaa</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Aloitusnäkymä</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">Yhteyden muodostaminen epäonnistui. URL-skeeman tunnistaminen ei onnistu.</string>
@@ -554,8 +568,6 @@
     <string name="library_new_tab">Uusi välilehti</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Etsi sivulta</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Synkronoidut välilehdet</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Lukulista</string>
     <!-- Menu Item Label for Search in Library -->
@@ -601,6 +613,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Yhden kuukauden jälkeen</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Käynnistä aloitusnäkymästä</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">Neljän tunnin jälkeen</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Aina</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Ei koskaan</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Sulje manuaalisesti</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -1586,6 +1607,10 @@
     <string name="credit_cards_card_number">Kortin numero</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">Vanhenemispäivä</string>
+    <!-- The label for the expiration date month of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_month">Vanhenemispäivän kuukausi</string>
+    <!-- The label for the expiration date year of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_year">Vanhenemispäivän vuosi</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">Nimi kortissa</string>
     <!-- The header for the nickname for a credit card -->
@@ -1607,6 +1632,24 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Kirjoita kelvollinen luottokortin numero</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Täytä tämä kenttä</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Avaa lukitus nähdäksesi tallennetut kortit</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Suojaa luottokorttisi</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Aseta laitteen avaukseen tarkoitettu kuvio, PIN-koodi tai salasana suojataksesi tallennetut luottokorttitiedot siltä varalta, että joku saa laitteesi haltuunsa.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Aseta nyt</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Myöhemmin</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Avaa laitteen lukitus</string>
+
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Avaa lukitus käyttääksesi tallennettuja luottokorttitietoja</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Lisää hakukone</string>
     <!-- Title of the Edit search engine screen -->
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 45f995d73..d3a55ab76 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -6,6 +6,7 @@
     <string name="app_name_private_5">%s privé</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (nav. privée)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">Plus d’options</string>
@@ -50,6 +51,16 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">Sélectionné</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">Récemment enregistrés</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">Marque-pages récemment enregistrés</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">Tout afficher</string>
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">Bouton Afficher tous les marque-pages enregistrés</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s est réalisé par Mozilla.</string>
 
@@ -94,13 +105,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Ignorer</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Modifiez la disposition des onglets ouverts. Allez dans les paramètres et sélectionnez « Grille » sous « Affichage des onglets ».</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Ouvrir les paramètres</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Ignorer</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Nouvel onglet</string>
@@ -110,6 +114,12 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">Sites principaux</string>
 
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">Revenir dans cet onglet</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">Tout afficher</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">Onglets ouverts</string>
@@ -186,6 +196,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Modifier</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Écran d’accueil</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">Impossible de se connecter. Schéma d’URL inconnu.</string>
@@ -417,6 +431,11 @@
         and the third is the device model. -->
     <string name="default_device_name_2">%1$s sur %2$s %3$s</string>
 
+    <!-- Preference for syncing credit cards -->
+    <string name="preferences_sync_credit_cards">Cartes bancaires</string>
+    <!-- Preference for syncing addresses -->
+    <string name="preferences_sync_address">Adresses</string>
+
     <!-- Send Tab -->
     <!-- Name of the "receive tabs" notification channel. Displayed in the "App notifications" system settings for the app -->
     <string name="fxa_received_tab_channel_name">Onglets reçus</string>
@@ -550,8 +569,6 @@
     <string name="library_new_tab">Nouvel onglet</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Rechercher dans la page</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Onglets synchronisés</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Liste de lecture</string>
     <!-- Menu Item Label for Search in Library -->
@@ -596,6 +613,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Après un mois</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Démarrer par l’écran d’accueil</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">Après quatre heures</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Toujours</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Jamais</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Fermeture manuelle</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -1598,6 +1624,10 @@ Cependant, il peut être moins stable. Téléchargez la version bêta de notre n
     <string name="credit_cards_card_number">Numéro de carte</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">Date d’expiration</string>
+    <!-- The label for the expiration date month of a credit card -->
+    <string name="credit_cards_expiration_date_month">Mois d’expiration</string>
+    <!-- The label for the expiration date year of a credit card -->
+    <string name="credit_cards_expiration_date_year">Année d’expiration</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">Nom du titulaire</string>
     <!-- The header for the nickname for a credit card -->
@@ -1619,6 +1649,23 @@ Cependant, il peut être moins stable. Téléchargez la version bêta de notre n
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Veuillez saisir un numéro de carte bancaire valide</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Veuillez compléter ce champ</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Déverrouillez pour afficher vos cartes enregistrées</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Protégez vos cartes bancaires</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Configurez un schéma de verrouillage, un code PIN ou un mot de passe pour protéger vos cartes bancaires enregistrées si jamais quelqu’un accède à votre appareil.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Configurer maintenant</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Plus tard</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Déverrouillez votre appareil</string>
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Déverrouillez pour utiliser les informations de cartes bancaires enregistrées</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Ajouter un moteur de recherche</string>
     <!-- Title of the Edit search engine screen -->
@@ -1786,4 +1833,10 @@ Cependant, il peut être moins stable. Téléchargez la version bêta de notre n
     <!-- Content description radio buttons with a link to more information -->
     <string name="radio_preference_info_content_description">Cliquez pour plus de précisions</string>
 
-    </resources>
+    <!-- Content description for the action bar "up" button -->
+    <string name="action_bar_up_description">Remonter</string>
+
+    <!-- Content description for privacy content close button -->
+    <string name="privacy_content_close_button_content_description">Fermer</string>
+
+</resources>
diff --git a/app/src/main/res/values-fy-rNL/strings.xml b/app/src/main/res/values-fy-rNL/strings.xml
index 4d1d621ec..6ffa03cc8 100644
--- a/app/src/main/res/values-fy-rNL/strings.xml
+++ b/app/src/main/res/values-fy-rNL/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_name_private_5">Privee %s</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (Privee)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">Mear opsjes</string>
@@ -48,6 +49,16 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">Selektearre</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">Koartlyn bewarre</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">Resint bewarre blêdwizers</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">Alles toane</string>
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">Knop Alle bewarre blêdwizers toane</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s is makke troch Mozilla.</string>
 
@@ -95,13 +106,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Slute</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Wizigje de opmaak fan iepen ljepblêden. Gean nei Ynstellingen en selektearje ûnder Ljepblêdwerjefte ‘Raster’.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Nei Ynstellingen</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Slute</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Nij ljepblêd</string>
@@ -111,6 +115,12 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">Topwebsites</string>
 
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">Tebekspringe</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">Alles toane</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">Iepen ljepblêden</string>
@@ -186,6 +196,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Bewurkje</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Startskerm</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">Net yn steat te ferbinen. Unkenbere URL-skema.</string>
@@ -547,8 +561,6 @@
     <string name="library_new_tab">Nij ljepblêd</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Sykje op side</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Syngronisearre ljepblêden</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Lêslist</string>
     <!-- Menu Item Label for Search in Library -->
@@ -593,6 +605,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Nei ien moanne</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Op startskerm begjinne</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">Nei fjouwer oer</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Altyd</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Nea</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Hânmjittich slute</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -1570,6 +1591,10 @@
     <string name="credit_cards_card_number">Kaartnûmer</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">Ferrindatum</string>
+    <!-- The label for the expiration date month of a credit card -->
+    <string name="credit_cards_expiration_date_month">Ferrindatum – moanne</string>
+    <!-- The label for the expiration date year of a credit card -->
+    <string name="credit_cards_expiration_date_year">Ferrindatum – jier</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">Namme op kaart</string>
     <!-- The header for the nickname for a credit card -->
@@ -1591,6 +1616,25 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Fier in jildich creditkaartnûmer yn</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Folje dit fjild yn</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Untskoattelje om jo bewarre kaarten te besjen</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Befeiligje jo creditcards</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Stel in beskoattelingspatroan, pinkoade of wachtwurd foar jo apparaat yn om jo bewarre creditcards te beskermjen tsjin tagong as in oar jo apparaat hat.</string>
+
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">No ynstelle</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Letter</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Untskoattelje jo apparaat</string>
+
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Untskoattelje om bewarre creditkaartynformaasje te brûken</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Sykmasine tafoegje</string>
     <!-- Title of the Edit search engine screen -->
diff --git a/app/src/main/res/values-gn/strings.xml b/app/src/main/res/values-gn/strings.xml
index 5960304b5..f99359bc7 100644
--- a/app/src/main/res/values-gn/strings.xml
+++ b/app/src/main/res/values-gn/strings.xml
@@ -5,6 +5,7 @@
     <string name="app_name_private_5">Ñemigua %s</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (Ñemigua)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">Jeporavorãve</string>
@@ -49,6 +50,16 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">Poravopyre</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">Oñeñongaturamóva</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">Techaukaha oñeñongaturamóva</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">Techaukapaite</string>
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">Ehechauka opaite techaukaha ñongatupyre</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s ojapókuri Mozilla.</string>
 
@@ -95,13 +106,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Mboyke</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Emoambue tendayke ijurujáva oĩha. Eho moĩporãhápe ha eiporavo kora’ieta tendyke rechaha poravorãme.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Eho ñembohekópe</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Mboyke</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Tendayke pyahu</string>
@@ -111,6 +115,12 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">Tenda jehayhuvéva</string>
 
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">Epo tapykue gotyo</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">Techaukapaite</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">Embojuruja tendayke</string>
@@ -187,6 +197,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Mbosako’i</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Mba’erechaha ñepyrũgua</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">Ndaikatúi eike. URL reko ojekuaa’ỹva.</string>
@@ -419,6 +433,11 @@
         and the third is the device model. -->
     <string name="default_device_name_2">%1$s %2$s %3$s-pe</string>
 
+    <!-- Preference for syncing credit cards -->
+    <string name="preferences_sync_credit_cards">Kuatia’atã ñemurã</string>
+    <!-- Preference for syncing addresses -->
+    <string name="preferences_sync_address">Kundaharape</string>
+
     <!-- Send Tab -->
     <!-- Name of the "receive tabs" notification channel. Displayed in the "App notifications" system settings for the app -->
     <string name="fxa_received_tab_channel_name">Tendayke g̃uahẽmbyre</string>
@@ -548,8 +567,6 @@
     <string name="library_new_tab">Tendayke pyahu</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Eheka kuatiaroguépe</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Tendayke mbojuehepyre</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Moñe’ẽrã rysýi</string>
 
@@ -595,6 +612,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Peteĩ jasy rire</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Eñepyrũ yvyetégui</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">Irundy aravo rire</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Tapiaite</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Araka’eve</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Emboty nde pópe</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -1595,6 +1621,10 @@
     <string name="credit_cards_card_number">Kuatia’atã papy</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">Arange opaha</string>
+    <!-- The label for the expiration date month of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_month">Jasýma opahague</string>
+    <!-- The label for the expiration date year of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_year">Arýma opahague</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">Kuatia’atã réra</string>
     <!-- The header for the nickname for a credit card -->
@@ -1616,6 +1646,24 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Ikatúpiko ehai kuatia’atã ñemurã papapy oikóva</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Ikatúpiko emyenyhẽ ko kora</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Embojuruja ehecha hag̃ua kuatia’atã ñongatupyre</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Emohekorosã nde kuatia’atã ñemurã</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Emboheko peteĩ jekokoha rape, PIN térã ñe’ẽñemi emo’ã hag̃ua nde kuatia’atã ñongatupyre ambue oikeséramo ne mba’e’okápe.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Emboheko ko’ág̃a</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Upéi</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Embojuruja ne mba’e’oka</string>
+
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Embojuruja eipuru hag̃ua kuatia’atã ñemurã marandu mbyatypyre</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Embojuaju hekaha</string>
     <!-- Title of the Edit search engine screen -->
@@ -1786,4 +1834,10 @@
     <!-- Content description radio buttons with a link to more information -->
     <string name="radio_preference_info_content_description">Eikutu ápe eikuaave hag̃ua</string>
 
-    </resources>
+    <!-- Content description for the action bar "up" button -->
+    <string name="action_bar_up_description">Eikundaha yvate gotyo</string>
+
+    <!-- Content description for privacy content close button -->
+    <string name="privacy_content_close_button_content_description">Mboty</string>
+
+</resources>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index db9d819ff..41f98c6af 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -5,6 +5,7 @@
     <string name="app_name_private_5">Privatni %s</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (privatno)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">Više opcija</string>
@@ -49,6 +50,16 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">Odabrano</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">Nedavno spremljeno</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">Nedavno spremljene zabilješke</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">Prikaži sve</string>
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">Tipka za prikaz svih spremljenih zabilješki</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s proizvodi Mozilla.</string>
 
@@ -92,13 +103,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Odbaci</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Promijeni raspored otvorenih kartica. Idi u postavke i odaberi mrežu pod prikazom kartica.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Idi u postavke</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Odbaci</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Nova kartica</string>
@@ -108,6 +112,12 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">Omiljene stranice</string>
 
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">Vrati se natrag</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">Prikaži sve</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">Otvorene kartice</string>
@@ -182,6 +192,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Uredi</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Početni zaslon</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">Nije se moguće povezati. Neprepoznatljiva URL shema.</string>
@@ -548,8 +562,6 @@
     <string name="library_new_tab">Nova kartica</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Pronađi na stranici</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Sinkronizirane kartice</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Popis za čitanje</string>
     <!-- Menu Item Label for Search in Library -->
@@ -594,6 +606,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Nakon jednog mjeseca</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Počni na početnoj stranici</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">Nakon četiri sata</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Uvijek</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Nikad</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Zatvori ručno</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -1581,6 +1602,10 @@
     <string name="credit_cards_card_number">Broj kartice</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">Datum valjanosti</string>
+    <!-- The label for the expiration date month of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_month">Mjesec datuma valjanosti</string>
+    <!-- The label for the expiration date year of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_year">Godina datuma valjanosti</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">Ime na kartici</string>
     <!-- The header for the nickname for a credit card -->
@@ -1602,6 +1627,24 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Unesi važeći broj kreditne kartice</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Molimo ispuni ovo polje</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Otključaj za prikaz spremljenih kreditnih kartica</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Osiguraj svoje kreditne kartice</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Postavi uzorak za otključavanje uređaja, PIN ili lozinku da bi tvoje spremljene kreditne kartice bile zaštićene od neovlaštenog pristupa drugih osoba.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Postavi sada</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Kasnije</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Otključaj svoj uređaj</string>
+
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Otključ za korištenje spremljenih podataka o kreditnim karticama</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Dodaj tražilicu</string>
     <!-- Title of the Edit search engine screen -->
diff --git a/app/src/main/res/values-hsb/strings.xml b/app/src/main/res/values-hsb/strings.xml
index 8d459bf19..c635df12f 100644
--- a/app/src/main/res/values-hsb/strings.xml
+++ b/app/src/main/res/values-hsb/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_name_private_5">Priwatny %s</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (priwatny)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">Dalše nastajenja</string>
@@ -47,6 +48,16 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">Wubrany</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">Njedawno składowane</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">Njedawno składowane zapołožki</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">Wšě pokazać</string>
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">Tłóčatko „Wšě składowane zapołožki pokazać“</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s so přez Mozilla zhotowja.</string>
 
@@ -94,13 +105,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Zaćisnyć</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Wubjerće wuhotowanje za wočinjene rajtarki. Přeńdźće k nastajenjam a wubjerće lěsycu pod rajtarkowym napohladom.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">K nastajenjam</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Zaćisnyć</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Nowy rajtark</string>
@@ -110,6 +114,12 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">Najhusćišo wopytane sydła</string>
 
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">Wróćo skočić</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">Wšě pokazać</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">Wočinjene rajtarki</string>
@@ -184,6 +194,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Wobdźěłać</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Startowa wobrazowka</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">Zwisk móžny njeje. Njespóznawajomna URL-šema.</string>
@@ -547,8 +561,6 @@
     <string name="library_new_tab">Nowy rajtark</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Na stronje pytać</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Synchronizowane rajtarki</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Čitanska lisćina</string>
     <!-- Menu Item Label for Search in Library -->
@@ -594,6 +606,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Po jednym měsacu</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Na startowej wobrazowce započeć</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">Po štyrjoch hodźinach</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Přeco</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Ženje</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Manuelnje začinić</string>
 
@@ -1573,6 +1594,10 @@
     <string name="credit_cards_card_number">Kartowe čisło</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">Datum płaćiwosće</string>
+    <!-- The label for the expiration date month of a credit card -->
+    <string name="credit_cards_expiration_date_month">Datum płaćiwosće (měsac)</string>
+    <!-- The label for the expiration date year of a credit card -->
+    <string name="credit_cards_expiration_date_year">Datum płaćiwosće (lěto)</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">Mjeno na karće</string>
     <!-- The header for the nickname for a credit card -->
@@ -1594,6 +1619,24 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Prošu zapodajće płaćiwe čisło kreditneje karty</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Prošu wupjelńće tute polo</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Za zwobraznjenje wašich składowanych kartow wotewrěć</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Waše kreditne karty zawěsćić</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Nastajće gratowy zawrjenski muster, PIN abo hesło, zo byšće přistupej k swojim składowanym kreditnym kartam zadźěwał, jeli něchtó druhi waš grat ma.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Nětko konfigurować</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Pozdźišo</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Wotewriće swój grat</string>
+
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Blokowanje zběhnyć, zo bychu so składowane informacije kreditneje karty wužiwali</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Pytawu přidać</string>
     <!-- Title of the Edit search engine screen -->
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 68ca43cf1..47e8e157b 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -5,6 +5,7 @@
     <string name="app_name_private_5">Privát %s</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (Privát)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">További beállítások</string>
@@ -48,6 +49,16 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">Kiválasztva</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">Nemrég mentett</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">Legutóbb mentett könyvjelzők</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">Összes megjelenítése</string>
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">Az összes mentett könyvjelző megjelenítése gomb</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">A %1$s a Mozilla terméke.</string>
 
@@ -93,13 +104,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Eltüntetés</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">A nyitott lapok elrendezésének módosítása. Ugorjon a beállításokhoz, és válassza ki a rácsot a lapnézet alatt.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Ugrás a beállításokhoz</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Eltüntetés</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Új lap</string>
@@ -109,6 +113,12 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">Kedvenc oldalak</string>
 
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">Ugrás vissza</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">Összes megjelenítése</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">Nyitott lapok</string>
@@ -185,6 +195,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Szerkesztés</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Kezdőképernyő</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">Nem tud csatlakozni. Felismerhetetlen URL-séma.</string>
@@ -550,8 +564,6 @@
     <string name="library_new_tab">Új lap</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Keresés az oldalon</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Szinkronizált lapok</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Olvasási lista</string>
     <!-- Menu Item Label for Search in Library -->
@@ -596,6 +608,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Egy hónap után</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Kezdés a kezdőképernyőn</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">Négy óra után</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Mindig</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Soha</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Bezárás kézzel</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -1581,6 +1602,10 @@
     <string name="credit_cards_card_number">Kártyaszám</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">Lejárati dátum</string>
+    <!-- The label for the expiration date month of a credit card -->
+    <string name="credit_cards_expiration_date_month">Lejárati dátum hónapja</string>
+    <!-- The label for the expiration date year of a credit card -->
+    <string name="credit_cards_expiration_date_year">Lejárati dátum éve</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">Kártyán szereplő név</string>
     <!-- The header for the nickname for a credit card -->
@@ -1602,6 +1627,24 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Adjon meg egy érvényes bankkártyaszámot</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Töltse ki ezt a mezőt</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Feloldás a mentett kártyák megtekintéshez</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Biztosítsa bankkártyáit</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Állítsa be az eszköz lezárási mintáját, PIN-kódját vagy jelszavát, hogy megvédje a mentett bankkártyáit, ha valaki hozzáfér az eszközéhez.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Beállítás most</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Később</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Eszköz feloldása</string>
+
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Oldja fel, hogy a tárolt bankkártya-információkat használja</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Keresőszolgáltatás hozzáadása</string>
     <!-- Title of the Edit search engine screen -->
diff --git a/app/src/main/res/values-hy-rAM/strings.xml b/app/src/main/res/values-hy-rAM/strings.xml
index d9582c8ca..ad2c14bf1 100644
--- a/app/src/main/res/values-hy-rAM/strings.xml
+++ b/app/src/main/res/values-hy-rAM/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_name_private_5">Մասնավոր %s</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (մասնավոր)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">Լր. ընտրանքներ</string>
@@ -48,6 +49,16 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">Ընտրված</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">Վերջերս պահպանված</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">Վերջերս պահպանված էջանիշները</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">Ցուցադրել բոլորը</string>
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">Ցուցադրել բոլոր պահպանված էջանիշների կոճակը</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s-ը մշակված է Mozilla-ի կողմից:</string>
 
@@ -57,7 +68,7 @@
 
     <!-- Explanation for private browsing displayed to users on home view when they first enable private mode
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="private_browsing_placeholder_description_2">%1$s-ին մաքրում է որոնման և զննարկման պատմությունը, երբ փակում եք ներդիրը կամ դուրս եք գալիս հավելվածից: Չնայած դա ձեզ անանուն չի դարձնում կայքերի կամ ձեր համացանցի ծառայություններ մատուցողի համար, այն ավելի հեշտ է դարձնում ձեր առցանց ակտիվության գաղտնիությունը այն դեպքում, եթե մեկ ուրիշը ևս օգտագործում է տվյալ սարքը:</string>
+    <string name="private_browsing_placeholder_description_2">%1$s-ը մաքրում է որոնման և զննարկման պատմությունը, երբ փակում եք ներդիրը կամ դուրս եք գալիս հավելվածից: Չնայած դա ձեզ անանուն չի դարձնում կայքերի կամ ձեր համացանցի ծառայություններ մատուցողի համար, այն ավելի հեշտ է դարձնում ձեր առցանց ակտիվության գաղտնիությունը այն դեպքում, եթե մեկ ուրիշը ևս օգտագործում է տվյալ սարքը:</string>
     <string name="private_browsing_common_myths">Տարածված առասպելներ գաղտնի դիտարկման վերաբերյալ</string>
     <!-- Delete session button to erase your history in a private session -->
     <string name="private_browsing_delete_session">Ջնջել աշխատաշրջանը</string>
@@ -92,13 +103,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Բաց թողնել</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Փոխեք բացված ներդիրների դասավորությունը: Գնացեք կարգավորումներ և ընտրեք Ցանց՝ ներդիրի տեսքի ներքո:</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Անցնել Կարգավորումներին</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Բաց թողնել</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Նոր ներդիր</string>
@@ -109,6 +113,12 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">Լավագույն կայքեր</string>
 
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">Վերադառնալ</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">Ցուցադրել բոլորը</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">Բաց ներդիրներ</string>
@@ -184,6 +194,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Խմբագրել</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Հիմնական էկրան</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">Հնարավոր չէ կապակցվել: Անճանաչելի URL ուրվակազմ:</string>
@@ -545,8 +559,6 @@
     <string name="library_new_tab">Նոր ներդիր</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Գտնել էջում</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Համաժամեցված ներդիրներ</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Ընթերցացուցակ</string>
     <!-- Menu Item Label for Search in Library -->
@@ -591,6 +603,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Մեկ ամիս անց</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Սկսել տնից</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">Չորս ժամ անց</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Միշտ</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Երբեք</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Ձեռքով փակեք</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -928,7 +949,7 @@
     <!-- Content description (not visible, for screen readers etc.): Opens the collection menu when pressed -->
     <string name="collection_menu_button_content_description">Հավաքածուի ցանկ</string>
     <!-- Label to describe what collections are to a new user without any collections -->
-    <string name="no_collections_description2">Հավաքեք ձեզ համար կարևոր բաները:\nԽմբավորեք համանման որոնումները, կայքերը և ներդիրները՝ ավելի ուշ արագ մատչելու համար:</string>
+    <string name="no_collections_description2">Հավաքեք ձեզ համար կարևոր բաները:\nԽմբավորեք համանման որոնումները, կայքերը և ներդիրները՝ հետո ավելի արագ մատչելու համար:</string>
     <!-- Title for the "select tabs" step of the collection creator -->
     <string name="create_collection_select_tabs">Ընտրեք ներդիրները</string>
     <!-- Title for the "select collection" step of the collection creator -->
@@ -1529,7 +1550,7 @@
     <!-- Message of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_message">Ստեղծեք սարքի կողպեքի նմուշ, PIN կամ գաղտնաբառ՝ ձեր պահպանված մուտքանունները և գաղտնաբառերը մուտք գործելուց պաշտպանելու համար, եթե ձեր սարքը ուրիշի ձեռքն ընկնի:</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_later">Ավելի ուշ</string>
+    <string name="logins_warning_dialog_later">Հետո</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_set_up_now">Տեղակայել հիմա</string>
     <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their logins -->
@@ -1570,6 +1591,10 @@
     <string name="credit_cards_card_number">Քարտի համարը</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">Քարտի ժամկետը</string>
+    <!-- The label for the expiration date month of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_month">Ժամկետի ամսաթվի ամիսը</string>
+    <!-- The label for the expiration date year of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_year">Ժամկետի ամսաթվի տարին</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">Քարտի վրա ձեր անունը</string>
     <!-- The header for the nickname for a credit card -->
@@ -1591,6 +1616,23 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Մուտքագրեք բանկային վավեր քարտի համար</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Լրացրեք այս դաշտը</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Ապակողպեք՝ դիտելու համար պահպանված քարտերը</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Անվտանգ դարձրեք ձեր բանկային քարտերը</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Տեղակայեք սարքի կողպման նախշ, PIN կամ գաղտնաբառ՝ պաշտպանելու պահված բանկային քարտերը այն դեպքում, եթե որևէ մեկը ևս մուտք ունի Ձեր սարքին:</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Տեղակայել հիմա</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Ավելի ուշ</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Ապակողպեք ձեր սարքը</string>
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Ապակողպեք՝ օգտագործելու համար բանկային քարտերի պահված տեղեկությունները</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Ավելացնել որոնիչ</string>
     <!-- Title of the Edit search engine screen -->
diff --git a/app/src/main/res/values-ia/strings.xml b/app/src/main/res/values-ia/strings.xml
index 7d3f87146..2003600d5 100644
--- a/app/src/main/res/values-ia/strings.xml
+++ b/app/src/main/res/values-ia/strings.xml
@@ -6,6 +6,7 @@
     <string name="app_name_private_5">%s anonyme</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (nav. anonyme)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu"></string>
@@ -36,7 +37,7 @@
     <!-- Content description for close button while in multiselect mode in tab tray -->
     <string name="tab_tray_close_multiselect_content_description">Exir del modo multiselection</string>
     <!-- Content description for save to collection button while in multiselect mode in tab tray -->
-    <string name="tab_tray_collection_button_multiselect_content_description">Salvar schedas eligite al collection</string>
+    <string name="tab_tray_collection_button_multiselect_content_description">Salvar le schedas seligite in un collection</string>
     <!-- Content description for checkmark while tab is selected while in multiselect mode in tab tray. The first parameter is the title of the tab selected -->
     <string name="tab_tray_item_selected_multiselect_content_description">Selecte %1$s</string>
     <!-- Content description when tab is unselected while in multiselect mode in tab tray. The first parameter is the title of the tab unselected -->
@@ -48,6 +49,16 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">Seligite</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">Salvate recentemente</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">Marcapaginas recentemente salvate</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">Monstrar toto</string>
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">Monstrar tote le button marcapaginas salvate</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s es producite per Mozilla.</string>
 
@@ -94,13 +105,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Dimitter</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Cambio le disposition de schedas aperte. Vade a parametros e selige grillia sub le scheda vider.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Vade a parametros</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Dimitter</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Nove scheda</string>
@@ -109,6 +113,12 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">Sitos popular</string>
 
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">Revenir in</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">Monstrar toto</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">Schedas aperte</string>
@@ -185,6 +195,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Rediger</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Pagina initial</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">Connexion impossibile. Schema de URL non recognoscibile</string>
@@ -417,6 +431,11 @@
         and the third is the device model. -->
     <string name="default_device_name_2">%1$s sur %2$s %3$s</string>
 
+    <!-- Preference for syncing credit cards -->
+    <string name="preferences_sync_credit_cards">Cartas de credito</string>
+    <!-- Preference for syncing addresses -->
+    <string name="preferences_sync_address">Adresses</string>
+
     <!-- Send Tab -->
     <!-- Name of the "receive tabs" notification channel. Displayed in the "App notifications" system settings for the app -->
     <string name="fxa_received_tab_channel_name">Schedas recipite</string>
@@ -451,9 +470,6 @@
     <!-- Text displayed when there are no exceptions, with learn more link that brings users to a tracking protection SUMO page -->
     <string name="exceptions_empty_message_learn_more_link">Saper plus</string>
 
-    <!-- Description in Quick Settings that tells user tracking protection is off globally for all sites, and links to Settings to turn it on -->
-    <string name="preferences_tracking_protection_turned_off_globally">Disactivate globalmente, vade a parametros pro activar lo.</string>
-
     <!-- Preference switch for Telemetry -->
     <string name="preferences_telemetry">Telemetria</string>
     <!-- Preference switch for usage and technical data collection -->
@@ -468,6 +484,8 @@
 
     <!-- Preference description for marketing data collection, parameter is the app name (e.g. Firefox) -->
     <string name="preferences_marketing_data_description">Comparti datos re le functionalitates que tu usa in %1$s con Leanplum, nostre venditor de mercato mobile.</string>
+    <!-- Preference description for marketing data collection -->
+    <string name="preferences_marketing_data_description2">Comparti le datos de uso basic con Adjust, nostre fornitor de marketing mobile</string>
     <!-- Title for studies preferences -->
     <string name="preference_experiments_2">Studios</string>
     <!-- Summary for studies preferences -->
@@ -562,8 +580,6 @@
     <string name="library_new_tab">Nove scheda</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Trovar in le pagina</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Schedas synchronisate</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Lista de lectura</string>
     <!-- Menu Item Label for Search in Library -->
@@ -610,6 +626,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Depost un mense</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Initiar al pagina initial</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">Post quatro horas</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Sempre</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Nunquam</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Clauder manualmente</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -667,11 +692,11 @@
     <!-- Text shown in the multiselect menu for closing selected tabs. -->
     <string name="tab_tray_multiselect_menu_item_close">Clauder</string>
     <!-- Content description for tabs tray multiselect share button -->
-    <string name="tab_tray_multiselect_share_content_description">Compartir schedas eligite</string>
+    <string name="tab_tray_multiselect_share_content_description">Compartir le schedas seligite</string>
 
 
     <!-- Content description for tabs tray multiselect menu -->
-    <string name="tab_tray_multiselect_menu_content_description">Menu del schedas eligite</string>
+    <string name="tab_tray_multiselect_menu_content_description">Menu de schedas seligite</string>
     <!-- Content description (not visible, for screen readers etc.): Removes tab from collection button. Removes the selected tab from collection when pressed -->
     <string name="remove_tab_from_collection">Remover le scheda ex le collection</string>
     <!-- Text for button to enter multiselect mode in tabs tray -->
@@ -822,8 +847,6 @@
     <string name="bookmark_delete_folder_snackbar">Delite %1$s</string>
     <!-- Screen title for adding a bookmarks folder -->
     <string name="bookmark_add_folder">Adder plica</string>
-    <!-- deprecated: Snackbar title shown after a bookmark has been created. -->
-    <string name="bookmark_created_snackbar">Marcapagina create.</string>
     <!-- Snackbar title shown after a bookmark has been created. -->
     <string name="bookmark_saved_snackbar">Marcapagina salvate!</string>
     <!-- Snackbar edit button shown after a bookmark has been created. -->
@@ -977,7 +1000,7 @@
 
     <!-- Text to show users how many tabs they have selected in the "select tabs" step of the collection creator.
      %d is a placeholder for the number of tabs selected. -->
-    <string name="create_collection_save_to_collection_tabs_selected">%d schedas eligite</string>
+    <string name="create_collection_save_to_collection_tabs_selected">%d schedas seligite</string>
     <!-- Text to show users they have one tab selected in the "select tabs" step of the collection creator.
     %d is a placeholder for the number of tabs selected. -->
     <string name="create_collection_save_to_collection_tab_selected">%d scheda seligite</string>
@@ -1500,10 +1523,8 @@
     <string name="preferences_passwords_autofill">Autoplenar</string>
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Synchronisar credentiales</string>
-    <!-- Syncing saved logins in Fenix is on -->
-    <string name="preferences_passwords_sync_logins_on">Active</string>
-    <!-- Syncing saved logins in Fenix is off -->
-    <string name="preferences_passwords_sync_logins_off">Inactive</string>
+    <!-- Preference for syncing saved logins in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices">Synchronisar credentiales inter le apparatos</string>
     <!-- Syncing saved logins in Fenix needs reconnect to sync -->
     <string name="preferences_passwords_sync_logins_reconnect">Reconnecter</string>
     <!-- Syncing saved logins in Fenix needs login -->
@@ -1605,6 +1626,8 @@
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Synchronisar cartas inter apparatos</string>
 
+    <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
+    <string name="preferences_credit_cards_sync_cards">Synchronisar cartas</string>
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Adde un carta de credito</string>
     <!-- Preference option for managing saved credit cards -->
@@ -1617,6 +1640,10 @@
     <string name="credit_cards_card_number">Numero del carta</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">Data de expiration</string>
+    <!-- The label for the expiration date month of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_month">Mense de expiration</string>
+    <!-- The label for the expiration date year of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_year">Anno de expiration</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">Nomine sur le carta</string>
     <!-- The header for the nickname for a credit card -->
@@ -1635,6 +1662,27 @@
     <!-- Title of the "Saved cards" screen -->
     <string name="credit_cards_saved_cards">Cartas salvate</string>
 
+    <!-- Error message for credit card number validation -->
+    <string name="credit_cards_number_validation_error_message">Insere un numero valide de carta de credito</string>
+
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Completa iste campo</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Disbloca pro vider tu cartas salvate</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Protege tu carta de credito</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Implementa un patrono de blocada apparato, PIN o contrasigno pro proteger tu cartas de credito de esser accedite, si alcuno altere ha tu apparato.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Implementar ora</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Plus tarde</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Disbloca tu apparato</string>
+
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Disbloca pro usar le informationes de carta de credito immagazinate</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Adder motor de recerca</string>
     <!-- Title of the Edit search engine screen -->
@@ -1799,19 +1847,13 @@
     <!-- Content description for close button in collection placeholder. -->
     <string name="remove_home_collection_placeholder_content_description">Remover</string>
 
-    <!-- Deprecated: text for the firefox account onboarding card header
-    The first parameter is the name of the app (e.g. Firefox Preview) -->
-    <string name="onboarding_firefox_account_header">Obtene le maximo de %s.</string>
-
     <!-- Content description radio buttons with a link to more information -->
     <string name="radio_preference_info_content_description">Clicca pro altere detalios</string>
 
-    <!-- Deprecated: No Open Tabs Message Header -->
-    <string name="no_collections_header1">Collige le objectos que te interessa</string>
-    <!-- Deprecated: Label to describe what collections are to a new user without any collections -->
-    <string name="no_collections_description1">Gruppa insimul recercas simile, sitos e schedas pro acceder rapidemente plus tarde.</string>
-    <!-- Deprecated: text for the firefox account onboarding card header when we detect you're already signed in to -->
-    <string name="onboarding_firefox_account_auto_signin_header_2">Tu es authenticate como %s sur un altere navigator Firefox sur iste telephono. Vole tu acceder con iste conto?</string>
-    <!-- Deprecated: Describes the add to homescreen functionality -->
-    <string name="add_to_homescreen_description">Tu pote facilemente adder iste sito web al pagina initial de tu telephono pro acceder instantaneemente e navigar plus velocemente, como in un app.</string>
+    <!-- Content description for the action bar "up" button -->
+    <string name="action_bar_up_description">Navigar</string>
+
+    <!-- Content description for privacy content close button -->
+    <string name="privacy_content_close_button_content_description">Clauder</string>
+
 </resources>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 19121aa02..9ddf989bd 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -21,10 +21,6 @@
     <!-- No Private Tabs Message Description -->
     <string name="no_private_tabs_description">Tab privat Anda akan muncul di sini.</string>
 
-    <!-- Default title for pinned Baidu top site that links to Baidu home page  -->
-    <string name="default_top_site_baidu">Baidu</string>
-    <!-- Default title for pinned JD top site that links to JD home page  -->
-    <string name="default_top_site_jd">JD</string>
     <!-- Message announced to the user when tab tray is selected with 1 tab -->
     <string name="open_tab_tray_single">1 tab terbuka. Ketuk untuk beralih tab.</string>
 
@@ -99,13 +95,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Tutup</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Ubah tata letak tab terbuka. Buka pengaturan dan pilih kisi di bawah tampilan tab.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Buka pengaturan</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Tutup</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Tab baru</string>
@@ -185,6 +174,17 @@
     <!-- Browser menu button to configure reader mode appearance e.g. the used font type and size -->
     <string name="browser_menu_read_appearance">Tampilan</string>
 
+    <!-- Browser menu button to show reader view appearance controls e.g. the used font type and size -->
+    <string name="browser_menu_customize_reader_view">Ubahsuai tampilan pembaca</string>
+    <!-- Browser menu label for adding a bookmark -->
+    <string name="browser_menu_add">Tambahkan</string>
+    <!-- Browser menu label for editing a bookmark -->
+    <string name="browser_menu_edit">Ubah</string>
+
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Layar beranda</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">Tidak dapat terhubung. Skema URL yang tidak dapat dikenali.</string>
@@ -223,6 +223,11 @@
     <!-- Search suggestion onboarding hint Learn more link text -->
     <string name="search_suggestions_onboarding_learn_more_link">Pelajari lebih lanjut</string>
 
+    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <string name="search_engine_suggestions_title">Cari %s</string>
+    <!-- Search engine suggestion description text -->
+    <string name="search_engine_suggestions_description">Cari langsung dari bilah alamat</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
     <string name="search_widget_content_description">Buka tab Firefox baru</string>
@@ -414,6 +419,11 @@
         and the third is the device model. -->
     <string name="default_device_name_2">%1$s dalam %2$s %3$s</string>
 
+    <!-- Preference for syncing credit cards -->
+    <string name="preferences_sync_credit_cards">Kartu kredit</string>
+    <!-- Preference for syncing addresses -->
+    <string name="preferences_sync_address">Alamat</string>
+
     <!-- Send Tab -->
     <!-- Name of the "receive tabs" notification channel. Displayed in the "App notifications" system settings for the app -->
     <string name="fxa_received_tab_channel_name">Tab yang diterima</string>
@@ -445,9 +455,6 @@
     <!-- Text displayed when there are no exceptions, with learn more link that brings users to a tracking protection SUMO page -->
     <string name="exceptions_empty_message_learn_more_link">Pelajari lebih lanjut</string>
 
-    <!-- Description in Quick Settings that tells user tracking protection is off globally for all sites, and links to Settings to turn it on -->
-    <string name="preferences_tracking_protection_turned_off_globally">Dimatikan secara global, buka Pengaturan untuk menyalakannya.</string>
-
     <!-- Preference switch for Telemetry -->
     <string name="preferences_telemetry">Telemetri</string>
 
@@ -459,6 +466,8 @@
     <string name="preferences_marketing_data">Data pemasaran</string>
     <!-- Preference description for marketing data collection, parameter is the app name (e.g. Firefox) -->
     <string name="preferences_marketing_data_description">Bagikan data mengenai fitur yang Anda gunakan pada %1$s dengan Leanplum, vendor pemasaran seluler kami.</string>
+    <!-- Preference description for marketing data collection -->
+    <string name="preferences_marketing_data_description2">Bagikan data penggunaan dasar dengan Adjust, vendor pemasaran seluler kami</string>
     <!-- Title for studies preferences -->
     <string name="preference_experiments_2">Kajian</string>
     <!-- Summary for studies preferences -->
@@ -546,8 +555,6 @@
     <string name="library_new_tab">Tab baru</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Temukan di laman</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Tab yang disinkronkan</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Daftar Baca</string>
     <!-- Menu Item Label for Search in Library -->
@@ -592,6 +599,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Setelah satu bulan</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Mulai dari Beranda</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">Setelah empat jam</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Selalu</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Tidak Pernah</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Tutup secara manual</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -608,12 +624,16 @@
     <string name="tabs_header_private_title">Sesi pribadi</string>
     <!-- Title for the list of tabs in the current private session -->
     <string name="tabs_header_private_tabs_title">Tab privat</string>
+    <!-- Title for the list of tabs in the synced tabs -->
+    <string name="tabs_header_synced_tabs_title">Tab tersinkron</string>
     <!-- Content description (not visible, for screen readers etc.): Add tab button. Adds a news tab when pressed -->
     <string name="add_tab">Tambah tab</string>
     <!-- Content description (not visible, for screen readers etc.): Add tab button. Adds a news tab when pressed -->
     <string name="add_private_tab">Tambah tab pribadi</string>
     <!-- Text for the new tab button to indicate adding a new private tab in the tab -->
     <string name="tab_drawer_fab_content">Pribadi</string>
+    <!-- Text for the new tab button to indicate syncing command on the synced tabs page -->
+    <string name="tab_drawer_fab_sync">Sinkron</string>
     <!-- Text shown as the title of the open tab tray -->
     <string name="tab_tray_title">Tab Terbuka</string>
     <!-- Text shown in the menu for saving tabs to a collection -->
@@ -624,6 +644,8 @@
     <string name="tab_tray_menu_item_share">Bagikan semua tab</string>
     <!-- Text shown in the menu to view recently closed tabs -->
     <string name="tab_tray_menu_recently_closed">Tab yang baru saja ditutup</string>
+    <!-- Text shown in the menu to view account settings -->
+    <string name="tab_tray_menu_account_settings">Setelan akun</string>
     <!-- Text shown in the menu to view tab settings -->
     <string name="tab_tray_menu_tab_settings">Setelan tab</string>
     <!-- Text shown in the menu for closing all tabs -->
@@ -795,12 +817,12 @@
     <string name="bookmark_delete_folder_snackbar">%1$s terhapus</string>
     <!-- Screen title for adding a bookmarks folder -->
     <string name="bookmark_add_folder">Tambah folder</string>
-    <!-- deprecated: Snackbar title shown after a bookmark has been created. -->
-    <string name="bookmark_created_snackbar">Markah dibuat.</string>
     <!-- Snackbar title shown after a bookmark has been created. -->
     <string name="bookmark_saved_snackbar">Markah berhasil disimpan!</string>
     <!-- Snackbar edit button shown after a bookmark has been created. -->
     <string name="edit_bookmark_snackbar_action">EDIT</string>
+    <!-- Bookmark overflow menu edit button -->
+    <string name="bookmark_menu_edit_button">Ubah</string>
     <!-- Bookmark overflow menu select button -->
     <string name="bookmark_menu_select_button">Pilih</string>
     <!-- Bookmark overflow menu copy button -->
@@ -981,6 +1003,8 @@
     <string name="share_link_all_apps_subheader">Semua tindakan</string>
     <!-- Sub-header in the dialog to share a link to an app from the most-recent sorted list -->
     <string name="share_link_recent_apps_subheader">Baru saja digunakan</string>
+    <!-- An option from the three dot menu to into sync -->
+    <string name="sync_menu_sign_in">Masuk untuk menyinkronkan</string>
     <!-- An option from the share dialog to sign into sync -->
     <string name="sync_sign_in">Masuk ke Sync</string>
     <!-- An option from the share dialog to send link to all other sync devices -->
@@ -1177,9 +1201,6 @@
 
     <!-- text for the Firefox Accounts section header -->
     <string name="onboarding_fxa_section_header">Sudah memiliki akun?</string>
-    <!-- text for the Firefox Preview feature section header
-    The first parameter is the name of the app (e.g. Firefox Preview) -->
-    <string name="onboarding_feature_section_header">Ketahui tentang %s</string>
     <!-- text for the "What's New" onboarding card header -->
     <string name="onboarding_whats_new_header1">Lihat apa yang baru</string>
     <!-- text for the "what's new" onboarding card description
@@ -1187,10 +1208,10 @@
     <string name="onboarding_whats_new_description">Punya pertanyaan mengenai desain ulang %s? Ingin tahu apa saja yang berubah?</string>
     <!-- text for underlined clickable link that is part of "what's new" onboarding card description that links to an FAQ -->
     <string name="onboarding_whats_new_description_linktext">Dapatkan jawabannya di sini</string>
-    <!-- text for the Firefox account onboarding sign in card header -->
-    <string name="onboarding_account_sign_in_header">Mulai sinkronkan markah, kata sandi, dan lainnya dengan akun Firefox Anda.</string>
+    <!-- text for the Firefox account onboarding sign in card header. The word "Firefox" should not be translated -->
+    <string name="onboarding_account_sign_in_header_1">Sinkronkan Firefox antar perangkat</string>
     <!-- Text for the button to learn more about signing in to your Firefox account -->
-    <string name="onboarding_manual_sign_in_learn_more">Pelajari lebih lanjut</string>
+    <string name="onboarding_manual_sign_in_description">Bawa markah, riwayat, dan kata sandi ke Firefox di perangkat ini.</string>
     <!-- text for the firefox account onboarding card header when we detect you're already signed in to
         another Firefox browser. (The word `Firefox` should not be translated)
         The first parameter is the email of the detected user's account -->
@@ -1199,8 +1220,8 @@
     <string name="onboarding_firefox_account_auto_signin_confirm">Ya, masukkan saya</string>
     <!-- text for the automatic sign-in button while signing in is in process -->
     <string name="onboarding_firefox_account_signing_in">Masuk…</string>
-    <!-- text for the button to manually sign into Firefox account. The word "Firefox" should not be translated -->
-    <string name="onboarding_firefox_account_sign_in">Masuk ke Firefox</string>
+    <!-- text for the button to manually sign into Firefox account. -->
+    <string name="onboarding_firefox_account_sign_in_1">Daftar</string>
     <!-- text for the button to stay signed out when presented with an option to automatically sign-in. -->
     <string name="onboarding_firefox_account_stay_signed_out">Tetap keluar</string>
     <!-- text to display in the snackbar once account is signed-in -->
@@ -1208,26 +1229,23 @@
     <!-- text to display in the snackbar if automatic sign-in fails. user may try again -->
     <string name="onboarding_firefox_account_automatic_signin_failed">Gagal masuk</string>
     <!-- text for the tracking protection onboarding card header -->
-    <string name="onboarding_tracking_protection_header_2">Privasi otomatis</string>
-    <!-- text for the tracking protection card description
-    The first parameter is the name of the app (e.g. Firefox Preview) -->
-    <string name="onboarding_tracking_protection_description_2">Pengaturan privasi dan keamanan memblokir pelacak, malware, dan perusahaan yang mengikuti Anda.</string>
+    <string name="onboarding_tracking_protection_header_3">Privasi selalu aktif</string>
+    <!-- text for the tracking protection card description. 'Firefox' intentionally hardcoded here -->
+    <string name="onboarding_tracking_protection_description_3">Firefox secara otomatis menghentikan perusahaan yang mengikuti Anda di web secara rahasia.</string>
     <!-- text for tracking protection radio button option for standard level of blocking -->
     <string name="onboarding_tracking_protection_standard_button_2">Standar (baku)</string>
     <!-- text for standard blocking option button description -->
-    <string name="onboarding_tracking_protection_standard_button_description_2">Memblokir lebih sedikit pelacak. Laman akan dimuat secara normal.</string>
+    <string name="onboarding_tracking_protection_standard_button_description_3">Seimbang untuk privasi dan kinerja. Halaman dimuat secara normal.</string>
     <!-- text for tracking protection radio button option for strict level of blocking -->
     <string name="onboarding_tracking_protection_strict_button">Ketat (disarankan)</string>
     <!-- text for tracking protection radio button option for strict level of blocking -->
     <string name="onboarding_tracking_protection_strict_option">Ketat</string>
     <!-- text for strict blocking option button description -->
-    <string name="onboarding_tracking_protection_strict_button_description_2">Memblokir lebih banyak pelacak, iklan, dan sembulan. Halaman dimuat lebih cepat, namun beberapa fungsi mungkin tidak berfungsi.</string>
-    <!-- text for the toolbar position card header
-        In English this is an idiom for "choose a side as in an argument or fight"
-        but it is ok to make this more literally about "choosing a position in a physical space -->
-    <string name="onboarding_toolbar_position_header">Pilih posisi</string>
+    <string name="onboarding_tracking_protection_strict_button_description_3">Blokir lebih banyak pelacak sehingga laman dimuat lebih cepat, tetapi beberapa fungsionalitas pada laman mungkin rusak.</string>
+    <!-- text for the toolbar position card header  -->
+    <string name="onboarding_toolbar_placement_header_1">Pilih penempatan bilah alat Anda</string>
     <!-- text for the toolbar position card description -->
-    <string name="onboarding_toolbar_position_description">Coba menjelajah dengan satu tangan dengan bilah alat di bawah atau pindahkan ke atas.</string>
+    <string name="onboarding_toolbar_placement_description_1">Letakkan bilah alat agar mudah dijangkau. Tetap di bawah, atau pindahkan ke atas.</string>
     <!-- text for the private browsing onboarding card header -->
     <string name="onboarding_private_browsing_header">Menjelajah dengan privat</string>
     <!-- text for the private browsing onboarding card description
@@ -1240,7 +1258,7 @@
     <!-- text for the privacy notice onboarding card header -->
     <string name="onboarding_privacy_notice_header">Privasi Anda</string>
     <!-- text for the privacy notice onboarding card description
-    The first parameter is the name of the app (e.g. Firefox Preview) -->
+    The first parameter is the name of the app (e.g. Firefox Preview) Substitute %s for long browser name. -->
     <string name="onboarding_privacy_notice_description2">Kami merancang %s agar Anda dapat mengendalikan apa saja yang Anda bagikan secara daring dan apa yang Anda bagikan kepada kami.</string>
     <!-- Text for the button to read the privacy notice -->
     <string name="onboarding_privacy_notice_read_button">Pelajari pemberitahuan privasi kami</string>
@@ -1255,7 +1273,7 @@
     <!-- text for the theme picker onboarding card header -->
     <string name="onboarding_theme_picker_header">Pilih tema Anda</string>
     <!-- text for the theme picker onboarding card description -->
-    <string name="onboarding_theme_picker_description1">Hemat baterai dan penglihatan Anda dengan mengaktifkan mode gelap.</string>
+    <string name="onboarding_theme_picker_description_2">Hemat baterai dan penglihatan Anda dengan mode gelap.</string>
     <!-- Automatic theme setting (will follow device setting) -->
     <string name="onboarding_theme_automatic_title">Otomatis</string>
     <!-- Summary of automatic theme setting (will follow device setting) -->
@@ -1311,13 +1329,13 @@
     <!-- Preference for enhanced tracking protection for the standard protection settings -->
     <string name="preference_enhanced_tracking_protection_standard_default_1">Standar (baku)</string>
     <!-- Preference description for enhanced tracking protection for the standard protection settings -->
-    <string name="preference_enhanced_tracking_protection_standard_description_3">Memblokir lebih sedikit pelacak. Laman akan dimuat secara normal.</string>
+    <string name="preference_enhanced_tracking_protection_standard_description_4">Seimbang untuk privasi dan kinerja. Halaman dimuat secara normal.</string>
     <!--  Accessibility text for the Standard protection information icon  -->
     <string name="preference_enhanced_tracking_protection_standard_info_button">Apa yang diblokir oleh perlindungan pelacakan standar</string>
     <!-- Preference for enhanced tracking protection for the strict protection settings -->
     <string name="preference_enhanced_tracking_protection_strict">Ketat</string>
     <!-- Preference description for enhanced tracking protection for the strict protection settings -->
-    <string name="preference_enhanced_tracking_protection_strict_description_2">Memblokir lebih banyak pelacak, iklan, dan sembulan. Halaman dimuat lebih cepat, namun beberapa fungsi mungkin tidak berfungsi.</string>
+    <string name="preference_enhanced_tracking_protection_strict_description_3">Blokir lebih banyak pelacak sehingga laman dimuat lebih cepat, tetapi beberapa fungsionalitas pada laman mungkin rusak.</string>
     <!--  Accessibility text for the Strict protection information icon  -->
     <string name="preference_enhanced_tracking_protection_strict_info_button">Apa yang diblokir oleh perlindungan pelacakan ketat</string>
     <!-- Preference for enhanced tracking protection for the custom protection settings -->
@@ -1458,10 +1476,8 @@
     <string name="preferences_passwords_autofill">Isi Otomatis</string>
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Sinkronkan info masuk</string>
-    <!-- Syncing saved logins in Fenix is on -->
-    <string name="preferences_passwords_sync_logins_on">Aktif</string>
-    <!-- Syncing saved logins in Fenix is off -->
-    <string name="preferences_passwords_sync_logins_off">Nonaktif</string>
+    <!-- Preference for syncing saved logins in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices">Sinkronkan log masuk antar perangkat</string>
     <!-- Syncing saved logins in Fenix needs reconnect to sync -->
     <string name="preferences_passwords_sync_logins_reconnect">Hubungkan kembali</string>
     <!-- Syncing saved logins in Fenix needs login -->
@@ -1552,6 +1568,69 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Sortir menu info masuk</string>
 
+    <!-- Credit Cards Autofill -->
+    <!-- Preference and title for managing the settings for credit cards -->
+    <string name="preferences_credit_cards">Kartu kredit</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards">Simpan dan isi otomatis kartu</string>
+    <!-- Preference summary for saving and autofilling credit card data -->
+    <string name="preferences_credit_cards_save_and_autofill_cards_summary">Data terenkripsi</string>
+    <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
+    <string name="preferences_credit_cards_sync_cards_across_devices">Sinkronisasi kartu antar perangkat</string>
+    <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
+    <string name="preferences_credit_cards_sync_cards">Sinkronkan kartu</string>
+    <!-- Preference option for adding a credit card -->
+    <string name="preferences_credit_cards_add_credit_card">Tambahkan kartu kredit</string>
+    <!-- Preference option for managing saved credit cards -->
+    <string name="preferences_credit_cards_manage_saved_cards">Kelola kartu tersimpan</string>
+    <!-- Title of the "Add card" screen -->
+    <string name="credit_cards_add_card">Tambah kartu</string>
+    <!-- Title of the "Edit card" screen -->
+    <string name="credit_cards_edit_card">Ubah kartu</string>
+    <!-- The header for the card number of a credit card -->
+    <string name="credit_cards_card_number">Nomor Kartu</string>
+    <!-- The header for the expiration date of a credit card -->
+    <string name="credit_cards_expiration_date">Tanggal Kedaluwarsa</string>
+    <!-- The label for the expiration date month of a credit card -->
+    <string name="credit_cards_expiration_date_month">Bulan Tanggal Kedaluwarsa</string>
+    <!-- The label for the expiration date year of a credit card -->
+    <string name="credit_cards_expiration_date_year">Tanggal Tahun Kedaluwarsa</string>
+    <!-- The header for the name on the credit card -->
+    <string name="credit_cards_name_on_card">Nama pada Kartu</string>
+    <!-- The header for the nickname for a credit card -->
+    <string name="credit_cards_card_nickname">Nama Alias Kartu</string>
+    <!-- The text for the "Delete card" menu item for deleting a credit card -->
+    <string name="credit_cards_menu_delete_card">Hapus kartu</string>
+    <!-- The text for the "Delete card" button for deleting a credit card -->
+    <string name="credit_cards_delete_card_button">Hapus kartu</string>
+    <!-- The title for the "Save" menu item for saving a credit card -->
+    <string name="credit_cards_menu_save">Simpan</string>
+    <!-- The text for the "Save" button for saving a credit card -->
+    <string name="credit_cards_save_button">Simpan</string>
+    <!-- The text for the "Cancel" button for cancelling adding or updating a credit card -->
+    <string name="credit_cards_cancel_button">Batal</string>
+    <!-- Title of the "Saved cards" screen -->
+    <string name="credit_cards_saved_cards">Kartu tersimpan</string>
+    <!-- Error message for credit card number validation -->
+    <string name="credit_cards_number_validation_error_message">Masukkan nomor kartu kredit yang sah</string>
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Silahkan isi kolom ini</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Buka kunci untuk melihat kartu yang Anda simpan</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Amankan kartu kredit Anda</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Atur pola, PIN, atau kata sandi kunci perangkat untuk melindungi kartu kredit Anda yang tersimpan agar tidak diakses jika orang lain memiliki perangkat Anda.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Atur sekarang</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Nanti</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Buka perangkat Anda</string>
+
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Buka kunci untuk menggunakan informasi kartu kredit tersimpan</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Tambah mesin pencari</string>
     <!-- Title of the Edit search engine screen -->
@@ -1711,23 +1790,19 @@
 	<!-- Dialog button text for canceling the rename top site prompt. -->
 	<string name="top_sites_rename_dialog_cancel">Batal</string>
 
+    <!-- Default browser experiment -->
+    <string name="default_browser_experiment_card_text">Setel tautan dari situs web, surel, dan pesan untuk secara otomatis dibuka di Firefox.</string>
+
     <!-- Content description for close button in collection placeholder. -->
     <string name="remove_home_collection_placeholder_content_description">Hapus</string>
 
-    <!-- Deprecated: text for the firefox account onboarding card header
-    The first parameter is the name of the app (e.g. Firefox Preview) -->
-    <string name="onboarding_firefox_account_header">Dapatkan hasil maksimal dari %s.</string>
-
     <!-- Content description radio buttons with a link to more information -->
     <string name="radio_preference_info_content_description">Klik untuk lebih jelasnya</string>
 
-    <!-- Deprecated: No Open Tabs Message Header -->
-    <string name="no_collections_header1">Kumpulkan hal-hal yang penting bagi Anda</string>
-    <!-- Deprecated: Label to describe what collections are to a new user without any collections -->
-    <string name="no_collections_description1">Kelompokkan pencarian, situs, dan tab yang serupa agar dapat diakses cepat nanti.</string>
-    <!-- Deprecated: text for the firefox account onboarding card header when we detect you're already signed in to -->
-    <string name="onboarding_firefox_account_auto_signin_header_2">Anda masuk sebagai %s di peramban Firefox lainnya pada ponsel ini. Apakah Anda ingin masuk dengan akun tersebut?</string>
-    <!-- Deprecated: Describes the add to homescreen functionality -->
-    <string name="add_to_homescreen_description">Anda dapat dengan mudah menambahkan situs web ini ke layar Beranda ponsel Anda untuk mendapatkan akses instan dan penjelajahan lebih cepat seperti menggunakan aplikasi.</string>
+    <!-- Content description for the action bar "up" button -->
+    <string name="action_bar_up_description">Arahkan ke atas</string>
+
+    <!-- Content description for privacy content close button -->
+    <string name="privacy_content_close_button_content_description">Tutup</string>
 
-    </resources>
+</resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index d805839a4..2f3130b70 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -6,6 +6,7 @@
     <string name="app_name_private_5">%s anonimo</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (nav. anonima)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">Altre opzioni</string>
@@ -50,6 +51,16 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">Selezionata</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">Aggiunti di recente</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">Segnalibri aggiunti di recente</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">Visualizza tutti</string>
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">Pulsante per visualizzare tutti i segnalibri salvati</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s è sviluppato da Mozilla.</string>
 
@@ -93,13 +104,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Chiudi</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Cambia la disposizione delle schede aperte. Vai alle impostazioni e seleziona Griglia sotto Visualizzazione schede.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Vai alle impostazioni</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Annulla</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Nuova scheda</string>
@@ -109,6 +113,12 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">Siti principali</string>
 
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">Torna a questa scheda</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">Visualizza tutte</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">Schede aperte</string>
@@ -186,6 +196,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Modifica</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Schermata principale</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">Connessione non riuscita. Schema URL non riconoscibile.</string>
@@ -558,8 +572,6 @@
     <string name="library_new_tab">Nuova scheda</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Trova nella pagina</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Schede sincronizzate</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Elenco lettura</string>
     <!-- Menu Item Label for Search in Library -->
@@ -605,6 +617,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Dopo un mese</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Inizia dalla schermata principale</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">Dopo quattro ore</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Sempre</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Mai</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Chiudi manualmente</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -1607,6 +1628,10 @@
     <string name="credit_cards_card_number">Numero carta</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">Data di scadenza</string>
+    <!-- The label for the expiration date month of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_month">Mese della data di scadenza</string>
+    <!-- The label for the expiration date year of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_year">Anno della data di scadenza</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">Nome sulla carta</string>
 
@@ -1629,6 +1654,24 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Inserire un numero di carta di credito valido</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Compilare questo campo</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Sblocca per visualizzare le carte di credito salvate</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Proteggi le tue carte di credito</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Imposta una sequenza di blocco, PIN o password per impedire a chi si impossessa del dispositivo di visualizzare le carte di credito salvate.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Imposta adesso</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Più tardi</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Sblocca il dispositivo</string>
+
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Sblocca per utilizzare le informazioni delle carte di credito salvate</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Aggiungi motore di ricerca</string>
     <!-- Title of the Edit search engine screen -->
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 078bd7a0d..4a0b203c7 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_name_private_5">%s במצב פרטיות</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">‏%s (פרטי)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">אפשרויות נוספות</string>
@@ -49,6 +50,16 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">נבחר</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">נשמרו לאחרונה</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">סימניות שנשמרו לאחרונה</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">הצגת הכול</string>
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">כפתור להצגת כול הסימניות השמורות</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">‏%1$s נוצר על־ידי Mozilla.</string>
 
@@ -95,13 +106,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">סגירה</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">ניתן לשנות את הפריסה של הלשוניות הפתוחות. יש לעבור להגדרות ולבחור ברשת תחת תצוגת לשוניות.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">מעבר להגדרות</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">התעלמות</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">לשונית חדשה</string>
@@ -111,6 +115,9 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">אתרים מובילים</string>
 
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">הצגת הכול</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">לשוניות פתוחות</string>
@@ -185,6 +192,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">עריכה</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">מסך הבית</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">לא ניתן להתחבר. מבנה הכתובת אינו ברור.</string>
@@ -547,8 +558,6 @@
     <string name="library_new_tab">לשונית חדשה</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">חיפוש בדף</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">לשוניות מסונכרנות</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">רשימת קריאה</string>
     <!-- Menu Item Label for Search in Library -->
@@ -594,6 +603,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">אחרי חודש אחד</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">להתחיל ממסך הבית</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">לאחר 4 שעות</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">תמיד</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">לעולם לא</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">סגירה באופן ידני</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -1530,7 +1548,7 @@
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">שמירה מאובטחת של הכניסות והססמאות שלך</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">ניתן להגדיר תבנית נעילת מכשיר, קוד או ססמה כדי להגן על פרטי הגישה והססמאות שלך מפני גורמים בלתי מהימנים שמחזיקים במכשיר שלך.</string>
+    <string name="logins_warning_dialog_message">ניתן להגדיר תבנית נעילת מכשיר, קוד או ססמה כדי להגן על פרטי הגישה והססמאות השמורות שלך מפני גורמים בלתי מהימנים שמחזיקים במכשיר שלך.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">מאוחר יותר</string>
 
@@ -1574,6 +1592,10 @@
     <string name="credit_cards_card_number">מספר כרטיס</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">תאריך תפוגה</string>
+    <!-- The label for the expiration date month of a credit card -->
+    <string name="credit_cards_expiration_date_month">החודש של תאריך התפוגה</string>
+    <!-- The label for the expiration date year of a credit card -->
+    <string name="credit_cards_expiration_date_year">השנה של תאריך התפוגה</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">שם שעל הכרטיס</string>
     <!-- The header for the nickname for a credit card -->
@@ -1595,6 +1617,24 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">נא להכניס מספר כרטיס אשראי תקין</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">נא למלא שדה זה</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">יש לבטל את הנעילה כדי להציג את הכרטיסים השמורים שלך</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">אבטחת כרטיסי האשראי שלך</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">ניתן להגדיר תבנית נעילת מכשיר, קוד או ססמה כדי להגן על כרטיסי האשראי השמורים שלך מפני גורמים בלתי מהימנים שמחזיקים במכשיר שלך.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">להגדיר כעת</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">מאוחר יותר</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">שחרור נעילת המכשיר שלך</string>
+
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">יש לבטל את הנעילה כדי להשתמש בפרטי כרטיס האשראי השמור</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">הוספת מנוע חיפוש</string>
     <!-- Title of the Edit search engine screen -->
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 54415a6d1..e75c0ff13 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -96,13 +96,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">閉じる</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">開いたタブのレイアウトを変更します。設定画面を開き、タブビューの下のグリッドを選択してください。</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">設定を開く</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">閉じる</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">新しいタブ</string>
@@ -188,6 +181,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">編集</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">ホーム画面</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">接続できません。認識できない URL スキームです。</string>
@@ -555,8 +552,6 @@
     <string name="library_new_tab">新しいタブ</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">ページ内検索</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">同期したタブ</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">リーディングリスト</string>
     <!-- Menu Item Label for Search in Library -->
@@ -601,6 +596,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">1 か月後</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">ホーム画面で開始</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">4 時間後</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">常に使用する</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">使用しない</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">手動で閉じる</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -1590,6 +1594,10 @@
     <string name="credit_cards_card_number">カード番号</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">有効期限</string>
+    <!-- The label for the expiration date month of a credit card -->
+    <string name="credit_cards_expiration_date_month">有効期限月</string>
+    <!-- The label for the expiration date year of a credit card -->
+    <string name="credit_cards_expiration_date_year">有効期限年</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">カード名義</string>
     <!-- The header for the nickname for a credit card -->
@@ -1611,6 +1619,25 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">有効なクレジットカード番号を入力してください</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">このフィールドは入力必須です</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">保存されたカード情報を表示するにはロック解除してください</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">クレジットカード情報の保護</string>
+
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">端末のロックパターンや PIN、パスワードを設定して、保存されたクレジットカード情報とパスワードを他人の不正なアクセスから保護しましょう。</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">今すぐ設定</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">後で</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">端末のロック解除</string>
+
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">ロックを解除して保存したクレジットカード情報を使用します</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">検索エンジンの追加</string>
     <!-- Title of the Edit search engine screen -->
diff --git a/app/src/main/res/values-ka/strings.xml b/app/src/main/res/values-ka/strings.xml
index 7c4bdfc12..8847d1e4b 100644
--- a/app/src/main/res/values-ka/strings.xml
+++ b/app/src/main/res/values-ka/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_name_private_5">პირადი %s</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (პირადი)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">დამატებითი პარამეტრები</string>
@@ -47,6 +48,16 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">მონიშნულია</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">ბოლოს შენახული</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">ბოლოს ჩანიშნული</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">ყველას ჩვენება</string>
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">ყველა ჩანიშნულის გამოსაჩენი ღილაკი</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s შემქმნელი Mozilla.</string>
 
@@ -90,13 +101,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">გამოტოვება</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">შეცვალეთ გახსნილი ჩანართების განლაგება. გადადით პარამეტრებში და აირჩიეთ ბადისებრი, ჩანართის ხედში.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">პარამეტრებში გადასვლა</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">გამოტოვება</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">ახალი ჩანართი</string>
@@ -106,6 +110,12 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">რჩეული საიტები</string>
 
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">წინაზე გადასვლა</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">ყველას ჩვენება</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">გახსნილი ჩანართები</string>
@@ -180,6 +190,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">ჩასწორება</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">მთავარი ეკრანი</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">ვერ დაუკავშირდა. გაურკვეველი URL-სქემა.</string>
@@ -544,8 +558,6 @@
     <string name="library_new_tab">ახალი ჩანართი</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">პოვნა გვერდზე</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">დასინქრონებული ჩანართები</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">წასაკითხთა სია</string>
     <!-- Menu Item Label for Search in Library -->
@@ -591,6 +603,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">ერთი თვის შემდეგ</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">მთავარით დაწყება</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">4 საათის შემდეგ</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">ყოველთვის</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">არასდროს</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">ხელით დახურვა</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -1572,6 +1593,10 @@
     <string name="credit_cards_card_number">ბარათის ნომერი</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">ვადის გასვლის თარიღი</string>
+    <!-- The label for the expiration date month of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_month">ვადის გასვლის თვე</string>
+    <!-- The label for the expiration date year of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_year">ვადის გასვლის წელიწადი</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">მფლობელის სახელი</string>
     <!-- The header for the nickname for a credit card -->
@@ -1593,6 +1618,23 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">გთხოვთ, შეიყვანოთ საკრედიტო ბარათის მართებული ნომერი</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">გთხოვთ, შეავსოთ ეს ველი</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">გახსენით შენახული ბარათების სანახავად</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">დაიცავით საკრედიტო ბარათები</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">დააყენეთ მოწყობილობის ჩასაკეტად მოსახაზი, PIN-კოდი ან პაროლი, თქვენი ბარათების მონაცემებთან, უცხო პირების წვდომის აღსაკვეთათ.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">დაყენება ახლავე</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">მოგვიანებით</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">გახსენით მოწყობილობა</string>
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">გახსენით, შენახული ბარათის გამოსაყენებლად</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">საძიებო სისტემის დამატება</string>
     <!-- Title of the Edit search engine screen -->
diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
index df083a661..3af28118a 100644
--- a/app/src/main/res/values-kab/strings.xml
+++ b/app/src/main/res/values-kab/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_name_private_5">Uslig %s</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (Uslig)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">Ugar n yiγewwaṛen</string>
@@ -51,6 +52,16 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">Iţufren</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">Yettwasekles melmi kan</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">Ticraḍ n yisebtar yettwaskelsen melmi kan</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">Sken kullec</string>
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">Taqeffalt teskanay-d meṛṛa ticraḍ n yisebtar yettwaskelsen</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s d afares n Mozilla.</string>
 
@@ -96,13 +107,6 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Zgel</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Senfel taneɣruft n waccaren yeldin. Ddu ɣer yiɣewwaren syen fren iẓiki deg n yiccer.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Ddu ɣer yiɣewwaren</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Zgel</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Iccer amaynut</string>
@@ -112,6 +116,12 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">Ismal ufrinen</string>
 
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">Uɣal ɣer deffir</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">Sken kullec</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">Ldi icarren</string>
@@ -187,6 +197,10 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Ẓreg</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Agilal agejdan</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">Ur izmir ara ad yeqqen. Azenziɣ n tensa URL ur yettwassen ara.</string>
@@ -554,8 +568,6 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <string name="library_new_tab">Iccer amaynut</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Af deg usebter</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Iccaren yemtawin</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Tabdart n tɣuṛi</string>
     <!-- Menu Item Label for Search in Library -->
@@ -600,6 +612,15 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Seld yiwen n waggur</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Bdu seg ugilal agejdan</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">Seld rebεa n yisragen</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Yal tikkelt</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Urǧin</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Mdel s ufus</string>
 
@@ -1586,6 +1607,10 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <string name="credit_cards_card_number">Uṭṭun n tkarḍa</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">Azemz n taggara</string>
+    <!-- The label for the expiration date month of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_month">Azemz n taggara n wayyur</string>
+    <!-- The label for the expiration date year of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_year">Azemz n taggar n useggas</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">Isem ɣef tkarḍa</string>
     <!-- The header for the nickname for a credit card -->
@@ -1606,6 +1631,23 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Ma ulac aɣilif sekcem uṭṭun ameɣtu n tkarḍa n usmad</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Ttxil-k·m ččar urti-a</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Kkes asekkeṛ i wakken ad twaliḍ tikerḍiwin-ik·im yettwaskelsen</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Seɣles tikerḍiwin-ik·im n usmad</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Sbadu taneɣruft n usekkeṛ n yibenk, tangalt PIN neq awal uffir i ummesten n tkerḍiwin-ik·im n usmad yettwaskelsen ticki yella win ikecmen ɣer yibenk-inek·inem.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Sbadu tura</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Ticki</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Serreḥ i ibenk-inek·inem</string>
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Kkes asekkeṛ i wakken ad tesqedceḍ talɣut n tkarḍa n usmad</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Rnu amsedday n unadi</string>
     <!-- Title of the Edit search engine screen -->
diff --git a/app/src/main/res/values-kk/strings.xml b/app/src/main/res/values-kk/strings.xml
index 4574961a0..5cdbee3ea 100644
--- a/app/src/main/res/values-kk/strings.xml
+++ b/app/src/main/res/values-kk/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_name_private_5">Жекелік %s</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (Жекелік)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">Көбірек опциялар</string>
@@ -47,6 +48,17 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">Таңдалған</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">Жуырда сақталған</string>
+
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">Жуырда сақталған бетбелгілер</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">Барлығын көрсету</string>
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">Барлық сақталған бетбелгілерді көрсету батырмасы</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s жасаған Mozilla.</string>
 
@@ -91,13 +103,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Тайдыру</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Ашық беттер жаймасын өзгерту. Баптауларға өтіп, беттер көрінісі астындағы торды таңдаңыз.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Баптауларға өту</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Тайдыру</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Жаңа бет</string>
@@ -106,6 +111,12 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">Үздік сайттар</string>
 
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">Кері оралу</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">Барлығын көрсету</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">Ашық беттер</string>
@@ -179,6 +190,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Түзету</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Бастапқы экран</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">Байланысу мүмкін емес. URL схемасы белгісіз.</string>
@@ -538,8 +553,6 @@
     <string name="library_new_tab">Жаңа бет</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Беттен табу</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Синхрондалған беттер</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Оқу тізімі</string>
     <!-- Menu Item Label for Search in Library -->
@@ -584,6 +597,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Бір айдан кейін</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Бастапқы экраннан бастау</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">Төрт сағаттан кейін</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Әрқашан</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Ешқашан</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Қолмен жабу</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -1564,6 +1586,10 @@
     <string name="credit_cards_card_number">Карта нөмірі</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">Мерзімнің біту күні</string>
+    <!-- The label for the expiration date month of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_month">Жарамдылық мерзімінің айы</string>
+    <!-- The label for the expiration date year of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_year">Жарамдылық мерзімінің жылы</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">Картадағы аты</string>
     <!-- The header for the nickname for a credit card -->
@@ -1585,6 +1611,24 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Несиелік картаның жарамды нөмірін енгізіңіз</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Бұл өрісті толтырыңыз</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Сақталған карталарыңызды көру үшін бұғаттауын ашыңыз</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Несиелік карталарыңызды қорғаңыз</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Бөтен адам сіздің құрылғыңызда болса, одан сақталған несиелік карталарды қорғау үшін құрылғының бұғаттау үлгісін, PIN-кодын немесе парольді орнатыңыз.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Қазір баптау</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Кейінірек</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Құрылғының бұғаттауын ашыңыз</string>
+
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Сақталған несиелік карта ақпаратын қолдану үшін бұғаттауын ашыңыз</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Іздеу жүйесін қосу</string>
     <!-- Title of the Edit search engine screen -->
diff --git a/app/src/main/res/values-kmr/strings.xml b/app/src/main/res/values-kmr/strings.xml
index 5cc849d06..57238d939 100644
--- a/app/src/main/res/values-kmr/strings.xml
+++ b/app/src/main/res/values-kmr/strings.xml
@@ -94,13 +94,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Bigire</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Tu dikarî raxistina hilpekînên vekirî biguherînî. Here sazkariyan û ji bin &quot;xuyabûna hilpekînan&quot; grîdê hilbijêre.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Here sazkariyan</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Bigire</string>
-
 
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
@@ -416,6 +409,11 @@
         and the third is the device model. -->
     <string name="default_device_name_2">%1$s - %2$s %3$s</string>
 
+    <!-- Preference for syncing credit cards -->
+    <string name="preferences_sync_credit_cards">Kartên krediyê</string>
+    <!-- Preference for syncing addresses -->
+    <string name="preferences_sync_address">Navnîşan</string>
+
     <!-- Send Tab -->
     <!-- Name of the "receive tabs" notification channel. Displayed in the "App notifications" system settings for the app -->
     <string name="fxa_received_tab_channel_name">Hilpekînên hatine stendin</string>
@@ -447,9 +445,6 @@
     <!-- Text displayed when there are no exceptions, with learn more link that brings users to a tracking protection SUMO page -->
     <string name="exceptions_empty_message_learn_more_link">Zêdetir bizane</string>
 
-    <!-- Description in Quick Settings that tells user tracking protection is off globally for all sites, and links to Settings to turn it on -->
-    <string name="preferences_tracking_protection_turned_off_globally">Bi temamî hat girtin, ji bo vekirinê here Sazkariyan.</string>
-
     <!-- Preference switch for Telemetry -->
     <string name="preferences_telemetry">Telemetrî</string>
     <!-- Preference switch for usage and technical data collection -->
@@ -460,6 +455,8 @@
     <string name="preferences_marketing_data">Daneyên bazarkirinê</string>
     <!-- Preference description for marketing data collection, parameter is the app name (e.g. Firefox) -->
     <string name="preferences_marketing_data_description">Daneyên têkildarî taybetiyên %1$sê ku tu bi kar tînî bi Leanpluma em xizmeta bazara mobîl jê dikirin re parve dike.</string>
+    <!-- Preference description for marketing data collection -->
+    <string name="preferences_marketing_data_description2">Daneyên bikaranînê yên bingehîn bi hevkara me ya kar Adjustê tên parvekirin</string>
     <!-- Title for studies preferences -->
     <string name="preference_experiments_2">Lêkolîn</string>
 
@@ -547,8 +544,6 @@
     <string name="library_new_tab">Hilpekîna nû</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Di rûpelê de bibîne</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Hilpekînên senkronîzekirî</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Lîsteya xwendinê</string>
     <!-- Menu Item Label for Search in Library -->
@@ -798,8 +793,6 @@
     <string name="bookmark_delete_folder_snackbar">%1$s hate jêbirin</string>
     <!-- Screen title for adding a bookmarks folder -->
     <string name="bookmark_add_folder">Peldankê tevlî bike</string>
-    <!-- deprecated: Snackbar title shown after a bookmark has been created. -->
-    <string name="bookmark_created_snackbar">Favorî hat afirandin.</string>
     <!-- Snackbar title shown after a bookmark has been created. -->
     <string name="bookmark_saved_snackbar">Favorî hat hilanîn!</string>
     <!-- Snackbar edit button shown after a bookmark has been created. -->
@@ -1456,10 +1449,8 @@
     <string name="preferences_passwords_autofill">Bixweber dagire</string>
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Hesaban senkronîze bike</string>
-    <!-- Syncing saved logins in Fenix is on -->
-    <string name="preferences_passwords_sync_logins_on">Vekirî</string>
-    <!-- Syncing saved logins in Fenix is off -->
-    <string name="preferences_passwords_sync_logins_off">Girtî</string>
+    <!-- Preference for syncing saved logins in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices">Hesaban di navbera amûran de sync bike</string>
     <!-- Syncing saved logins in Fenix needs reconnect to sync -->
     <string name="preferences_passwords_sync_logins_reconnect">Dîsa girê bide</string>
     <!-- Syncing saved logins in Fenix needs login -->
@@ -1560,6 +1551,8 @@
 
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Kartan di navbera amûran de senkronîze bike</string>
+    <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
+    <string name="preferences_credit_cards_sync_cards">Karda syncê</string>
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Kredîkartekê lê zêde bike</string>
     <!-- Preference option for managing saved credit cards -->
@@ -1589,6 +1582,23 @@
     <!-- Title of the "Saved cards" screen -->
     <string name="credit_cards_saved_cards">Kartên tomarkirî</string>
 
+    <!-- Error message for credit card number validation -->
+    <string name="credit_cards_number_validation_error_message">Tika ye hejmereke derbasdar ya karta krediyê binivîse</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Ji bo kartên xwe yên qeydkirî bibînî kilîdê rake</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Kartên xwe yên krediyê bixe ewlehiyê</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Nîgareke kilîdê, PIN yan jî şîfreyekê diyar bike ji bo ku gava amûra te bikeve destê kesên din kartên te yên krediyê bên parastin.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Niha saz bike</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Paşê</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Kilîda amûra xwe veke</string>
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Kilîdê rake ku dikaribî agahiyên kartên krediyê yên tomarkirî bi kar bînî</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Motora lêgerînê tevlî bike</string>
     <!-- Title of the Edit search engine screen -->
@@ -1752,19 +1762,13 @@
     <!-- Content description for close button in collection placeholder. -->
     <string name="remove_home_collection_placeholder_content_description">Rake</string>
 
-    <!-- Deprecated: text for the firefox account onboarding card header
-    The first parameter is the name of the app (e.g. Firefox Preview) -->
-    <string name="onboarding_firefox_account_header">Ji %s’ê fêdeya herî zêde bibînin.</string>
-
     <!-- Content description radio buttons with a link to more information -->
     <string name="radio_preference_info_content_description">Ji bo agahiyên zêdetir, bitikîne</string>
 
-    <!-- Deprecated: No Open Tabs Message Header -->
-    <string name="no_collections_header1">Tiştên ku ji te re girîng in berhev bike</string>
-    <!-- Deprecated: Label to describe what collections are to a new user without any collections -->
-    <string name="no_collections_description1">Lêgerîn, malper û hilpekînên wekhev, bike kom da ku paşê tu karibî xwe zû bigihînî wan.</string>
-    <!-- Deprecated: text for the firefox account onboarding card header when we detect you're already signed in to -->
-    <string name="onboarding_firefox_account_auto_signin_header_2">Tu li ser vê telefonê di gerokeke din a Firefoxê de wekî %s têketî yê. Tu dixwazî bi vî hesabî têkevî?</string>
-    <!-- Deprecated: Describes the add to homescreen functionality -->
-    <string name="add_to_homescreen_description">Tu dikarî vê malperê bi hêsanî li ekrana Malê ya telefona xwe zêde bikî û dikarî vê malperê bilez û wekî ku bernamokek be bi kar bînî.</string>
+    <!-- Content description for the action bar "up" button -->
+    <string name="action_bar_up_description">Jorê</string>
+
+    <!-- Content description for privacy content close button -->
+    <string name="privacy_content_close_button_content_description">Bigire</string>
+
 </resources>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 27b190017..82de41f89 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -6,6 +6,7 @@
     <string name="app_name_private_5">사생활 보호 %s</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (사생활 보호)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">옵션 더보기</string>
@@ -53,6 +54,16 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">선택됨</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">최근 저장됨</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">최근 저장된 북마크</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">모두 표시</string>
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">저장된 북마크 모두 표시 버튼</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s는 Mozilla에서 제작했습니다.</string>
 
@@ -100,13 +111,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">닫기</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">열린 탭의 레이아웃을 변경하세요. 설정으로 이동하여 탭 보기에서 그리드를 선택하세요.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">설정으로 이동</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">닫기</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">새 탭</string>
@@ -116,6 +120,12 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">상위 사이트</string>
 
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">최근 탭으로 이동</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">모두 표시</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">탭 열기</string>
@@ -193,6 +203,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">편집</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">홈 화면</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">연결할 수 없음. 인식할 수 없는 URL 구성표.</string>
@@ -560,8 +574,6 @@
     <string name="library_new_tab">새 탭</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">페이지에서 찾기</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">동기화된 탭</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">읽기 목록</string>
     <!-- Menu Item Label for Search in Library -->
@@ -607,6 +619,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">한 달 후</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">홈에서 시작</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">4시간 후</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">항상</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">안 함</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">수동으로 닫기</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -1574,7 +1595,7 @@
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">로그인과 비밀번호 보안</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">다른 사람이 기기를 가지고 있는 경우, 저장된 로그인과 비밀번호에 접근하지 못하도록 기기 잠금 패턴, PIN 또는 비밀번호를 설정하세요.</string>
+    <string name="logins_warning_dialog_message">다른 사람이 내 기기를 가지고 있는 경우, 저장된 로그인과 비밀번호에 접근하지 못하도록 기기 잠금 패턴, PIN 또는 비밀번호를 설정하세요.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">나중에</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1619,6 +1640,10 @@
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">유효 기간</string>
 
+    <!-- The label for the expiration date month of a credit card -->
+    <string name="credit_cards_expiration_date_month">유효 기간 월</string>
+    <!-- The label for the expiration date year of a credit card -->
+    <string name="credit_cards_expiration_date_year">유효 기간 년</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">카드상의 이름</string>
     <!-- The header for the nickname for a credit card -->
@@ -1640,6 +1665,24 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">유효한 신용 카드 번호를 입력해 주세요</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">이 항목을 입력하세요.</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">저장된 카드를 보려면 잠금 해제</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">신용 카드 보안</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">다른 사람이 내 기기를 가지고 있는 경우, 저장된 신용 카드에 접근하지 못하도록 기기 잠금 패턴, PIN 또는 비밀번호를 설정하세요.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">지금 설정</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">나중에</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">기기 잠금 해제</string>
+
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">저장된 신용 카드 정보를 사용하려면 잠금 해제</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">검색 엔진 추가</string>
     <!-- Title of the Edit search engine screen -->
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 4a0db67f6..0450c77be 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -412,6 +412,11 @@
         and the third is the device model. -->
     <string name="default_device_name_2">„%1$s“, esanti „%2$s%3$s“</string>
 
+    <!-- Preference for syncing credit cards -->
+    <string name="preferences_sync_credit_cards">Mokėjimo kortelės</string>
+    <!-- Preference for syncing addresses -->
+    <string name="preferences_sync_address">Adresai</string>
+
     <!-- Send Tab -->
     <!-- Name of the "receive tabs" notification channel. Displayed in the "App notifications" system settings for the app -->
     <string name="fxa_received_tab_channel_name">Gautos kortelės</string>
@@ -1457,10 +1462,8 @@
     <string name="preferences_passwords_autofill">Užpildyti automatiškai</string>
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Sinchronizuoti prisijungimus</string>
-    <!-- Syncing saved logins in Fenix is on -->
-    <string name="preferences_passwords_sync_logins_on">Taip</string>
-    <!-- Syncing saved logins in Fenix is off -->
-    <string name="preferences_passwords_sync_logins_off">Ne</string>
+    <!-- Preference for syncing saved logins in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices">Sinchronizuoti prisijungimus tarp įrenginių</string>
     <!-- Syncing saved logins in Fenix needs reconnect to sync -->
     <string name="preferences_passwords_sync_logins_reconnect">Prisijungti iš naujo</string>
     <!-- Syncing saved logins in Fenix needs login -->
@@ -1565,6 +1568,8 @@
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Sinchronizuoti korteles tarp įrenginių</string>
 
+    <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
+    <string name="preferences_credit_cards_sync_cards">Sinchronizuoti korteles</string>
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Pridėti mokėjimo kortelę</string>
 
@@ -1596,6 +1601,23 @@
     <!-- Title of the "Saved cards" screen -->
     <string name="credit_cards_saved_cards">Įrašytos kortelės</string>
 
+    <!-- Error message for credit card number validation -->
+    <string name="credit_cards_number_validation_error_message">Įveskite teisingą mokėjimo kortelės numerį</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Atrakinkite, norėdami peržiūrėti įrašytas korteles</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Apsaugokite savo mokėjimo korteles</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Naudokite įrenginio užraktą, PIN, arba slaptažodį, kad apsaugotumėte savo mokėjimo korteles tada, kai jūsų įrenginį turi kažkas kitas.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Apsaugoti dabar</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Vėliau</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Atrakinkite savo įrenginį</string>
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Atrakinkite, norėdami naudoti įrašytą mokėjimo kortelės informaciją</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Pridėti ieškyklę</string>
     <!-- Title of the Edit search engine screen -->
@@ -1767,4 +1789,10 @@
     <!-- Content description radio buttons with a link to more information -->
     <string name="radio_preference_info_content_description">Spustelėkite čia, jeigu norite daugiau informacijos</string>
 
-    </resources>
+    <!-- Content description for the action bar "up" button -->
+    <string name="action_bar_up_description">Pereiti aukštyn</string>
+
+    <!-- Content description for privacy content close button -->
+    <string name="privacy_content_close_button_content_description">Užverti</string>
+
+</resources>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 2eba8af50..40665e7ba 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_name_private_5">Privat %s</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (privat)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">Flere innstillinger</string>
@@ -48,6 +49,16 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">Valgt</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">Nylig lagret</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">Nylig lagrede bokmerker</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">Vis alle</string>
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">Vis alle lagrede bokmerker-knapp</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s er produsert av Mozilla.</string>
 
@@ -95,13 +106,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Ignorer</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Endre utseende av åpne faner. Gå til innstillinger og velg rutenett under fanevisning.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Gå til innstillinger</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Avvis</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Ny fane</string>
@@ -111,6 +115,12 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">Mest besøkte nettsteder</string>
 
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">Hopp inn igjen</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">Vis alle</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">Åpne faner</string>
@@ -186,6 +196,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Rediger</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Startskjerm</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">Kan ikke koble til. Ugjenkjennelig URL-skjema.</string>
@@ -553,8 +567,6 @@
     <string name="library_new_tab">Ny fane</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Søk på siden</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Synkroniserte faner</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Leseliste</string>
     <!-- Menu Item Label for Search in Library -->
@@ -599,6 +611,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Etter en måned</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Start på starskjerm</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">Etter fire timer</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Alltid</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Aldri</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Lukk manuelt</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -1593,6 +1614,10 @@
     <string name="credit_cards_card_number">Kortnummer</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">Utløpsdato</string>
+    <!-- The label for the expiration date month of a credit card -->
+    <string name="credit_cards_expiration_date_month">Utløpsdato måned</string>
+    <!-- The label for the expiration date year of a credit card -->
+    <string name="credit_cards_expiration_date_year">Utløpsdato år</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">Navn på kort</string>
     <!-- The header for the nickname for a credit card -->
@@ -1613,6 +1638,24 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Oppgi et gyldig betalingskortnummer</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Fyll ut dette feltet</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Lås opp for å se dine lagrede betalingskort</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Sikre dine betalingskort</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Konfigurer en PIN-kode, et passord eller et låsemønster for å beskytte de lagrede betalingskortene dine om noen andre skulle få tak i enheten din.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Konfigurer nå</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Senere</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Lås opp enheten din</string>
+
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Lås opp for å bruke lagret betalingskortinformasjon</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Legg til søkemotor</string>
     <!-- Title of the Edit search engine screen -->
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index c4cc6a4ae..a2e2e7920 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -51,9 +51,11 @@
     <color name="search_suggestion_indicator_icon_color_normal_theme">@color/search_suggestion_indicator_icon_color_dark_theme</color>
     <color name="search_suggestion_indicator_icon_bookmark_color_normal_theme">@color/search_suggestion_indicator_icon_bookmark_color_dark_theme</color>
     <color name="select_login_header_normal_theme">@color/accent_high_contrast_dark_theme</color>
+    <color name="select_credit_card_header_normal_theme">@color/accent_high_contrast_dark_theme</color>
     <color name="preference_section_header_normal_theme">@color/preference_section_header_dark_theme</color>
     <color name="notification_accent_color_normal_theme">@color/accent_high_contrast_dark_theme</color>
     <color name="menu_item_button_normal_theme">@color/accent_high_contrast_dark_theme</color>
+    <color name="recently_used_share_theme">@color/recently_used_share_menu_dark_theme</color>
 
     <color name="mozac_widget_favicon_background_normal_theme">@color/mozac_widget_favicon_background_dark_theme</color>
     <color name="mozac_widget_favicon_border_normal_theme">@color/mozac_widget_favicon_border_dark_theme</color>
@@ -78,10 +80,10 @@
 
     <!--Top site colors -->
     <color name="top_site_title_text">@color/top_site_title_text_dark_theme</color>
-    <color name="top_site_pager_dot">#3A3944</color>
-    <color name="top_site_pager_dot_selected">#5B5B66</color>
-    <color name="top_site_pin_icon_background_tint">@color/photonViolet50</color>
-    <color name="top_sites_border_color">@color/dark_grey_90</color>
+    <color name="top_site_pager_dot">@color/photonDarkGrey40</color>
+    <color name="top_site_pager_dot_selected">@color/photonDarkGrey05</color>
+    <color name="top_site_pin_icon_color">@color/foundation_light_theme</color>
+    <color name="top_sites_border_color">@color/photonDarkGrey90</color>
 
     <!-- Synced tabs colors-->
     <color name="synced_tabs_separator">@color/synced_tabs_separator_dark_theme</color>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 87b3f33ef..c22472c53 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -5,6 +5,7 @@
     <string name="app_name_private_5">Privé %s</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (Privé)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">Meer opties</string>
@@ -51,6 +52,16 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">Geselecteerd</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">Onlangs opgeslagen</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">Recent opgeslagen bladwijzers</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">Alles tonen</string>
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">Knop Alle opgeslagen bladwijzers tonen</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s is gemaakt door Mozilla.</string>
 
@@ -98,13 +109,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Sluiten</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Wijzig de opmaak van open tabbladen. Ga naar instellingen en selecteer onder Tabbladweergave ‘Raster’.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Naar Instellingen</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Sluiten</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Nieuw tabblad</string>
@@ -114,6 +118,12 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">Topwebsites</string>
 
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">Terugspringen</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">Alles tonen</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">Open tabbladen</string>
@@ -190,6 +200,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Bewerken</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Startscherm</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">Kan niet verbinden. Onherkenbaar URL-schema.</string>
@@ -551,8 +565,6 @@
     <string name="library_new_tab">Nieuw tabblad</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Zoeken op pagina</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Gesynchroniseerde tabbladen</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Leeslijst</string>
 
@@ -600,6 +612,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Na een maand</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Op startscherm beginnen</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">Na vier uur</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Altijd</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Nooit</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Handmatig sluiten</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -1579,6 +1600,10 @@
     <string name="credit_cards_card_number">Kaartnummer</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">Vervaldatum</string>
+    <!-- The label for the expiration date month of a credit card -->
+    <string name="credit_cards_expiration_date_month">Vervaldatum – maand</string>
+    <!-- The label for the expiration date year of a credit card -->
+    <string name="credit_cards_expiration_date_year">Vervaldatum – jaar</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">Naam op kaart</string>
     <!-- The header for the nickname for a credit card -->
@@ -1600,6 +1625,24 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Voer een geldig creditcardnummer in</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Vul dit veld in</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Ontgrendel om uw opgeslagen kaarten te bekijken</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Beveilig uw creditcards</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Stel een vergrendelingspatroon, pincode of wachtwoord voor uw apparaat in om uw opgeslagen creditcards te beschermen tegen toegang als iemand anders uw apparaat heeft.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Nu instellen</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Later</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Ontgrendel uw apparaat</string>
+
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Ontgrendelen om opgeslagen creditcardgegevens te gebruiken</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Zoekmachine toevoegen</string>
     <!-- Title of the Edit search engine screen -->
diff --git a/app/src/main/res/values-nn-rNO/strings.xml b/app/src/main/res/values-nn-rNO/strings.xml
index be6fc13ca..282a3fa2a 100644
--- a/app/src/main/res/values-nn-rNO/strings.xml
+++ b/app/src/main/res/values-nn-rNO/strings.xml
@@ -5,6 +5,7 @@
     <string name="app_name_private_5">Privat %s</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (privat)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">Fleire innstillingar</string>
@@ -52,6 +53,16 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">Vald</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">Nyleg lagra</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">Nylig lagra bokmerke</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">Vis alle</string>
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">Vis alle lagra bokmerke-knapp</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s er produsert av Mozilla.</string>
 
@@ -96,13 +107,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Ignorer</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Endre utsjånad av opne faner. Gå til innstillingar og vel rutenett under fanevising.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Gå til Innstillingar</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Avvis</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Ny fane</string>
@@ -112,6 +116,12 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">Mest besøkte nettstadar</string>
 
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">Hopp inn igjen</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">Vis alle</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">Opne faner</string>
@@ -186,6 +196,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Rediger</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Startskjerm</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">Klarte ikkje å kople til. Ukjenneleg URL-skjema.</string>
@@ -551,8 +565,6 @@
     <string name="library_new_tab">Ny fane</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Finn på sida</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Synkroniserte faner</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Leseliste</string>
     <!-- Menu Item Label for Search in Library -->
@@ -598,6 +610,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Etter ein månad</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Start på starskjerm</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">Etter fire timar</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Alltid</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Aldri</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Lat att manuelt</string>
 
@@ -1586,6 +1607,10 @@
     <string name="credit_cards_card_number">Kortnummer</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">Går ut-dato</string>
+    <!-- The label for the expiration date month of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_month">Går ut-dato, månad</string>
+    <!-- The label for the expiration date year of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_year">Går ut-dato, år</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">Namn på kort</string>
     <!-- The header for the nickname for a credit card -->
@@ -1607,6 +1632,24 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Skriv inn eit gyldig betalingskortnummer</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Fyll ut dette feltet</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Lås opp for å sjå lagra betalingskort</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Sikre betalingskorta dine</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Konfigurer eit låsemønster for eininga, PIN, eller passord, for å beskytte dei lagra betalingskorta dine om nokon andre skulle få tak i eininga di.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Konfigurer no</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Seinare</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Lås opp eininga di</string>
+
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Lås opp for å bruke lagra betalingskortinformasjon</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Legg til søkjemotor</string>
     <!-- Title of the Edit search engine screen -->
diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml
index 3b881459b..6699ba92d 100644
--- a/app/src/main/res/values-oc/strings.xml
+++ b/app/src/main/res/values-oc/strings.xml
@@ -1614,6 +1614,23 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Picatz un numèro de carta de crèdit valid</string>
 
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Desblocatz per veire las cartas enregistradas</string>
+
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Securizatz vòstras cartas de crèdit</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Configuratz un esquèma de verrolhatge, un còdi PIN o un senhal per protegir vòstres identificants de cartas de crèdit enregistrats se per cas qualqu’un accedisca a vòstre periferic.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Configurar ara</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Mai tard</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Desverrolhatz lo periferic</string>
+
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Desverrolhatz per utilizar las informacions de cartas de crèdit enregistradas</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Apondre un motor de recèrca</string>
     <!-- Title of the Edit search engine screen -->
@@ -1783,6 +1800,9 @@
     <!-- Content description radio buttons with a link to more information -->
     <string name="radio_preference_info_content_description">Clicatz per aver de detalhs</string>
 
+    <!-- Content description for the action bar "up" button -->
+    <string name="action_bar_up_description">Remontar</string>
+
     <!-- Content description for privacy content close button -->
     <string name="privacy_content_close_button_content_description">Tampar</string>
 
diff --git a/app/src/main/res/values-pa-rIN/strings.xml b/app/src/main/res/values-pa-rIN/strings.xml
index 1fd1bcb57..d9af5dbb9 100644
--- a/app/src/main/res/values-pa-rIN/strings.xml
+++ b/app/src/main/res/values-pa-rIN/strings.xml
@@ -98,13 +98,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">ਖ਼ਾਰਜ ਕਰੋ</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">ਖੁੱਲ੍ਹੀਆਂ ਟੈਬਾਂ ਦੇ ਖਾਤੇ ਨੂੰ ਬਦਲੋ। ਸੈਟਿੰਗਾਂ ਉੱਤੇ ਜਾਓ ਅਤੇ ਟੈਬ ਵੇਖਣ ਲਈ ਗਿੱਡ ਚੁਣੋ।</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">ਸੈਟਿੰਗਾਂ ਉੱਤੇ ਜਾਓ</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">ਖ਼ਾਰਜ ਕਰੋ</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">ਨਵੀਂ ਟੈਬ</string>
@@ -560,8 +553,6 @@
     <string name="library_new_tab">ਨਵੀਂ ਟੈਬ</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">ਸਫ਼ੇ ‘ਚ ਲੱਭੋ</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">ਸਿੰਕ ਕੀਤੀਆਂ ਟੈਬਾਂ</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">ਪੜ੍ਹਨ ਸੂਚੀ</string>
     <!-- Menu Item Label for Search in Library -->
@@ -1612,6 +1603,21 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">ਵਾਜਬ ਕਰੈਡਿਟ ਕਾਰਡ ਨੰਬਰ ਦਿਓ ਜੀ</string>
 
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">ਆਪਣੇ ਸੰਭਾਲੇ ਹੋਏ ਕਾਰਡ ਵੇਖਣ ਲਈ ਅਣ-ਲਾਕ ਕਰੋ</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">ਆਪਣੇ ਕਰੈਡਿਟ ਕਾਰਡ ਸੁਰੱਖਿਅਤ ਕਰੋ</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">ਆਪਣੀ ਡਿਵਾਇਸ ਲਈ ਲਾਕ ਪੈਟਰਨ, ਪਿੰਨ, ਜਾਂ ਪਾਸਵਰਡ ਸੈੱਟ ਕਰੋ ਤਾਂ ਜੋ ਕਿਸੇ ਹੋਰ ਹੱਥ ਤੁਹਾਡਾ ਡਿਵਾਇਸ ਹੋਣ ਉੱਤੇ ਤੁਹਾਡੇ ਸੰਭਾਲੇ ਪਾਸਵਰਡ ਸੁਰੱਖਿਅਤ ਰਹਿਣ।</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">ਹੁਣੇ ਸੈਟ ਅੱਪ ਕਰੋ</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">ਬਾਦ \'ਚ</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">ਆਪਣਾ ਡਿਵਾਇਸ ਅਣ-ਲਾਕ ਕਰੋ</string>
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">ਸੰਭਾਲੀ ਕਰੈਡਿਟ ਕਾਰਡ ਜਾਣਕਾਰੀ ਵਰਤਣ ਲਈ ਅਣ-ਲਾਕ ਕਰੋ</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">ਖੋਜ ਇੰਜਣ ਜੋੜੋ</string>
     <!-- Title of the Edit search engine screen -->
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 8ba0a1f4f..917cec130 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -5,6 +5,7 @@
     <string name="app_name_private_5">%s (tryb prywatny)</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (tryb prywatny)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">Więcej opcji</string>
@@ -49,6 +50,16 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">Zaznaczone</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">Ostatnio zachowane</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">Ostatnio dodane zakładki</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">Wyświetl wszystkie</string>
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">Przycisk wyświetlenia wszystkich dodanych zakładek</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s jest tworzony przez Mozillę.</string>
 
@@ -94,13 +105,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Zamknij</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Zmień układ otwartych kart. Otwórz ustawienia i wybierz siatkę w sekcji wyglądu kart.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Otwórz ustawienia</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Zamknij</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Nowa karta</string>
@@ -110,6 +114,12 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">Popularne</string>
 
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">Wskocz z powrotem</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">Wyświetl wszystkie</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">Otwarte karty</string>
@@ -186,6 +196,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Edytuj</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Strona startowa</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">Nie można się połączyć. Nieznany protokół adresu URL.</string>
@@ -550,8 +564,6 @@
     <string name="library_new_tab">Nowa karta</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Znajdź na stronie</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Karty z innych urządzeń</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Do przeczytania</string>
     <!-- Menu Item Label for Search in Library -->
@@ -587,9 +599,9 @@
     <!-- Option for a grid tab view -->
     <string name="tab_view_grid">Siatka</string>
     <!-- Title of preference that allows a user to auto close tabs after a specified amount of time -->
-    <string name="preferences_close_tabs">Zamykanie kart</string>
+    <string name="preferences_close_tabs">Zamykaj karty</string>
     <!-- Option for auto closing tabs that will never auto close tabs, always allows user to manually close tabs -->
-    <string name="close_tabs_manually">Ręczne</string>
+    <string name="close_tabs_manually">Ręcznie</string>
     <!-- Option for auto closing tabs that will auto close tabs after one day -->
     <string name="close_tabs_after_one_day">Po jednym dniu</string>
     <!-- Option for auto closing tabs that will auto close tabs after one week -->
@@ -597,6 +609,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Po miesiącu</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Zaczynaj na stronie startowej</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">Po czterech godzinach</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Zawsze</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Nigdy</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Zamykane ręcznie</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -1578,6 +1599,10 @@
     <string name="credit_cards_card_number">Numer karty</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">Data ważności</string>
+    <!-- The label for the expiration date month of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_month">Miesiąc daty ważności</string>
+    <!-- The label for the expiration date year of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_year">Rok daty ważności</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">Imię i nazwisko</string>
     <!-- The header for the nickname for a credit card -->
@@ -1598,6 +1623,24 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Wprowadź prawidłowy numer karty płatniczej</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Wypełnij to pole</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Odblokuj, aby wyświetlić zachowane karty</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Zabezpiecz karty płatnicze</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Skonfiguruj wzór blokady, kod PIN lub hasło, aby ochronić zachowane karty płatnicze w przypadku, gdy ktoś inny uzyska dostęp do urządzenia.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Skonfiguruj teraz</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Później</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Odblokuj urządzenie</string>
+
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Odblokuj, aby użyć przechowywanych informacji o kartach płatniczych</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Dodaj wyszukiwarkę</string>
     <!-- Title of the Edit search engine screen -->
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 28e7c2abe..318ede103 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_name_private_5">%s privativo</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (privativo)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">Mais opções</string>
@@ -47,6 +48,16 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">Selecionada</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">Salvos recentemente</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">Favoritos salvos recentemente</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">Mostrar todos</string>
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">Botão de mostrar todos os favoritos salvos</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">O %1$s é produzido pela Mozilla.</string>
 
@@ -93,13 +104,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Descartar</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Altere o layout de abas abertas. Vá em configurações e selecione grade na visão de abas.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Ir para configurações</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Descartar</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Nova aba</string>
@@ -109,6 +113,12 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">Sites preferidos</string>
 
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">Retornar</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">Mostrar tudo</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">Abas abertas</string>
@@ -184,6 +194,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Editar</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Tela inicial</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">Não foi possível conectar. Esquema de URL não reconhecível.</string>
@@ -546,8 +560,6 @@
     <string name="library_new_tab">Nova aba</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Procurar na página</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Abas sincronizadas</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Lista de leitura</string>
     <!-- Menu Item Label for Search in Library -->
@@ -592,6 +604,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Após um mês sem uso</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Iniciar na tela inicial</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">Após quatro horas</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Sempre</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Nunca</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Fechar manualmente</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -1530,7 +1551,7 @@
     <string name="logins_warning_dialog_title">Proteja suas contas e senhas</string>
 
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">Configure um desenho de bloqueio, código PIN ou senha para proteger o acesso a suas contas e senhas salvas, caso outras pessoas usem seu dispositivo.</string>
+    <string name="logins_warning_dialog_message">Configure um método de bloqueio do dispositivo (desenho, código PIN ou senha) para proteger o acesso a suas contas e senhas salvas, caso outras pessoas usem seu dispositivo.</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Mais tarde</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1573,6 +1594,10 @@
     <string name="credit_cards_card_number">Número do cartão</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">Data de validade</string>
+    <!-- The label for the expiration date month of a credit card -->
+    <string name="credit_cards_expiration_date_month">Mês da data de validade</string>
+    <!-- The label for the expiration date year of a credit card -->
+    <string name="credit_cards_expiration_date_year">Ano da data de validade</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">Nome no cartão</string>
     <!-- The header for the nickname for a credit card -->
@@ -1594,6 +1619,24 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Digite um número de cartão de crédito válido</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Preencha este campo</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Desbloqueie para ver seus cartões salvos</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Proteja seus cartões de crédito</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Configure um método de bloqueio do dispositivo (desenho, código PIN ou senha) para proteger o acesso a seus cartões de crédito salvos, caso outras pessoas usem seu dispositivo.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Configurar agora</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Mais tarde</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Desbloqueie seu dispositivo</string>
+
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Desbloqueie para usar informações armazenadas de cartões de crédito</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Adicionar mecanismo de pesquisa</string>
     <!-- Title of the Edit search engine screen -->
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 30c521ed1..e94c9d9a8 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -94,13 +94,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Dispensar</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Altere a disposição dos separadores abertos. Aceda às configurações e selecione grelha sob vista de separadores.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Ir para as definições</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Ignorar</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Novo separador</string>
@@ -184,6 +177,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Editar</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Ecrã inicial</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">Não foi possível ligar. Esquema do endereço não reconhecido.</string>
@@ -413,6 +410,11 @@
         and the third is the device model. -->
     <string name="default_device_name_2">%1$s no %2$s %3$s</string>
 
+    <!-- Preference for syncing credit cards -->
+    <string name="preferences_sync_credit_cards">Cartões de crédito</string>
+    <!-- Preference for syncing addresses -->
+    <string name="preferences_sync_address">Moradas</string>
+
     <!-- Send Tab -->
     <!-- Name of the "receive tabs" notification channel. Displayed in the "App notifications" system settings for the app -->
     <string name="fxa_received_tab_channel_name">Separadores recebidos</string>
@@ -543,8 +545,6 @@
     <string name="library_new_tab">Novo separador</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Localizar na página</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Separadores sincronizados</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Lista de leitura</string>
     <!-- Menu Item Label for Search in Library -->
@@ -590,6 +590,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Depois de um mês</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Começar no ecrã inicial</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">Depois de quatro horas</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Sempre</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Nunca</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Fechar manualmente</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -1455,10 +1464,8 @@
     <string name="preferences_passwords_autofill">Preenchimento automático</string>
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Sincronização de credenciais</string>
-    <!-- Syncing saved logins in Fenix is on -->
-    <string name="preferences_passwords_sync_logins_on">Ativada</string>
-    <!-- Syncing saved logins in Fenix is off -->
-    <string name="preferences_passwords_sync_logins_off">Desativada</string>
+    <!-- Preference for syncing saved logins in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices">Sincronizar credenciais entre dispositivos</string>
     <!-- Syncing saved logins in Fenix needs reconnect to sync -->
     <string name="preferences_passwords_sync_logins_reconnect">Voltar a ligar</string>
     <!-- Syncing saved logins in Fenix needs login -->
@@ -1559,6 +1566,8 @@
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Os dados são encriptados</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Sincronizar cartões entre dispositivos</string>
+    <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
+    <string name="preferences_credit_cards_sync_cards">Sincronizar cartões</string>
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Adicionar cartão de crédito</string>
 
@@ -1572,6 +1581,10 @@
     <string name="credit_cards_card_number">Número do cartão</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">Data de expiração</string>
+    <!-- The label for the expiration date month of a credit card -->
+    <string name="credit_cards_expiration_date_month">Mês da data de expiração</string>
+    <!-- The label for the expiration date year of a credit card -->
+    <string name="credit_cards_expiration_date_year">Ano da data de expiração</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">Nome no cartão</string>
     <!-- The header for the nickname for a credit card -->
@@ -1590,6 +1603,25 @@
     <!-- Title of the "Saved cards" screen -->
     <string name="credit_cards_saved_cards">Cartões guardados</string>
 
+    <!-- Error message for credit card number validation -->
+    <string name="credit_cards_number_validation_error_message">Por favor, introduza um número de cartão de crédito válido</string>
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Por favor preencha este campo</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Desbloquear para ver os cartões guardados</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Proteja os seus cartões de crédito</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Configure um padrão, PIN ou palavra-passe de bloqueio do dispositivo para impedir que os seus cartões de crédito guardados sejam acedidos por outra pessoa que tenha acesso ao seu dispositivo.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Configurar agora</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Mais tarde</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Desbloquear o seu dispositivo</string>
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Desbloquear para utilizar as informações de cartão de crédito armazenadas</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Adicionar motor de pesquisa</string>
     <!-- Title of the Edit search engine screen -->
@@ -1758,4 +1790,10 @@
     <!-- Content description radio buttons with a link to more information -->
     <string name="radio_preference_info_content_description">Clique para mais detalhes</string>
 
-    </resources>
+    <!-- Content description for the action bar "up" button -->
+    <string name="action_bar_up_description">Navegar para cima</string>
+
+    <!-- Content description for privacy content close button -->
+    <string name="privacy_content_close_button_content_description">Fechar</string>
+
+</resources>
diff --git a/app/src/main/res/values-rm/strings.xml b/app/src/main/res/values-rm/strings.xml
index f4fa3590a..4ef2d5291 100644
--- a/app/src/main/res/values-rm/strings.xml
+++ b/app/src/main/res/values-rm/strings.xml
@@ -1594,6 +1594,22 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Endatescha per plaschair in numer da carta da credit valid</string>
 
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Debloccar per vesair tias cartas memorisadas</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Protegia tias cartas da credit</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Endrizza in muster per bloccar l\'apparat, in PIN u pled-clav per evitar ch\'ina autra persuna possia acceder a tias cartas da credit memorisadas sch\'ella ha tes apparat.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Ussa endrizzar</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Pli tard</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Debloccar tes apparat</string>
+
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Debloccar per utilisar las datas da cartas da credit memorisadas</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Agiuntar ina maschina da tschertgar</string>
     <!-- Title of the Edit search engine screen -->
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 38af6b4ac..5ed50ab50 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -68,14 +68,6 @@
     <!-- Text for the negative button -->
     <string name="cfr_neg_button_text">Nu, mulțumesc</string>
 
-    <!-- Search widget "contextual feature recommendation" (CFR) -->
-    <!-- Text for the main message. 'Firefox' intentionally hardcoded here.-->
-    <string name="search_widget_cfr_message">Accesează Firefox mai repede. Adaugă un widget pe ecranul de start.</string>
-    <!-- Text for the positive button -->
-    <string name="search_widget_cfr_pos_button_text">Adaugă widget</string>
-    <!-- Text for the negative button -->
-    <string name="search_widget_cfr_neg_button_text">Nu acum</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Filă nouă</string>
@@ -124,8 +116,6 @@
     <string name="browser_menu_find_in_page">Caută în pagină</string>
     <!-- Browser menu button that creates a private tab -->
     <string name="browser_menu_private_tab">Filă privată</string>
-    <!-- Browser menu button that creates a new tab -->
-    <string name="browser_menu_new_tab">Filă nouă</string>
     <!-- Browser menu button that saves the current tab to a collection -->
     <string name="browser_menu_save_to_collection_2">Salvează în colecție</string>
     <!-- Browser menu button that open a share menu to share the current site -->
@@ -187,7 +177,6 @@
     <!-- Search suggestion onboarding hint Learn more link text -->
     <string name="search_suggestions_onboarding_learn_more_link">Află mai multe</string>
 
-    <!-- Search Widget -->
     <!-- Text preview for smaller sized widgets -->
     <string name="search_widget_text_short">Căutare</string>
     <!-- Text preview for larger sized widgets -->
@@ -306,6 +295,9 @@
     <!-- Preference for notifications -->
     <string name="preferences_notifications">Notificări</string>
 
+    <!-- Hint displayed on input field for custom collection name -->
+    <string name="customize_addon_collection_hint">Numele colecției</string>
+
     <!-- Account Preferences -->
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Sincronizează acum</string>
@@ -371,9 +363,6 @@
     <!-- Text displayed when there are no exceptions, with learn more link that brings users to a tracking protection SUMO page -->
     <string name="exceptions_empty_message_learn_more_link">Află mai multe</string>
 
-    <!-- Description in Quick Settings that tells user tracking protection is off globally for all sites, and links to Settings to turn it on -->
-    <string name="preferences_tracking_protection_turned_off_globally">Dezactivat la nivel global, intră în Setări pentru activare.</string>
-
     <!-- Preference switch for Telemetry -->
     <string name="preferences_telemetry">Telemetrie</string>
     <!-- Preference switch for usage and technical data collection -->
@@ -451,8 +440,8 @@
     <!-- Option in Library to open History page -->
     <string name="library_history">Istoric</string>
 
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">File sincronizate</string>
+    <!-- Option in Library to find text in page -->
+    <string name="library_find_in_page">Caută în pagină</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Listă de lectură</string>
     <!-- Menu Item Label for Search in Library -->
@@ -526,7 +515,7 @@
     <!-- Text for the button to open tabs of the selected collection -->
     <string name="collection_open_tabs">Deschide filele</string>
     <!-- Text for the menu button to remove a top site -->
-    <string name="remove_top_site">Șterge</string>
+	<string name="remove_top_site">Șterge</string>
 
     <!-- Postfix for private WebApp titles, placeholder is replaced with app name -->
     <string name="pwa_site_controls_title_private">%1$s (mod privat)</string>
@@ -572,13 +561,11 @@
     <!-- Text shown when no history exists -->
     <string name="history_empty_message">Fără istoric</string>
 
-    <!-- Downloads -->
-    <!-- Text shown when no download exists -->
-    <string name="download_empty_message">Nu există descărcări aici</string>
     <!-- History multi select title in app bar
     The first parameter is the number of downloads selected -->
     <string name="download_multi_select_title">%1$d selectate</string>
 
+
     <!-- Crashes -->
     <!-- Title text displayed on the tab crash page. This first parameter is the name of the application (For example: Fenix) -->
     <string name="tab_crash_title_2">Ne cerem scuze. %1$s nu poate încărca pagina.</string>
@@ -612,8 +599,6 @@
     <string name="bookmark_delete_folder_snackbar">%1$s șters</string>
     <!-- Screen title for adding a bookmarks folder -->
     <string name="bookmark_add_folder">Adaugă dosarul</string>
-    <!-- deprecated: Snackbar title shown after a bookmark has been created. -->
-    <string name="bookmark_created_snackbar">Marcaj creat.</string>
     <!-- Snackbar title shown after a bookmark has been created. -->
     <string name="bookmark_saved_snackbar">Marcaj salvat!</string>
     <!-- Snackbar edit button shown after a bookmark has been created. -->
@@ -713,15 +698,15 @@
     <string name="tracking_protection_on">Activată</string>
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Dezactivată</string>
-    <!-- Label that indicates that all video and audio autoplay is allowed -->
+    <!-- Label for global setting that indicates that all video and audio autoplay is allowed -->
     <string name="preference_option_autoplay_allowed2">Permite audio și video</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Blochează audio și video numai pe date celulare</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">Audio și video se vor reda pe Wi-Fi</string>
-    <!-- Label that indicates that video autoplay is allowed, but audio autoplay is blocked -->
+    <!-- Label for global setting that indicates that video autoplay is allowed, but audio autoplay is blocked -->
     <string name="preference_option_autoplay_block_audio2">Blochează numai audio</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Blochează audio și video</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">Activat</string>
@@ -972,9 +957,6 @@
     <string name="onboarding_header">Bine ai venit pe %s!</string>
     <!-- text for the Firefox Accounts section header -->
     <string name="onboarding_fxa_section_header">Ai deja un cont?</string>
-    <!-- text for the Firefox Preview feature section header
-    The first parameter is the name of the app (e.g. Firefox Preview) -->
-    <string name="onboarding_feature_section_header">Descoperă %s</string>
     <!-- text for the "What's New" onboarding card header -->
     <string name="onboarding_whats_new_header1">Vezi ce e nou</string>
     <!-- text for the "what's new" onboarding card description
@@ -982,47 +964,22 @@
     <string name="onboarding_whats_new_description">Ai întrebări despre %s reproiectat? Vrei să știi ce s-a schimbat?</string>
     <!-- text for underlined clickable link that is part of "what's new" onboarding card description that links to an FAQ -->
     <string name="onboarding_whats_new_description_linktext">Obține răspunsuri aici</string>
-    <!-- text for the Firefox account onboarding sign in card header -->
-    <string name="onboarding_account_sign_in_header">Începe să sincronizezi marcaje, parole și multe altele din contul Firefox.</string>
-    <!-- Text for the button to learn more about signing in to your Firefox account -->
-    <string name="onboarding_manual_sign_in_learn_more">Află mai multe</string>
-    <!-- text for the firefox account onboarding card header when we detect you're already signed in to
-        another Firefox browser. (The word `Firefox` should not be translated)
-        The first parameter is the email of the detected user's account -->
-    <string name="onboarding_firefox_account_auto_signin_header_2">Ești autentificat(ă) ca %s de pe un alt browser Firefox de pe acest telefon. Vrei să te autentifici cu acest cont?</string>
     <!-- text for the button to confirm automatic sign-in -->
     <string name="onboarding_firefox_account_auto_signin_confirm">Da, conectează-mă</string>
     <!-- text for the automatic sign-in button while signing in is in process -->
     <string name="onboarding_firefox_account_signing_in">Autentificare…</string>
-    <!-- text for the button to manually sign into Firefox account. The word "Firefox" should not be translated -->
-    <string name="onboarding_firefox_account_sign_in">Intră în contul Firefox</string>
     <!-- text for the button to stay signed out when presented with an option to automatically sign-in. -->
     <string name="onboarding_firefox_account_stay_signed_out">Rămâi deconectat</string>
     <!-- text to display in the snackbar once account is signed-in -->
     <string name="onboarding_firefox_account_sync_is_on">Sync este activat</string>
     <!-- text to display in the snackbar if automatic sign-in fails. user may try again -->
     <string name="onboarding_firefox_account_automatic_signin_failed">Eroare de autentificare</string>
-    <!-- text for the tracking protection onboarding card header -->
-    <string name="onboarding_tracking_protection_header_2">Confidențialitate automată</string>
-    <!-- text for the tracking protection card description
-    The first parameter is the name of the app (e.g. Firefox Preview) -->
-    <string name="onboarding_tracking_protection_description_2">Setările de confidențialitate și securitate blochează elementele de urmărire, softurile rău-intenționate și firmele care te urmăresc.</string>
     <!-- text for tracking protection radio button option for standard level of blocking -->
     <string name="onboarding_tracking_protection_standard_button_2">Standard (implicit)</string>
-    <!-- text for standard blocking option button description -->
-    <string name="onboarding_tracking_protection_standard_button_description_2">Blochează mai puține elemente de urmărire. Paginile se vor încărca normal.</string>
     <!-- text for tracking protection radio button option for strict level of blocking -->
     <string name="onboarding_tracking_protection_strict_button">Strictă (recomandat)</string>
     <!-- text for tracking protection radio button option for strict level of blocking -->
     <string name="onboarding_tracking_protection_strict_option">Strictă</string>
-    <!-- text for strict blocking option button description -->
-    <string name="onboarding_tracking_protection_strict_button_description_2">Blochează mai multe elemente de urmărire, reclame și ferestre pop-up. Paginile se încarcă mai repede, dar se poate ca unele funcționalități să nu meargă.</string>
-    <!-- text for the toolbar position card header
-        In English this is an idiom for "choose a side as in an argument or fight"
-        but it is ok to make this more literally about "choosing a position in a physical space -->
-    <string name="onboarding_toolbar_position_header">Ia o poziție</string>
-    <!-- text for the toolbar position card description -->
-    <string name="onboarding_toolbar_position_description">Încearcă navigarea cu o singură mână folosind bara de unelte de jos sau mut-o în partea de sus.</string>
     <!-- text for the private browsing onboarding card header -->
     <string name="onboarding_private_browsing_header">Navighează privat</string>
     <!-- text for the private browsing onboarding card description
@@ -1035,10 +992,6 @@
     <string name="onboarding_private_browsing_button">Deschide setările</string>
     <!-- text for the privacy notice onboarding card header -->
     <string name="onboarding_privacy_notice_header">Confidențialitatea ta</string>
-    <!-- text for the privacy notice onboarding card description
-    The first parameter is the name of the app (e.g. Firefox Preview) -->
-    <string name="onboarding_privacy_notice_description">Am proiectat %s să îți dea control asupra a ceea ce partajezi
-        online și ce partajezi cu noi.</string>
     <!-- Text for the button to read the privacy notice -->
     <string name="onboarding_privacy_notice_read_button">Citește notificarea noastră privind confidențialitatea</string>
 
@@ -1051,8 +1004,6 @@
     <!-- Onboarding theme -->
     <!-- text for the theme picker onboarding card header -->
     <string name="onboarding_theme_picker_header">Alege o temă</string>
-    <!-- text for the theme picker onboarding card description -->
-    <string name="onboarding_theme_picker_description1">Economisește consumul bateriei și protejează-ți ochii prin activarea modului întunecat.</string>
     <!-- Automatic theme setting (will follow device setting) -->
     <string name="onboarding_theme_automatic_title">Automat</string>
     <!-- Summary of automatic theme setting (will follow device setting) -->
@@ -1105,14 +1056,10 @@
     <string name="preference_enhanced_tracking_protection_explanation_learn_more">Află mai multe</string>
     <!-- Preference for enhanced tracking protection for the standard protection settings -->
     <string name="preference_enhanced_tracking_protection_standard_default_1">Standard (implicit)</string>
-    <!-- Preference description for enhanced tracking protection for the standard protection settings -->
-    <string name="preference_enhanced_tracking_protection_standard_description_3">Blochează mai puține elemente de urmărire. Paginile se vor încărca normal.</string>
     <!--  Accessibility text for the Standard protection information icon  -->
     <string name="preference_enhanced_tracking_protection_standard_info_button">Ce blochează protecția standard împotriva urmăririi</string>
     <!-- Preference for enhanced tracking protection for the strict protection settings -->
     <string name="preference_enhanced_tracking_protection_strict">Strictă</string>
-    <!-- Preference description for enhanced tracking protection for the strict protection settings -->
-    <string name="preference_enhanced_tracking_protection_strict_description_2">Blochează mai multe elemente de urmărire, reclame și ferestre pop-up. Paginile se încarcă mai repede, dar se poate ca unele funcționalități să nu meargă.</string>
     <!--  Accessibility text for the Strict protection information icon  -->
     <string name="preference_enhanced_tracking_protection_strict_info_button">Ce blochează protecția strictă împotriva urmăririi</string>
     <!-- Preference for enhanced tracking protection for the custom protection settings -->
@@ -1233,9 +1180,6 @@
     <!-- Placeholder text for the TextView in the Add to Homescreen dialog -->
     <string name="add_to_homescreen_text_placeholder">Denumire comandă rapidă</string>
 
-    <!-- Describes the add to homescreen functionality -->
-    <string name="add_to_homescreen_description">Poți adăuga cu ușurință acest site web în ecranul de pornire al telefonului pentru acces instant și o navigare mai rapidă, ca și cum ai fi într-o aplicație.</string>
-
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Date de autentificare și parole</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
@@ -1248,10 +1192,6 @@
     <string name="preferences_passwords_autofill">Completare automată</string>
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Sincronizează datele de autentificare</string>
-    <!-- Syncing saved logins in Fenix is on -->
-    <string name="preferences_passwords_sync_logins_on">Activat</string>
-    <!-- Syncing saved logins in Fenix is off -->
-    <string name="preferences_passwords_sync_logins_off">Dezactivat</string>
     <!-- Syncing saved logins in Fenix needs reconnect to sync -->
     <string name="preferences_passwords_sync_logins_reconnect">Reconectare</string>
     <!-- Syncing saved logins in Fenix needs login -->
@@ -1462,7 +1402,7 @@
     <string name="saved_login_duplicate">Există un set de date de autentificare cu acest nume de utilizator</string>
 
     <!-- Synced Tabs -->
-   <!-- Text displayed to ask user to connect another device as no devices found with account -->
+    <!-- Text displayed to ask user to connect another device as no devices found with account -->
     <string name="synced_tabs_connect_another_device">Conectează alt dispozitiv.</string>
     <!-- Text displayed asking user to re-authenticate -->
     <string name="synced_tabs_reauth">Te rugăm să te autentifici din nou.</string>
@@ -1481,11 +1421,13 @@
     <!-- Top Sites -->
     <!-- Title text displayed in the dialog when top sites limit is reached. -->
     <string name="top_sites_max_limit_title">A fost atinsă limita de site-uri de top</string>
-    <!-- Content description text displayed in the dialog when top sites limit is reached. -->
-    <string name="top_sites_max_limit_content">Pentru a adăuga un site de top nou, trebuie să elimini unul existent. Ține degetul pe denumirea site-ului pentru selectare și apoi atinge „Elimină”.</string>
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">Ok, am înțeles</string>
 
+    <!-- Title text displayed in the rename top site dialog. -->
+	<string name="top_sites_rename_dialog_title">Nume</string>
+
     <!-- Content description for close button in collection placeholder. -->
     <string name="remove_home_collection_placeholder_content_description">Elimină</string>
-</resources>
+
+    </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 924d20dbe..f81814fdb 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -6,6 +6,7 @@
     <string name="app_name_private_5">Приватный %s</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (Приватно)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">Другие настройки</string>
@@ -38,8 +39,6 @@
     <string name="tab_tray_select_collection">Выберите коллекцию</string>
     <!-- Content description for close button while in multiselect mode in tab tray -->
     <string name="tab_tray_close_multiselect_content_description">Выйти из режима множественного выбора</string>
-    <!-- Content description for back button in full screen tabs screen -->
-    <string name="tabs_screen_close_screen_description">Закрыть экран вкладок</string>
     <!-- Content description for save to collection button while in multiselect mode in tab tray -->
     <string name="tab_tray_collection_button_multiselect_content_description">Сохранить выбранные вкладки в коллекцию</string>
     <!-- Content description for checkmark while tab is selected while in multiselect mode in tab tray. The first parameter is the title of the tab selected -->
@@ -53,8 +52,18 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">Выбрано</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">Недавно добавленные</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">Недавно добавленные закладки</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">Показать все</string>
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">Показать все добавленные закладки</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
-    <string name="about_content">%1$s разработан @fork-maintainers.</string>
+    <string name="about_content">%1$s разработан Mozilla.</string>
 
     <!-- Private Browsing -->
     <!-- Title for private session option -->
@@ -101,13 +110,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Пропустить</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Измените отображение открытых вкладок. Перейдите в настройки и выберите «Сеткой» в секции «Просмотр вкладок».</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Перейти в настройки</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Закрыть</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Новая вкладка</string>
@@ -117,6 +119,12 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">Топ сайтов</string>
 
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">Перейти обратно в</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">Показать все</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">Открытые вкладки</string>
@@ -195,6 +203,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Изменить</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Домашний экран</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">Ошибка подключения. Не удалось распознать схему URL.</string>
@@ -319,10 +331,6 @@
     <string name="preferences_home">Домой</string>
     <!-- Preference for gestures based actions -->
     <string name="preferences_gestures">Жесты</string>
-    <!-- Preference for customizing the tabs tray -->
-    <string name="preferences_tabs_tray">Панель вкладок</string>
-    <!-- Preference for customizing the tabs tray FAB -->
-    <string name="preferences_tabs_tray_fab">Плавающая кнопка действия (ПКД)</string>
     <!-- Preference for settings related to visual options -->
     <string name="preferences_customize">Персонализация</string>
     <!-- Preference description for banner about signing in -->
@@ -361,13 +369,9 @@
     <string name="preferences_search_synced_tabs">Поиск облачных вкладок</string>
     <!-- Preference for account settings -->
     <string name="preferences_account_settings">Настройки Аккаунта</string>
+
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">Автозаполнение URL</string>
-    <!-- Preference for add-ons custom source -->
-    <string name="preferences_addons_customization">Настройка источника пользовательских дополнений</string>
-    <!-- Placeholder text shown in the search bar before a user enters text -->
-    <string name="addons_search_hint">Поиск дополнений</string>
-    
     <!-- Preference for open links in third party apps -->
     <string name="preferences_open_links_in_apps">Открывать ссылки в приложениях</string>
 
@@ -537,13 +541,13 @@
 
     <!-- Gestures Preferences-->
     <!-- Preferences for using pull to refresh in a webpage -->
-    <string name="preference_gestures_website_pull_to_refresh">Потянуть, чтобы обновить</string>
+    <string name="preference_gestures_website_pull_to_refresh">Потяните, чтобы обновить</string>
     <!-- Preference for using the dynamic toolbar -->
-    <string name="preference_gestures_dynamic_toolbar">Прокрутить страницу, чтобы скрыть панель инструментов</string>
+    <string name="preference_gestures_dynamic_toolbar">Прокрутите страницу, чтобы скрыть панель инструментов</string>
     <!-- Preference for switching tabs by swiping horizontally on the toolbar -->
-    <string name="preference_gestures_swipe_toolbar_switch_tabs">Провести в сторону по панели инструментов, чтобы переключить вкладки</string>
+    <string name="preference_gestures_swipe_toolbar_switch_tabs">Проведите в сторону по панели инструментов, чтобы переключить вкладки</string>
     <!-- Preference for showing the opened tabs by swiping up on the toolbar-->
-    <string name="preference_gestures_swipe_toolbar_show_tabs">Провести вверх по панели инструментов, чтобы открыть вкладки</string>
+    <string name="preference_gestures_swipe_toolbar_show_tabs">Проведите вверх по панели инструментов, чтобы открыть вкладки</string>
 
     <!-- Library -->
     <!-- Option in Library to open Sessions page -->
@@ -568,8 +572,6 @@
     <string name="library_new_tab">Новая вкладка</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Найти на странице</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Облачные вкладки</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Список для чтения</string>
     <!-- Menu Item Label for Search in Library -->
@@ -615,6 +617,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Через месяц</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Запускать на домашнем экране </string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">Через четыре часа</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Всегда</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Никогда</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Закрывать вручную</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -1262,23 +1273,6 @@
     <!-- text for tracking protection radio button option for strict level of blocking -->
     <string name="onboarding_tracking_protection_strict_option">Строгая</string>
     <!-- text for strict blocking option button description -->
-    <string name="onboarding_tracking_protection_strict_button_description_2">Блокирует больше трекеров, рекламы и всплывающих окон. Страницы будут грузиться быстрее, но часть функций может не работать.</string>
-    <!-- text for the tabs tray layout onboarding card header -->
-    <string name="onboarding_tabs_layout_header">Выберите макет панели вкладок</string>
-    <!-- text for the tabs tray layout card description-->
-    <string name="onboarding_tabs_tray_layout_description">Выберите, либо старый стиль экрана вкладок Firefox (Fennec), либо панель вкладок нового стиля (Fenix).</string>
-    <!-- text for old Fennec style tab screen layout -->
-    <string name="onboarding_tabs_tray_fennec_layout_button">Старый стиль Fennec (по умолчанию)</string>
-    <!-- text for old Fennec style description -->
-    <string name="onboarding_tabs_tray_fennec_layout_description">Щелчок по счётчику вкладок на панели инструментов покажет вам экран вкладок с макетом, похожим на предыдущую (Fennec) версию Firefox.</string>
-    <!-- text for Fenix style tab tray layout -->
-    <string name="onboarding_tabs_tray_fenix_layout_button">Новый стиль Fenix</string>
-    <!-- text for strict blocking option button description -->
-    <string name="onboarding_tabs_tray_fenix_layout_description">Щелчок по счётчику вкладок на панели инструментов покажет вам новый макет панели вкладок из Fenix версии Firefox.</string>
-    <!-- text for the toolbar position card header
-        In English this is an idiom for "choose a side as in an argument or fight"
-        but it is ok to make this more literally about "choosing a position in a physical space -->
-    <string name="onboarding_toolbar_position_header">Сделайте выбор</string>
     <string name="onboarding_tracking_protection_strict_button_description_3">Блокирует больше трекеров, так что страницы загружаются быстрее, но некоторые страницы могут работать некорректно.</string>
     <!-- text for the toolbar position card header  -->
     <string name="onboarding_toolbar_placement_header_1">Выберите размещение панели инструментов</string>
@@ -1546,10 +1540,6 @@
     <string name="preferences_passwords_saved_logins_username">Имя пользователя</string>
     <!-- The header for the password for a login -->
     <string name="preferences_passwords_saved_logins_password">Пароль</string>
-    <!-- Title for strip url preference in customization settings -->
-    <string name="preferences_strip_url_title">Убрать HTTP/HTTPS/WWW из URL-адресов</string>
-    <!-- Description for strip url preference in customization settings -->
-    <string name="preferences_strip_url_description">Удалять HTTP/HTTPS/WWW из URL-адресов на панели инструментов и в области вкладок</string>
     <!-- Message displayed in security prompt to reenter a secret pin to access saved logins -->
     <string name="preferences_passwords_saved_logins_enter_pin">Введите ваш PIN-код ещё раз</string>
     <!-- Message displayed in security prompt to access saved logins -->
@@ -1634,6 +1624,10 @@
     <string name="credit_cards_card_number">Номер карты</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">Срок действия</string>
+    <!-- The label for the expiration date month of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_month">Месяц срока действия</string>
+    <!-- The label for the expiration date year of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_year">Год срока действия</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">Имя держателя</string>
     <!-- The header for the nickname for a credit card -->
@@ -1654,6 +1648,23 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Пожалуйста, введите корректный номер карты</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Пожалуйста, заполните это поле</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Разблокируйте, чтобы просмотреть сохранённые карты</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Защитите свои банковские карты</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Настройте графический ключ, PIN-код или пароль для блокировки устройства, чтобы защитить сохранённые банковские карты, если кто-либо ещё получит доступ к вашему устройству.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Настроить сейчас</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Позже</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Разблокируйте своё устройство</string>
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Разблокируйте, чтобы использовать сохранённые данные банковской карты</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Добавление поисковой системы</string>
     <!-- Title of the Edit search engine screen -->
@@ -1803,35 +1814,6 @@
     <!-- Label for the show most visited sites preference -->
     <string name="top_sites_toggle_top_frecent_sites">Показывать самые посещаемые сайты</string>
 
-    <!-- Label for add-ons custom source account preference -->
-    <string name="addons_custom_source_account">Установить пользовательскую учетную запись дополнений</string>
-    <!-- Label for add-ons custom source collection preference -->
-    <string name="addons_custom_source_collection">Установить собственную коллекцию дополнений</string>
-
-    <!-- Preference category for system behavior customization -->
-    <string name="preferences_system_behavior">Настроить поведение системы</string>
-    <!-- Title for relinquish memory preference in customization settings -->
-    <string name="preferences_relinquish_memory_title">Приостанавливать вкладки, чтобы их не убили ради памяти</string>
-    <!-- Description for relinquish memory preference in customization settings -->
-    <string name="preferences_relinquish_memory_description">Если эта функция включена, то при нехватке памяти в системе вкладки будут приостановлены, а состояние страницы будет потеряно.</string>
-
-    <!-- Label for enable compact tabs in tabs tray preference -->
-    <string name="enable_compact_tabs">Включить компактные вкладки</string>
-    <!-- Label for enable top tabs tray preference -->
-    <string name="enable_top_tabs_tray">Включить верхнюю панель вкладок</string>
-    <!-- Label for fullscreen tabs tray preference -->
-    <string name="use_fullscreen_tabs_screen">Включить полноэкранный экран вкладок</string>
-    <!-- Label for reverse tab order in tabs tray preference -->
-    <string name="reverse_tab_order_tabs_tray">Обратный порядок вкладок в панели вкладок</string>
-    <!-- Summary for reverse tab order preference -->
-    <string name="reverse_tab_order_description">Включите, чтобы помещать новые вкладки в начало списка вкладок, отключите, чтобы помещать новые вкладки в конец списка вкладок</string>
-    <!-- Label for enable FAB in tabs tray preference -->
-    <string name="enable_fab_tabs_tray">Включить ПКД для новой вкладки</string>
-    <!-- Label for top FAB position in tabs tray preference -->
-    <string name="fab_tabs_tray_top">Поместить ПКД вверху</string>
-    <!-- Label for top FAB position in tabs tray preference -->
-    <string name="fab_tabs_tray_top_description">Разрешить размещать кнопку для новой вкладки вверху, отключите, чтобы разместить её внизу</string>
-    
     <!-- Title text displayed in the rename top site dialog. -->
 	<string name="top_sites_rename_dialog_title">Имя</string>
 	<!-- Hint for renaming title of a top site -->
diff --git a/app/src/main/res/values-sat/strings.xml b/app/src/main/res/values-sat/strings.xml
index 2463204b4..bc41119ea 100644
--- a/app/src/main/res/values-sat/strings.xml
+++ b/app/src/main/res/values-sat/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_name_private_5">ᱯᱨᱟᱭᱣᱮᱴ %s</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (ᱯᱨᱟᱭᱣᱮᱴ)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">ᱰᱷᱮᱨ ᱮᱴᱟᱜᱟᱜ</string>
@@ -44,6 +45,15 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">ᱵᱟᱪᱷᱟᱣᱮᱱᱟ</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">ᱱᱤᱛᱜᱮ ᱥᱟᱺᱪᱟᱣ ᱟᱠᱟᱱᱟ</string>
+
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">ᱱᱮᱛᱚᱜ ᱜᱮ ᱥᱟᱺᱪᱟᱣ ᱟᱠᱟᱱ ᱵᱩᱠᱢᱟᱨᱠ ᱠᱚ</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">ᱡᱷᱚᱛᱚ ᱫᱮᱠᱷᱟᱣ ᱢᱮ</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s ᱛᱮᱭᱟᱨ ᱦᱩᱭ ᱠᱟᱱᱟ ᱢᱳᱡᱤᱞᱟ ᱫᱟᱨᱟᱭᱛᱮ ᱾</string>
 
@@ -91,13 +101,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">ᱵᱟᱹᱰ</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">ᱠᱷᱩᱞᱟᱹ ᱴᱮᱵ ᱞᱮᱭᱟᱩᱴ ᱠᱚ ᱵᱚᱫᱚᱞ ᱢᱮ ᱾ ᱥᱟᱡᱟᱣ ᱴᱷᱮᱱ ᱪᱟᱞᱟᱣ ᱠᱟᱛᱮᱫᱽ ᱴᱮᱵᱽ ᱣᱤᱣ ᱞᱟᱛᱟᱨ ᱨᱮ ᱜᱨᱤᱰ ᱵᱟᱪᱷᱟᱣ ᱢᱮ ᱾ </string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">ᱥᱟᱡᱟᱣ ᱛᱮ ᱪᱟᱞᱟᱜᱽ ᱢᱮ</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">ᱵᱚᱸᱫᱽ</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">ᱱᱟᱶᱟ ᱴᱮᱵᱽ</string>
@@ -529,8 +532,6 @@
     <string name="library_desktop_bookmarks_unfiled">ᱮᱴᱟᱜᱟ ᱵᱩᱠᱢᱟᱨᱠ ᱠᱚ</string>
     <!-- Option in Library to open History page -->
     <string name="library_history">ᱱᱟᱜᱟᱢ</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">ᱥᱭᱸᱠᱼᱰ ᱴᱮᱵᱽ ᱠᱚ</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">ᱯᱟᱲᱦᱟᱣ ᱞᱤᱥᱴᱤ</string>
     <!-- Menu Item Label for Search in Library -->
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index a8da36f25..97d9edcdc 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -1599,6 +1599,21 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Prosím, zadajte platné číslo platobnej karty</string>
 
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Odomknutím zobrazíte svoje uložené kreditné karty</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Zabezpečte svoje kreditné karty</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Nastavte si vzor, kód alebo heslo, ktorým ochránite svoje uložené kreditné karty v prípade, že vaše zariadenie bude používať niekto iný.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Nastaviť teraz</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Neskôr</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Odomknite svoje zariadenie</string>
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Odomknutím použijete uložené informácie o kreditnej karte</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Pridať vyhľadávací modul</string>
     <!-- Title of the Edit search engine screen -->
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index f3ff182a1..88f22dfda 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_name_private_5">Zasebni %s</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (zasebno)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">Več možnosti</string>
@@ -49,6 +50,14 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">Izbrano</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">Nedavno shranjeno</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">Nedavno shranjeni zaznamki</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">Prikaži vse</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s izdeluje Mozilla.</string>
 
@@ -94,13 +103,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Zapri</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Spremenite postavitev odprtih zavihkov. Pojdite v nastavitve in v pogledu zavihkov izberite mrežo.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Pojdi v nastavitve</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Skrij</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Nov zavihek</string>
@@ -110,6 +112,9 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">Glavne strani</string>
 
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">Prikaži vse</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">Odprti zavihki</string>
@@ -184,6 +189,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Uredi</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Domači zaslon</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">Povezava ni mogoča. Neprepoznavna URL shema.</string>
@@ -552,8 +561,6 @@
     <string name="library_new_tab">Nov zavihek</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Najdi na strani</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Sinhronizirani zavihki</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Bralni seznam</string>
     <!-- Menu Item Label for Search in Library -->
@@ -598,6 +605,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Po enem mesecu</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Začni na domačem zaslonu</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">po štirih urah</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">vedno</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">nikoli</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Zapri ročno</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -1465,6 +1481,8 @@
     <string name="preferences_passwords_autofill">Samodejno izpolnjevanje</string>
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Sinhronizacija prijav</string>
+    <!-- Preference for syncing saved logins in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices">Sinhroniziraj prijave med napravami</string>
     <!-- Syncing saved logins in Fenix needs reconnect to sync -->
     <string name="preferences_passwords_sync_logins_reconnect">Ponovno poveži</string>
     <!-- Syncing saved logins in Fenix needs login -->
@@ -1567,6 +1585,8 @@
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Podatki so šifrirani</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Sinhroniziraj kartice med napravami</string>
+    <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
+    <string name="preferences_credit_cards_sync_cards">Sinhroniziraj kartice</string>
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Dodaj kreditno kartico</string>
 
@@ -1580,6 +1600,10 @@
     <string name="credit_cards_card_number">Številka kartice</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">Datum poteka</string>
+    <!-- The label for the expiration date month of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_month">Mesec izteka veljavnosti</string>
+    <!-- The label for the expiration date year of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_year">Leto izteka veljavnosti</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">Ime na kartici</string>
     <!-- The header for the nickname for a credit card -->
@@ -1601,6 +1625,21 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Vnesite veljavno številko kreditne kartice</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Izpolnite to polje</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Odklenite za ogled shranjenih kartic</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Zavarujte svoje kreditne kartice</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Nastavite vzorec za zaklepanje naprave, PIN ali geslo za zaščito pred dostopom do kreditnih kartic, če vašo napravo uporablja še kdo.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Nastavi zdaj</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Pozneje</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Odklenite svojo napravo</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Dodaj iskalnik</string>
     <!-- Title of the Edit search engine screen -->
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index fa1e32869..46f3f7cf7 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -91,13 +91,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Hidhe tej</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Ndryshoni skemën e skedave të hapura. Shkoni te rregullimet dhe përzgjidhni rrjetë nën pamjen skeda.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Shko te rregullimet</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Hidhe tej</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Skedë e re</string>
@@ -182,6 +175,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Përpunoni</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Skena e kreut</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">S’arrihet të lidhet. Skemë URL jo e pranuar.</string>
@@ -412,6 +409,11 @@
         and the third is the device model. -->
     <string name="default_device_name_2">%1$s në %2$s %3$s</string>
 
+    <!-- Preference for syncing credit cards -->
+    <string name="preferences_sync_credit_cards">Karta krediti</string>
+    <!-- Preference for syncing addresses -->
+    <string name="preferences_sync_address">Adresa</string>
+
     <!-- Send Tab -->
     <!-- Name of the "receive tabs" notification channel. Displayed in the "App notifications" system settings for the app -->
     <string name="fxa_received_tab_channel_name">Skeda të marra</string>
@@ -538,8 +540,6 @@
     <string name="library_new_tab">Skedë e re</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Gjej në faqe</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Skeda të njëkohësuara</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Listë Leximesh</string>
     <!-- Menu Item Label for Search in Library -->
@@ -584,6 +584,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Pas një muaji</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Fillo me kreun</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">Pas katër orësh</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Përherë</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Kurrë</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Mbylleni dorazi</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -1563,6 +1572,10 @@
     <string name="credit_cards_card_number">Numër Karte</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">Datë Skadimi</string>
+    <!-- The label for the expiration date month of a credit card -->
+    <string name="credit_cards_expiration_date_month">Muaj Date Skadimi</string>
+    <!-- The label for the expiration date year of a credit card -->
+    <string name="credit_cards_expiration_date_year">Vit Date Skadimi</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">Emër në Kartë</string>
     <!-- The header for the nickname for a credit card -->
@@ -1583,6 +1596,23 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Ju lutemi, jepni një numër të vlefshëm karte krediti</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Ju lutemi, plotësojeni këtë fushë</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Që të shihni kartat tuaja të ruajtura, shkyçeni</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Siguroni kartat tuaja të kreditit</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Ujdisni një rregullsi, PIN ose fjalëkalim kyçjeje pajisjeje për të mbrojtur nga hyrja në to kartat tuaja kreditit të ruajturar, nëse pajisjen tuaj e ka dikush tjetër.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Ujdiseni tani</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Më vonë</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Shkyçni pajisjen tuaj</string>
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Që të përdorni të dhëna karte krediti të depozituara, shkyçeni</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Shtoni motor kërkimesh</string>
     <!-- Title of the Edit search engine screen -->
@@ -1752,4 +1782,10 @@
     <!-- Content description radio buttons with a link to more information -->
     <string name="radio_preference_info_content_description">Klikoni për më tepër hollësi</string>
 
-    </resources>
+    <!-- Content description for the action bar "up" button -->
+    <string name="action_bar_up_description">Lëvizni për sipër</string>
+
+    <!-- Content description for privacy content close button -->
+    <string name="privacy_content_close_button_content_description">Mbylle</string>
+
+</resources>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 1dec857e9..f3e477272 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -5,6 +5,7 @@
     <string name="app_name_private_5">Приватни %s</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (Приватни режим)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">Више опција</string>
@@ -20,10 +21,6 @@
     <!-- No Private Tabs Message Description -->
     <string name="no_private_tabs_description">Ваши приватни језичци биће приказани овде.</string>
 
-    <!-- Default title for pinned Baidu top site that links to Baidu home page  -->
-    <string name="default_top_site_baidu">Baidu</string>
-    <!-- Default title for pinned JD top site that links to JD home page  -->
-    <string name="default_top_site_jd">JD</string>
     <!-- Message announced to the user when tab tray is selected with 1 tab -->
     <string name="open_tab_tray_single">1 отворен језичак. Додирните за пребацивање језичака.</string>
     <!-- Message announced to the user when tab tray is selected with 0 or 2+ tabs -->
@@ -52,6 +49,16 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">Изабрано</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">Недавно сачувано</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">Недавно сачувани обележивачи</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">Прикажи све</string>
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">Прикажи дугме свих сачуваних обележивача</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s производи @fork-maintainers.</string>
 
@@ -95,13 +102,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Одбаци</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Промените приказ отворених језичака. Идите у подешавања и одаберите мрежу под приказом језичака.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Иди у подешавања</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Одбаци</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Нови језичак</string>
@@ -111,6 +111,12 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">Популарне странице</string>
 
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">Скочи назад</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">Прикажи све</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">Отворени језичци</string>
@@ -181,6 +187,15 @@
 
     <!-- Browser menu button to show reader view appearance controls e.g. the used font type and size -->
     <string name="browser_menu_customize_reader_view">Прилагоди приказ за читање</string>
+    <!-- Browser menu label for adding a bookmark -->
+    <string name="browser_menu_add">Додај</string>
+    <!-- Browser menu label for editing a bookmark -->
+    <string name="browser_menu_edit">Уреди</string>
+
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Почетни екран</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">Није могуће повезивање. Непозната URL шема.</string>
@@ -411,6 +426,11 @@
         and the third is the device model. -->
     <string name="default_device_name_2">%1$s на %2$s %3$s</string>
 
+    <!-- Preference for syncing credit cards -->
+    <string name="preferences_sync_credit_cards">Кредитне картице</string>
+    <!-- Preference for syncing addresses -->
+    <string name="preferences_sync_address">Адресе</string>
+
     <!-- Send Tab -->
     <!-- Name of the "receive tabs" notification channel. Displayed in the "App notifications" system settings for the app -->
     <string name="fxa_received_tab_channel_name">Примљени језичци</string>
@@ -441,9 +461,6 @@
     <!-- Text displayed when there are no exceptions, with learn more link that brings users to a tracking protection SUMO page -->
     <string name="exceptions_empty_message_learn_more_link">Сазнајте више</string>
 
-    <!-- Description in Quick Settings that tells user tracking protection is off globally for all sites, and links to Settings to turn it on -->
-    <string name="preferences_tracking_protection_turned_off_globally">Искључено је глобално, за укључивање идите на Подешавања.</string>
-
     <!-- Preference switch for Telemetry -->
     <string name="preferences_telemetry">Телеметрија</string>
     <!-- Preference switch for usage and technical data collection -->
@@ -454,6 +471,8 @@
     <string name="preferences_marketing_data">Маркетиншки подаци</string>
     <!-- Preference description for marketing data collection, parameter is the app name (e.g. Firefox) -->
     <string name="preferences_marketing_data_description">Дели податке о функцијама које користите у апликацији %1$s са Leanplum-ом, нашим провајдером мобилног маркетинга.</string>
+    <!-- Preference description for marketing data collection -->
+    <string name="preferences_marketing_data_description2">Подели податке о основном коришћењу са фирмом Adjust, нашим сарадником за маркетинг</string>
     <!-- Title for studies preferences -->
     <string name="preference_experiments_2">Студије</string>
     <!-- Summary for studies preferences -->
@@ -542,8 +561,6 @@
     <string name="library_new_tab">Нови језичак</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Пронађи на страници</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Синхронизовани језичци</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Списак за читање</string>
     <!-- Menu Item Label for Search in Library -->
@@ -588,6 +605,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">После једног месеца</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Покрени се на почетном екрану</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">После четири сата</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Увек</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Никада</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Затвори ручно</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -604,12 +630,16 @@
     <string name="tabs_header_private_title">Приватна сесија</string>
     <!-- Title for the list of tabs in the current private session -->
     <string name="tabs_header_private_tabs_title">Приватни језичци</string>
+    <!-- Title for the list of tabs in the synced tabs -->
+    <string name="tabs_header_synced_tabs_title">Синхронизовани језичци</string>
     <!-- Content description (not visible, for screen readers etc.): Add tab button. Adds a news tab when pressed -->
     <string name="add_tab">Додај језичак</string>
     <!-- Content description (not visible, for screen readers etc.): Add tab button. Adds a news tab when pressed -->
     <string name="add_private_tab">Додај приватни језичак</string>
     <!-- Text for the new tab button to indicate adding a new private tab in the tab -->
     <string name="tab_drawer_fab_content">Приватно</string>
+    <!-- Text for the new tab button to indicate syncing command on the synced tabs page -->
+    <string name="tab_drawer_fab_sync">Синхронизација</string>
     <!-- Text shown as the title of the open tab tray -->
     <string name="tab_tray_title">Отворени језичци</string>
     <!-- Text shown in the menu for saving tabs to a collection -->
@@ -620,6 +650,8 @@
     <string name="tab_tray_menu_item_share">Дели све језичке</string>
     <!-- Text shown in the menu to view recently closed tabs -->
     <string name="tab_tray_menu_recently_closed">Недавно затворени језичци</string>
+    <!-- Text shown in the menu to view account settings -->
+    <string name="tab_tray_menu_account_settings">Подешавања налога</string>
     <!-- Text shown in the menu to view tab settings -->
     <string name="tab_tray_menu_tab_settings">Подешавања језичака</string>
     <!-- Text shown in the menu for closing all tabs -->
@@ -789,8 +821,6 @@
     <string name="bookmark_delete_folder_snackbar">%1$s избрисано</string>
     <!-- Screen title for adding a bookmarks folder -->
     <string name="bookmark_add_folder">Додај фасциклу</string>
-    <!-- deprecated: Snackbar title shown after a bookmark has been created. -->
-    <string name="bookmark_created_snackbar">Забелешка је направљена.</string>
     <!-- Snackbar title shown after a bookmark has been created. -->
     <string name="bookmark_saved_snackbar">Забелешка је сачувана!</string>
     <!-- Snackbar edit button shown after a bookmark has been created. -->
@@ -975,6 +1005,8 @@
     <string name="share_link_all_apps_subheader">Све радње</string>
     <!-- Sub-header in the dialog to share a link to an app from the most-recent sorted list -->
     <string name="share_link_recent_apps_subheader">Недавно затворено</string>
+    <!-- An option from the three dot menu to into sync -->
+    <string name="sync_menu_sign_in">Синхронизација</string>
     <!-- An option from the share dialog to sign into sync -->
     <string name="sync_sign_in">Пријави се на Sync</string>
 
@@ -1167,9 +1199,6 @@
     <string name="onboarding_header">Добро дошли у апликацију %s!</string>
     <!-- text for the Firefox Accounts section header -->
     <string name="onboarding_fxa_section_header">Већ имате налог?</string>
-    <!-- text for the Firefox Preview feature section header
-    The first parameter is the name of the app (e.g. Firefox Preview) -->
-    <string name="onboarding_feature_section_header">Упознајте се са апликацијом %s</string>
     <!-- text for the "What's New" onboarding card header -->
     <string name="onboarding_whats_new_header1">Погледајте шта је ново</string>
 
@@ -1178,10 +1207,10 @@
     <string name="onboarding_whats_new_description">Имате питање о новом дизајну апликације %s? Желите ли да знате шта је промењено?</string>
     <!-- text for underlined clickable link that is part of "what's new" onboarding card description that links to an FAQ -->
     <string name="onboarding_whats_new_description_linktext">Овде потражите одговоре</string>
-    <!-- text for the Firefox account onboarding sign in card header -->
-    <string name="onboarding_account_sign_in_header">Почните са синхронизовањем забелешки, лозинки и других делова са вашим Firefox налогом.</string>
+    <!-- text for the Firefox account onboarding sign in card header. The word "Firefox" should not be translated -->
+    <string name="onboarding_account_sign_in_header_1">Синхронизујте Firefox на више уређаја</string>
     <!-- Text for the button to learn more about signing in to your Firefox account -->
-    <string name="onboarding_manual_sign_in_learn_more">Сазнајте више</string>
+    <string name="onboarding_manual_sign_in_description">Пребаците обележиваче, историју и лозинке у Firefox на овом уређају.</string>
     <!-- text for the firefox account onboarding card header when we detect you're already signed in to
         another Firefox browser. (The word `Firefox` should not be translated)
         The first parameter is the email of the detected user's account -->
@@ -1190,8 +1219,8 @@
     <string name="onboarding_firefox_account_auto_signin_confirm">Да, пријави ме</string>
     <!-- text for the automatic sign-in button while signing in is in process -->
     <string name="onboarding_firefox_account_signing_in">Пријава у току</string>
-    <!-- text for the button to manually sign into Firefox account. The word "Firefox" should not be translated -->
-    <string name="onboarding_firefox_account_sign_in">Пријава у Firefox</string>
+    <!-- text for the button to manually sign into Firefox account. -->
+    <string name="onboarding_firefox_account_sign_in_1">Пријави се</string>
     <!-- text for the button to stay signed out when presented with an option to automatically sign-in. -->
     <string name="onboarding_firefox_account_stay_signed_out">Остави ме пријављеног</string>
     <!-- text to display in the snackbar once account is signed-in -->
@@ -1200,26 +1229,23 @@
     <string name="onboarding_firefox_account_automatic_signin_failed">Неуспех при пријављивању</string>
 
     <!-- text for the tracking protection onboarding card header -->
-    <string name="onboarding_tracking_protection_header_2">Аутоматска приватност</string>
-    <!-- text for the tracking protection card description
-    The first parameter is the name of the app (e.g. Firefox Preview) -->
-    <string name="onboarding_tracking_protection_description_2">Подешавања приватности и безбедности блокирају трагаче, злонамерни софтвер и компаније које вас прате.</string>
+    <string name="onboarding_tracking_protection_header_3">Увек укључена приватност</string>
+    <!-- text for the tracking protection card description. 'Firefox' intentionally hardcoded here -->
+    <string name="onboarding_tracking_protection_description_3">Firefox самостално спречава тајно праћење на вебу.</string>
     <!-- text for tracking protection radio button option for standard level of blocking -->
     <string name="onboarding_tracking_protection_standard_button_2">Стандардно (подразумевано)</string>
     <!-- text for standard blocking option button description -->
-    <string name="onboarding_tracking_protection_standard_button_description_2">Блокира мање пратилаца. Странице ће се нормално учитавати.</string>
+    <string name="onboarding_tracking_protection_standard_button_description_3">Уравнотежена приватност и перформансе. Странице се учитавају уобичајено.</string>
     <!-- text for tracking protection radio button option for strict level of blocking -->
     <string name="onboarding_tracking_protection_strict_button">Строго (препоручено)</string>
     <!-- text for tracking protection radio button option for strict level of blocking -->
     <string name="onboarding_tracking_protection_strict_option">Строго</string>
     <!-- text for strict blocking option button description -->
-    <string name="onboarding_tracking_protection_strict_button_description_2">Блокира више пратилаца, огласа и скочних прозора. Странице се учитавају брже, али неке функције можда неће радити.</string>
-    <!-- text for the toolbar position card header
-        In English this is an idiom for "choose a side as in an argument or fight"
-        but it is ok to make this more literally about "choosing a position in a physical space -->
-    <string name="onboarding_toolbar_position_header">Одлучите се</string>
+    <string name="onboarding_tracking_protection_strict_button_description_3">Блокира више пратилаца те се странице учитавају брже али неке могућности на страници можда неће радити.</string>
+    <!-- text for the toolbar position card header  -->
+    <string name="onboarding_toolbar_placement_header_1">Изаберите положај алатнице</string>
     <!-- text for the toolbar position card description -->
-    <string name="onboarding_toolbar_position_description">Пробајте прегледати једном руком с доњом алатном траком или је померите према горе.</string>
+    <string name="onboarding_toolbar_placement_description_1">Постави алатницу на дохват руке. Било на дну или на врху.</string>
     <!-- text for the private browsing onboarding card header -->
     <string name="onboarding_private_browsing_header">Прегледајте приватно</string>
     <!-- text for the private browsing onboarding card description
@@ -1232,7 +1258,7 @@
     <!-- text for the privacy notice onboarding card header -->
     <string name="onboarding_privacy_notice_header">Ваша приватност</string>
     <!-- text for the privacy notice onboarding card description
-    The first parameter is the name of the app (e.g. Firefox Preview) -->
+    The first parameter is the name of the app (e.g. Firefox Preview) Substitute %s for long browser name. -->
     <string name="onboarding_privacy_notice_description2">Дизајнирали смо %s тако да имате пуну контролу над оним што делите на мрежи и са нама.</string>
     <!-- Text for the button to read the privacy notice -->
     <string name="onboarding_privacy_notice_read_button">Прочитајте наше обавештење о приватности</string>
@@ -1247,7 +1273,7 @@
     <!-- text for the theme picker onboarding card header -->
     <string name="onboarding_theme_picker_header">Изаберите вашу тему</string>
     <!-- text for the theme picker onboarding card description -->
-    <string name="onboarding_theme_picker_description1">Штедите батерију и сачувајте вид укључивањем тамног режима.</string>
+    <string name="onboarding_theme_picker_description_2">Сачувајте нешто батерије и ваш вид са тамном темом.</string>
     <!-- Automatic theme setting (will follow device setting) -->
     <string name="onboarding_theme_automatic_title">Самостално</string>
     <!-- Summary of automatic theme setting (will follow device setting) -->
@@ -1305,13 +1331,13 @@
     <!-- Preference for enhanced tracking protection for the standard protection settings -->
     <string name="preference_enhanced_tracking_protection_standard_default_1">Стандардно (подразумевано)</string>
     <!-- Preference description for enhanced tracking protection for the standard protection settings -->
-    <string name="preference_enhanced_tracking_protection_standard_description_3">Блокира мање пратилаца. Странице ће се нормално учитавати.</string>
+    <string name="preference_enhanced_tracking_protection_standard_description_4">Уравнотежена приватност и перформансе. Странице се учитавају уобичајено.</string>
     <!--  Accessibility text for the Standard protection information icon  -->
     <string name="preference_enhanced_tracking_protection_standard_info_button">Шта се блокира стандардном заштитом од праћења</string>
     <!-- Preference for enhanced tracking protection for the strict protection settings -->
     <string name="preference_enhanced_tracking_protection_strict">Строго</string>
     <!-- Preference description for enhanced tracking protection for the strict protection settings -->
-    <string name="preference_enhanced_tracking_protection_strict_description_2">Блокира више пратилаца, огласа и скочних прозора. Странице се учитавају брже, али неке функције можда неће радити.</string>
+    <string name="preference_enhanced_tracking_protection_strict_description_3">Блокира више пратилаца те се странице учитавају брже али неке могућности на страници можда неће радити.</string>
     <!--  Accessibility text for the Strict protection information icon  -->
     <string name="preference_enhanced_tracking_protection_strict_info_button">Шта се блокира строгом заштитом од праћења</string>
     <!-- Preference for enhanced tracking protection for the custom protection settings -->
@@ -1454,10 +1480,8 @@
     <string name="preferences_passwords_autofill">Самостално попуњавање</string>
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Синхронизуј пријаве</string>
-    <!-- Syncing saved logins in Fenix is on -->
-    <string name="preferences_passwords_sync_logins_on">Укључено</string>
-    <!-- Syncing saved logins in Fenix is off -->
-    <string name="preferences_passwords_sync_logins_off">Искључено</string>
+    <!-- Preference for syncing saved logins in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices">Усклади пријаве на свим уређајима</string>
     <!-- Syncing saved logins in Fenix needs reconnect to sync -->
     <string name="preferences_passwords_sync_logins_reconnect">Поново повежи</string>
     <!-- Syncing saved logins in Fenix needs login -->
@@ -1559,9 +1583,61 @@
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Подаци су шифровани</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Синхронизуј картице на уређајима</string>
+    <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
+    <string name="preferences_credit_cards_sync_cards">Синхронизуј картице</string>
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Додај кредитну картицу</string>
 
+    <!-- Preference option for managing saved credit cards -->
+    <string name="preferences_credit_cards_manage_saved_cards">Управљај сачуваним картицама</string>
+    <!-- Title of the "Add card" screen -->
+    <string name="credit_cards_add_card">Додај картицу</string>
+    <!-- Title of the "Edit card" screen -->
+    <string name="credit_cards_edit_card">Уреди картицу</string>
+    <!-- The header for the card number of a credit card -->
+    <string name="credit_cards_card_number">Број картице</string>
+    <!-- The header for the expiration date of a credit card -->
+    <string name="credit_cards_expiration_date">Датум истека</string>
+    <!-- The label for the expiration date month of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_month">Месец истека</string>
+    <!-- The label for the expiration date year of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_year">Година истека</string>
+    <!-- The header for the name on the credit card -->
+    <string name="credit_cards_name_on_card">Име на картици</string>
+    <!-- The header for the nickname for a credit card -->
+    <string name="credit_cards_card_nickname">Надимак картице</string>
+    <!-- The text for the "Delete card" menu item for deleting a credit card -->
+    <string name="credit_cards_menu_delete_card">Обриши картицу</string>
+    <!-- The text for the "Delete card" button for deleting a credit card -->
+    <string name="credit_cards_delete_card_button">Обриши картицу</string>
+    <!-- The title for the "Save" menu item for saving a credit card -->
+    <string name="credit_cards_menu_save">Сачувај</string>
+    <!-- The text for the "Save" button for saving a credit card -->
+    <string name="credit_cards_save_button">Сачувај</string>
+    <!-- The text for the "Cancel" button for cancelling adding or updating a credit card -->
+    <string name="credit_cards_cancel_button">Откажи</string>
+    <!-- Title of the "Saved cards" screen -->
+    <string name="credit_cards_saved_cards">Сачуване картице</string>
+    <!-- Error message for credit card number validation -->
+    <string name="credit_cards_number_validation_error_message">Унесите исправан број кредитне картице</string>
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Попуните ово поље</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Откључај за приказ сачуваних картица</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Обезбедите ваше кредитне картице</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Поставите шаблон закључавања уређаја, ПИН или лозинку да бисте заштитили ваше сачуване кредитне картице од неовлашћеног приступа.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Подеси сада</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Касније</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Откључајте ваш уређај</string>
+
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Откључај за употребу сачуваних кредитних картица</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Додај претраживач</string>
     <!-- Title of the Edit search engine screen -->
@@ -1721,23 +1797,19 @@
 	<!-- Dialog button text for canceling the rename top site prompt. -->
 	<string name="top_sites_rename_dialog_cancel">Откажи</string>
 
+    <!-- Default browser experiment -->
+    <string name="default_browser_experiment_card_text">Подешава самостално отварање адреса са страница, мејлова и порука унутар Firefox-a.</string>
+
     <!-- Content description for close button in collection placeholder. -->
     <string name="remove_home_collection_placeholder_content_description">Уклони</string>
 
-    <!-- Deprecated: text for the firefox account onboarding card header
-    The first parameter is the name of the app (e.g. Firefox Preview) -->
-    <string name="onboarding_firefox_account_header">Искористите %s у потпуности.</string>
-
     <!-- Content description radio buttons with a link to more information -->
     <string name="radio_preference_info_content_description">Кликните за више детаља</string>
 
-    <!-- Deprecated: No Open Tabs Message Header -->
-    <string name="no_collections_header1">Сакупљајте ствари које су вам важне</string>
-    <!-- Deprecated: Label to describe what collections are to a new user without any collections -->
-    <string name="no_collections_description1">Групишите сличне претраге, странице и језичке за брз приступ касније.</string>
-    <!-- Deprecated: text for the firefox account onboarding card header when we detect you're already signed in to -->
-    <string name="onboarding_firefox_account_auto_signin_header_2">Пријављени сте као %s у другом Firefox прегледачу, на овом телефону. Желите ли да се пријавите са тим налогом?</string>
-    <!-- Deprecated: Describes the add to homescreen functionality -->
-    <string name="add_to_homescreen_description">Ову страницу можете лако додати на почетни екран вашег телефона за тренутни приступ и брже прегледање.</string>
+    <!-- Content description for the action bar "up" button -->
+    <string name="action_bar_up_description">Иди нагоре</string>
+
+    <!-- Content description for privacy content close button -->
+    <string name="privacy_content_close_button_content_description">Затвори</string>
 
-    </resources>
+</resources>
diff --git a/app/src/main/res/values-su/strings.xml b/app/src/main/res/values-su/strings.xml
index 117a4f63d..323ba7947 100644
--- a/app/src/main/res/values-su/strings.xml
+++ b/app/src/main/res/values-su/strings.xml
@@ -90,13 +90,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Tutup</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Ngarobah perenah tab anu maruka. Buka setélan tur pilih grid handapeun témbongan tab.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Buka setélan</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Tutup</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Tab anyar</string>
@@ -182,6 +175,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Ropéa</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Layar tepas</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">Teu bisa nyambung. Skéma URL teu dipikawanoh.</string>
@@ -416,6 +413,11 @@
         and the third is the device model. -->
     <string name="default_device_name_2">%1$s dina %2$s %3$s</string>
 
+    <!-- Preference for syncing credit cards -->
+    <string name="preferences_sync_credit_cards">Kartu kiridit</string>
+    <!-- Preference for syncing addresses -->
+    <string name="preferences_sync_address">Alamat</string>
+
     <!-- Send Tab -->
     <!-- Name of the "receive tabs" notification channel. Displayed in the "App notifications" system settings for the app -->
     <string name="fxa_received_tab_channel_name">Tab nu katampa</string>
@@ -447,9 +449,6 @@
     <!-- Text displayed when there are no exceptions, with learn more link that brings users to a tracking protection SUMO page -->
     <string name="exceptions_empty_message_learn_more_link">Lenyepan</string>
 
-    <!-- Description in Quick Settings that tells user tracking protection is off globally for all sites, and links to Settings to turn it on -->
-    <string name="preferences_tracking_protection_turned_off_globally">Dipareuman sacara global, buka Setélan pikeun ngahurungkeun.</string>
-
     <!-- Preference switch for Telemetry -->
     <string name="preferences_telemetry">Telemétri</string>
     <!-- Preference switch for usage and technical data collection -->
@@ -460,6 +459,8 @@
     <string name="preferences_marketing_data">Data pamasaran</string>
     <!-- Preference description for marketing data collection, parameter is the app name (e.g. Firefox) -->
     <string name="preferences_marketing_data_description">Bagikeun data ngeunaan fitur naon baé anu dipaké di %1$s ka Leanplum, péndor pamasaran ider kami.</string>
+    <!-- Preference description for marketing data collection -->
+    <string name="preferences_marketing_data_description2">Bagikeun data pamakéan dasar ka Adjust, péndor pamasaran ider kami</string>
     <!-- Title for studies preferences -->
     <string name="preference_experiments_2">Studi</string>
     <!-- Summary for studies preferences -->
@@ -547,8 +548,6 @@
     <string name="library_new_tab">Tab anyar</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Téangan dina kaca</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Tab singkron</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Daptar Bacaeun</string>
     <!-- Menu Item Label for Search in Library -->
@@ -594,6 +593,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Sanggeus sabulan</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Mimitian di tepas</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">Sanggeus opat jam</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Matuh</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Ulah</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Tutup manual</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -800,8 +808,6 @@
     <string name="bookmark_delete_folder_snackbar">Mupus %1$s</string>
     <!-- Screen title for adding a bookmarks folder -->
     <string name="bookmark_add_folder">Tambah map</string>
-    <!-- deprecated: Snackbar title shown after a bookmark has been created. -->
-    <string name="bookmark_created_snackbar">Markah dijieun.</string>
     <!-- Snackbar title shown after a bookmark has been created. -->
     <string name="bookmark_saved_snackbar">Markah diteundeun!</string>
     <!-- Snackbar edit button shown after a bookmark has been created. -->
@@ -1466,10 +1472,8 @@
     <string name="preferences_passwords_autofill">Eusi otomatis</string>
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Singkronkeun login</string>
-    <!-- Syncing saved logins in Fenix is on -->
-    <string name="preferences_passwords_sync_logins_on">Hurung</string>
-    <!-- Syncing saved logins in Fenix is off -->
-    <string name="preferences_passwords_sync_logins_off">Pareum</string>
+    <!-- Preference for syncing saved logins in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices">Singkronkeun login di sakabéh parabot</string>
     <!-- Syncing saved logins in Fenix needs reconnect to sync -->
     <string name="preferences_passwords_sync_logins_reconnect">Sambungkeun deui</string>
     <!-- Syncing saved logins in Fenix needs login -->
@@ -1570,6 +1574,8 @@
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Data diénkrip</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Singkronkeun kartu di sakabeh parabot</string>
+    <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
+    <string name="preferences_credit_cards_sync_cards">Singkronkeun kartu</string>
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Tambah kartu kiridit</string>
 
@@ -1583,6 +1589,10 @@
     <string name="credit_cards_card_number">Nomer Kartu</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">Tanggal Kadaluarsa</string>
+    <!-- The label for the expiration date month of a credit card -->
+    <string name="credit_cards_expiration_date_month">Bulan Kadaluwarsa</string>
+    <!-- The label for the expiration date year of a credit card -->
+    <string name="credit_cards_expiration_date_year">Taun Kadaluwarsa</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">Ngaran dina Kartu</string>
     <!-- The header for the nickname for a credit card -->
@@ -1600,6 +1610,25 @@
     <!-- Title of the "Saved cards" screen -->
     <string name="credit_cards_saved_cards">Kartu disimpen</string>
 
+    <!-- Error message for credit card number validation -->
+    <string name="credit_cards_number_validation_error_message">Mangga lebetkeun nomer kartu kiridit anu sah</string>
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Mangga eusian kolom ieu</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Buka konci pikeun nempo kartu anu diteundeun</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Amankeun kartu kiridit anjeun</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Jieun pola konci paranti, PIN, atawa kecap sandi pikeun ngajaga kartu kiridit anu diteundeun bisi paranti anjeun dipaké batur.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Setél ayeuna</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Engké deui</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Buka konci paranti anjeun</string>
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Buka konci pikeun nganggo inpormasi kartu kiridit anu disimpen</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Tambah mesin pamaluruh</string>
     <!-- Title of the Edit search engine screen -->
@@ -1767,20 +1796,13 @@
     <!-- Content description for close button in collection placeholder. -->
     <string name="remove_home_collection_placeholder_content_description">Piceun</string>
 
-    <!-- Deprecated: text for the firefox account onboarding card header
-    The first parameter is the name of the app (e.g. Firefox Preview) -->
-    <string name="onboarding_firefox_account_header">Maksimalkeun %s.</string>
-
     <!-- Content description radio buttons with a link to more information -->
     <string name="radio_preference_info_content_description">Pencét sangkan leuwih écés</string>
 
-    <!-- Deprecated: No Open Tabs Message Header -->
-    <string name="no_collections_header1">Kumpulkeun hal anu penting pikeun anjeun</string>
-    <!-- Deprecated: Label to describe what collections are to a new user without any collections -->
-    <string name="no_collections_description1">Ngagabungkeun pamaluruhan, loka sareng tab anu sami pikeun aksés gancang engké.</string>
-    <!-- Deprecated: text for the firefox account onboarding card header when we detect you're already signed in to -->
-    <string name="onboarding_firefox_account_auto_signin_header_2">Anjeun asup salaku %s dina séjén panyungsi Firefox di ieu telepon. Anjeun rék asup maké ieu akun?</string>
-    <!-- Deprecated: Describes the add to homescreen functionality -->
-    <string name="add_to_homescreen_description">Anjeun bisa kalawan gampang nambahkeun ieu raramatloka kana layar Tepas ponsél pikeun aksés instan sarta maluruh leuwih gancang kawas muka aplikasi.</string>
+    <!-- Content description for the action bar "up" button -->
+    <string name="action_bar_up_description">Pindah ka luhur</string>
+
+    <!-- Content description for privacy content close button -->
+    <string name="privacy_content_close_button_content_description">Tutup</string>
 
-    </resources>
+</resources>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index f18b8ba38..7b79187f4 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -5,6 +5,7 @@
     <string name="app_name_private_5">Privat %s</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (Privat)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">Fler alternativ</string>
@@ -48,6 +49,16 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">Markerad</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">Nyligen sparade</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">Nyligen sparade bokmärken</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">Visa alla</string>
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">Visa knappen alla sparade bokmärken</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s produceras av Mozilla.</string>
 
@@ -95,13 +106,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Ignorera</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Ändra layouten för öppna flikar. Gå till inställningar och välj rutnät under flikvy.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Gå till Inställningar</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Ignorera</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Ny flik</string>
@@ -111,6 +115,12 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">Mest besökta</string>
 
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">Hoppa tillbaka</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">Visa alla</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">Öppna flikar</string>
@@ -188,6 +198,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Redigera</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Startsidan</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">Kan inte ansluta. Oigenkännligt URL-schema.</string>
@@ -555,8 +569,6 @@
     <string name="library_new_tab">Ny flik</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Hitta på sidan</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Synkade flikar</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Läslista</string>
     <!-- Menu Item Label for Search in Library -->
@@ -602,6 +614,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Efter en månad</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Börja på startsidan</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">Efter fyra timmar</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Alltid</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Aldrig</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Stäng manuellt</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -1587,6 +1608,10 @@
     <string name="credit_cards_card_number">Kortnummer</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">Utgångsdatum</string>
+    <!-- The label for the expiration date month of a credit card -->
+    <string name="credit_cards_expiration_date_month">Utgångsdatum månad</string>
+    <!-- The label for the expiration date year of a credit card -->
+    <string name="credit_cards_expiration_date_year">Utgångsdatum år</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">Namn på kort</string>
     <!-- The header for the nickname for a credit card -->
@@ -1608,6 +1633,24 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Ange ett giltigt kreditkortsnummer</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Fyll i det här fältet</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Lås upp för att se dina sparade kreditkort</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Säkra dina kreditkort</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Konfigurera enhetens låsmönster, PIN eller lösenord för att skydda dina sparade kreditkort från åtkomst om någon annan har din enhet.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Konfigurera nu</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Senare</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Lås upp din enhet</string>
+
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Lås upp för att använda lagrad kreditkortsinformation</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Lägg till sökmotor</string>
     <!-- Title of the Edit search engine screen -->
diff --git a/app/src/main/res/values-szl/strings.xml b/app/src/main/res/values-szl/strings.xml
index 2b53bb194..158e06588 100644
--- a/app/src/main/res/values-szl/strings.xml
+++ b/app/src/main/res/values-szl/strings.xml
@@ -347,4 +347,105 @@
     <string name="preferences_open_links_in_apps">Ôtwiyrej linki w aplikacyjach</string>
 
 
+    <!-- Preference for open download with an external download manager app -->
+    <string name="preferences_external_download_manager">Zewnyntrzny menedżer pobiyranio</string>
+    <!-- Preference for add_ons -->
+    <string name="preferences_addons">Rozszyrzynia</string>
+    <!-- Preference for notifications -->
+    <string name="preferences_notifications">Powiadōmiynia</string>
+
+    <!-- Add-on Preferences -->
+    <!-- Preference to customize the configured AMO (addons.mozilla.org) collection -->
+    <string name="preferences_customize_amo_collection">Włosno kolekcyjo rozszyrzyń</string>
+    <!-- Button caption to confirm the add-on collection configuration -->
+    <string name="customize_addon_collection_ok">OK</string>
+    <!-- Button caption to abort the add-on collection configuration -->
+    <string name="customize_addon_collection_cancel">Pociep</string>
+    <!-- Hint displayed on input field for custom collection name -->
+    <string name="customize_addon_collection_hint">Miano kolekcyje</string>
+    <!-- Hint displayed on input field for custom collection user ID-->
+    <string name="customize_addon_collection_user_hint">Posiedziciel kolekcyje (ID ôd używocza)</string>
+
+
+    <!-- Toast shown after confirming the custom add-on collection configuration -->
+    <string name="toast_customize_addon_collection_done">Kolekcyjo rozszyrzyń je zmiyniōno. Wyłōnczynie aplikacyji, coby przidać zmiany…</string>
+
+    <!-- Add-on Installation from AMO-->
+    <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
+    <string name="addon_not_supported_error">Rozszyrzynie niy ma ôbsugowane</string>
+    <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
+    <string name="addon_already_installed">Rozszyrzynie je już zainstalowane</string>
+
+    <!-- Account Preferences -->
+    <!-- Preference for triggering sync -->
+    <string name="preferences_sync_now">Synchrōnizuj teroz</string>
+    <!-- Preference category for sync -->
+    <string name="preferences_sync_category">Ôbier, co synchrōnizować</string>
+    <!-- Preference for syncing history -->
+    <string name="preferences_sync_history">Historyjo</string>
+    <!-- Preference for syncing bookmarks -->
+    <string name="preferences_sync_bookmarks">Zokłodki</string>
+    <!-- Preference for syncing logins -->
+    <string name="preferences_sync_logins">Dane logowanio</string>
+    <!-- Preference for syncing tabs -->
+    <string name="preferences_sync_tabs_2">Ôtwarte karty</string>
+    <!-- Preference for signing out -->
+    <string name="preferences_sign_out">Wyloguj</string>
+    <!-- Preference displays and allows changing current FxA device name -->
+    <string name="preferences_sync_device_name">Miano masziny</string>
+    <!-- Text shown when user enters empty device name -->
+    <string name="empty_device_name_error">Miano masziny niy śmiy być prōżne.</string>
+    <!-- Label indicating that sync is in progress -->
+    <string name="sync_syncing_in_progress">Synchrōnizacyjo…</string>
+    <!-- Label summary indicating that sync failed. The first parameter is the date stamp showing last time it succeeded -->
+    <string name="sync_failed_summary">Synchronizacyjo sie niy podarziła. Ôstatnio udano: %s</string>
+    <!-- Label summary showing never synced -->
+    <string name="sync_failed_never_synced_summary">Synchronizacyjo sie niy podarziła. Ôstatnio udano: żodno</string>
+    <!-- Label summary the date we last synced. The first parameter is date stamp showing last time synced -->
+    <string name="sync_last_synced_summary">Ôstatnio synchrōnizacyjo: %s</string>
+    <!-- Label summary showing never synced -->
+    <string name="sync_never_synced_summary">Ôstatnio synchrōnizacyjo: żodno</string>
+    <!-- Text for displaying the default device name.
+        The first parameter is the application name, the second is the device manufacturer name
+        and the third is the device model. -->
+    <string name="default_device_name_2">%1$s na %2$s %3$s</string>
+    <!-- Preference for syncing credit cards -->
+    <string name="preferences_sync_credit_cards">Kredytowe karty</string>
+    <!-- Preference for syncing addresses -->
+    <string name="preferences_sync_address">Adresy</string>
+
+    <!-- Send Tab -->
+    <!-- Name of the "receive tabs" notification channel. Displayed in the "App notifications" system settings for the app -->
+    <string name="fxa_received_tab_channel_name">Przijynte karty</string>
+    <!-- Description of the "receive tabs" notification channel. Displayed in the "App notifications" system settings for the app -->
+    <string name="fxa_received_tab_channel_description">Powiadōmiynia ô kartach przijyntych z inkszych maszin z aplikacyjōm Firefox.</string>
+    <!--  The body for these is the URL of the tab received  -->
+    <string name="fxa_tab_received_notification_name">Karta je przijynto</string>
+    <!-- When multiple tabs have been received -->
+    <string name="fxa_tabs_received_notification_name">Karty sōm przijynte</string>
+    <!-- %s is the device name -->
+    <string name="fxa_tab_received_from_notification_name">Karty ze %s</string>
+
+    <!-- Advanced Preferences -->
+    <!-- Preference for tracking protection settings -->
+    <string name="preferences_tracking_protection_settings">Ôchrōna ôd śledzynio</string>
+    <!-- Preference switch for tracking protection -->
+    <string name="preferences_tracking_protection">Ôchrōna ôd śledzynio</string>
+    <!-- Preference switch description for tracking protection -->
+    <string name="preferences_tracking_protection_description">Szperuj zawartość i skrypty, co cie śledzōm w necu</string>
+    <!-- Preference for tracking protection exceptions -->
+    <string name="preferences_tracking_protection_exceptions">Wyjōntki</string>
+    <!-- Preference description for tracking protection exceptions -->
+    <string name="preferences_tracking_protection_exceptions_description">Na tych strōnach ôchrōna ôd śledzynio je wyłōnczōno</string>
+    <!-- Button in Exceptions Preference to turn on tracking protection for all sites (remove all exceptions) -->
+    <string name="preferences_tracking_protection_exceptions_turn_on_for_all">Załōncz do wszyskich strōn</string>
+    <!-- Text displayed when there are no exceptions -->
+    <string name="exceptions_empty_message_description">Z wyjōntkami możesz zastawić ôchrōna ôd śledzynio na ôbranych strōnach.</string>
+    <!-- Text displayed when there are no exceptions, with learn more link that brings users to a tracking protection SUMO page -->
+    <string name="exceptions_empty_message_learn_more_link">Przewiydz sie wiyncyj</string>
+
+    <!-- Preference switch for Telemetry -->
+    <string name="preferences_telemetry">Telemetryjo</string>
+
+
     </resources>
diff --git a/app/src/main/res/values-tg/strings.xml b/app/src/main/res/values-tg/strings.xml
index a245a087f..380a40cae 100644
--- a/app/src/main/res/values-tg/strings.xml
+++ b/app/src/main/res/values-tg/strings.xml
@@ -94,13 +94,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Нодида гузарондан</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Тарҳбандиро барои варақаҳои кушодашуда иваз намоед. Ба танзимот гузаред ва дар зери намоиши варақаҳо панҷараро интихоб намоед.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Гузариш ба танзимот</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Нодида гузарондан</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Варақаи нав</string>
@@ -184,6 +177,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Таҳрир кардан</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Экрани асосӣ</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">Пайваст нашуд. Нақшаи URL шинохтанашаванда аст.</string>
@@ -543,8 +540,6 @@
     <string name="library_new_tab">Варақаи нав</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Ҷустуҷӯ дар саҳифа</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Варақаҳои ҳамоҳангшуда</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Рӯйхати хониш</string>
     <!-- Menu Item Label for Search in Library -->
@@ -590,6 +585,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Пас аз як моҳ</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Оғоз дар экрани асосӣ</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">Пас аз чор соат</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Ҳамеша</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Ҳеҷ гоҳ</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Ба таври дастӣ пӯшидан</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -1572,6 +1576,10 @@
     <string name="credit_cards_card_number">Рақами корт</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">Санаи анҷоми муҳлат</string>
+    <!-- The label for the expiration date month of a credit card -->
+    <string name="credit_cards_expiration_date_month">Моҳи санаи анҷоми муҳлат</string>
+    <!-- The label for the expiration date year of a credit card -->
+    <string name="credit_cards_expiration_date_year">Соли санаи анҷоми муҳлат</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">Ном дар корт</string>
     <!-- The header for the nickname for a credit card -->
@@ -1594,6 +1602,23 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Лутфан, рақами корти кредитии дурустро ворид намоед</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Лутфан, ин майдонро пур кунед</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Барои дидани кортҳои нигоҳдошташуда, қулфро кушоед</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Кортҳои кредитии худро муҳофизат кунед</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Барои муҳофизат кардани кортҳои кредитии нигоҳдошташудаи худ аз дастрасии озод, агар касе дигар аз дастгоҳи шумо истифода барад, шаклвораи қулфи экран, рамзи PIN ё ниҳонвожаеро барои дастгоҳи худ танзим намоед.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Ҳозир насб кунед</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Дертар</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Қулфи дастгоҳи худро кушоед</string>
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Барои истифодаи маълумоти кортҳои кредитии нигоҳдошташуда, қулфро кушоед</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Илова кардани низоми ҷустуҷӯӣ</string>
     <!-- Title of the Edit search engine screen -->
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 2ee95d0d1..07cdb2268 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_name_private_5">%s ส่วนตัว</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (ส่วนตัว)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">ตัวเลือกเพิ่มเติม</string>
@@ -47,6 +48,12 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">เลือกแล้ว</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">บันทึกไว้ล่าสุด</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">แสดงหมด</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s ผลิตขึ้นโดย Mozilla</string>
 
@@ -91,13 +98,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">ยกเลิก</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">เปลี่ยนเค้าโครงของแท็บที่เปิดอยู่ ไปยังการตั้งค่าแล้วเลือกเส้นตารางภายใต้มุมมองแท็บ</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">ไปยังการตั้งค่า</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">ปิด</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">แท็บใหม่</string>
@@ -107,6 +107,12 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">ไซต์เด่น</string>
 
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">กลับเข้าไป</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">แสดงหมด</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">แท็บที่เปิดอยู่</string>
@@ -182,6 +188,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">แก้ไข</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">หน้าแรก</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">ไม่สามารถเชื่อมต่อได้เนื่องจากเป็นรูปแบบ URL ที่ไม่รู้จัก</string>
@@ -412,6 +422,11 @@
         and the third is the device model. -->
     <string name="default_device_name_2">%1$s บน %2$s %3$s</string>
 
+    <!-- Preference for syncing credit cards -->
+    <string name="preferences_sync_credit_cards">บัตรเครดิต</string>
+    <!-- Preference for syncing addresses -->
+    <string name="preferences_sync_address">ที่อยู่</string>
+
     <!-- Send Tab -->
     <!-- Name of the "receive tabs" notification channel. Displayed in the "App notifications" system settings for the app -->
     <string name="fxa_received_tab_channel_name">แท็บที่ได้รับ</string>
@@ -443,9 +458,6 @@
     <!-- Text displayed when there are no exceptions, with learn more link that brings users to a tracking protection SUMO page -->
     <string name="exceptions_empty_message_learn_more_link">เรียนรู้เพิ่มเติม</string>
 
-    <!-- Description in Quick Settings that tells user tracking protection is off globally for all sites, and links to Settings to turn it on -->
-    <string name="preferences_tracking_protection_turned_off_globally">ปิดใช้งานสำหรับทุกไซต์แล้ว ให้ไปที่การตั้งค่าเพื่อเปิด</string>
-
     <!-- Preference switch for Telemetry -->
     <string name="preferences_telemetry">การวัดและส่งข้อมูลทางไกล</string>
     <!-- Preference switch for usage and technical data collection -->
@@ -456,6 +468,8 @@
     <string name="preferences_marketing_data">ข้อมูลการตลาด</string>
     <!-- Preference description for marketing data collection, parameter is the app name (e.g. Firefox) -->
     <string name="preferences_marketing_data_description">แบ่งปันข้อมูลเกี่ยวกับคุณลักษณะที่คุณใช้ใน %1$s กับ Leanplum ผู้ให้บริการการตลาดมือถือของเรา</string>
+    <!-- Preference description for marketing data collection -->
+    <string name="preferences_marketing_data_description2">แบ่งปันข้อมูลการใช้งานพื้นฐานกับ Adjust ผู้จำหน่ายการตลาดมือถือของเรา</string>
     <!-- Title for studies preferences -->
     <string name="preference_experiments_2">การศึกษา</string>
     <!-- Summary for studies preferences -->
@@ -540,8 +554,6 @@
     <string name="library_new_tab">แท็บใหม่</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">ค้นหาในหน้า</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">แท็บที่ซิงค์</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">รายการอ่าน</string>
     <!-- Menu Item Label for Search in Library -->
@@ -586,6 +598,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">หลังจากผ่านไปหนึ่งเดือน</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">เริ่มที่หน้าแรก</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">หลังจาก 4 ชั่วโมง</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">ทุกครั้ง</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">ไม่เลย</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">ปิดด้วยตนเอง</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -794,8 +815,6 @@
     <string name="bookmark_delete_folder_snackbar">ลบ %1$s แล้ว</string>
     <!-- Screen title for adding a bookmarks folder -->
     <string name="bookmark_add_folder">เพิ่มโฟลเดอร์</string>
-    <!-- deprecated: Snackbar title shown after a bookmark has been created. -->
-    <string name="bookmark_created_snackbar">สร้างที่คั่นหน้าแล้ว</string>
     <!-- Snackbar title shown after a bookmark has been created. -->
     <string name="bookmark_saved_snackbar">บันทึกที่คั่นหน้าแล้ว!</string>
     <!-- Snackbar edit button shown after a bookmark has been created. -->
@@ -1448,10 +1467,8 @@
     <string name="preferences_passwords_autofill">การเติมอัตโนมัติ</string>
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">ซิงค์การเข้าสู่ระบบ</string>
-    <!-- Syncing saved logins in Fenix is on -->
-    <string name="preferences_passwords_sync_logins_on">เปิด</string>
-    <!-- Syncing saved logins in Fenix is off -->
-    <string name="preferences_passwords_sync_logins_off">ปิด</string>
+    <!-- Preference for syncing saved logins in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices">ซิงค์การเข้าสู่ระบบระหว่างอุปกรณ์</string>
     <!-- Syncing saved logins in Fenix needs reconnect to sync -->
     <string name="preferences_passwords_sync_logins_reconnect">เชื่อมต่อใหม่</string>
     <!-- Syncing saved logins in Fenix needs login -->
@@ -1552,6 +1569,8 @@
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">ข้อมูลถูกเข้ารหัส</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">ซิงค์บัตรระหว่างอุปกรณ์</string>
+    <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
+    <string name="preferences_credit_cards_sync_cards">ซิงค์บัตร</string>
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">เพิ่มบัตรเครดิต</string>
 
@@ -1565,6 +1584,10 @@
     <string name="credit_cards_card_number">หมายเลขบัตร</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">วันหมดอายุ</string>
+    <!-- The label for the expiration date month of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_month">เดือนหมดอายุ</string>
+    <!-- The label for the expiration date year of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_year">ปีหมดอายุ</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">ชื่อบนบัตร</string>
     <!-- The header for the nickname for a credit card -->
@@ -1583,6 +1606,25 @@
     <!-- Title of the "Saved cards" screen -->
     <string name="credit_cards_saved_cards">บัตรที่บันทึกไว้</string>
 
+    <!-- Error message for credit card number validation -->
+    <string name="credit_cards_number_validation_error_message">โปรดป้อนหมายเลขบัตรเครดิตที่ถูกต้อง</string>
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">โปรดกรอกช่องนี้</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">ปลดล็อกเพื่อดูบัตรเครดิตที่บันทึกไว้ของคุณ</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">รักษาความปลอดภัยให้กับบัตรเครดิตของคุณ</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">ตั้งค่ารูปแบบการล็อกอุปกรณ์, PIN, หรือรหัสผ่านเพื่อปกป้องไม่ให้ใครเข้าถึงบัตรเครดิตที่บันทึกไว้ของคุณหากคนอื่นมีอุปกรณ์ของคุณ</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">ตั้งค่าตอนนี้</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">ภายหลัง</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">ปลดล็อกอุปกรณ์ของคุณ</string>
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">ปลดล็อกเพื่อใช้ข้อมูลบัตรเครดิตที่เก็บไว้</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">เพิ่มเครื่องมือค้นหา</string>
     <!-- Title of the Edit search engine screen -->
@@ -1748,20 +1790,13 @@
     <!-- Content description for close button in collection placeholder. -->
     <string name="remove_home_collection_placeholder_content_description">ลบ</string>
 
-    <!-- Deprecated: text for the firefox account onboarding card header
-    The first parameter is the name of the app (e.g. Firefox Preview) -->
-    <string name="onboarding_firefox_account_header">รับประโยชน์สูงสุดจาก %s</string>
-
     <!-- Content description radio buttons with a link to more information -->
     <string name="radio_preference_info_content_description">คลิกเพื่อดูรายละเอียดเพิ่มเติม</string>
 
-    <!-- Deprecated: No Open Tabs Message Header -->
-    <string name="no_collections_header1">รวบรวมสิ่งที่สำคัญสำหรับคุณ</string>
-    <!-- Deprecated: Label to describe what collections are to a new user without any collections -->
-    <string name="no_collections_description1">จัดกลุ่มการค้นหา ไซต์ และแท็บที่คล้ายกันเพื่อการเข้าถึงอย่างรวดเร็วในภายหลัง</string>
-    <!-- Deprecated: text for the firefox account onboarding card header when we detect you're already signed in to -->
-    <string name="onboarding_firefox_account_auto_signin_header_2">คุณลงชื่อเข้าในชื่อ %s บนเบราว์เซอร์ Firefox อื่นบนโทรศัพท์นี้ คุณต้องการลงชื่อเข้าด้วยบัญชีนี้หรือไม่?</string>
-    <!-- Deprecated: Describes the add to homescreen functionality -->
-    <string name="add_to_homescreen_description">คุณสามารถเพิ่มเว็บไซต์นี้ลงในหน้าจอหลักของโทรศัพท์ของคุณเพื่อเข้าถึงและเรียกดูได้เร็วขึ้นด้วยประสบการณ์ที่เหมือนแอป</string>
+    <!-- Content description for the action bar "up" button -->
+    <string name="action_bar_up_description">นำทางขึ้นไปด้านบน</string>
+
+    <!-- Content description for privacy content close button -->
+    <string name="privacy_content_close_button_content_description">ปิด</string>
 
-    </resources>
+</resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 46a0a1cfc..068e45729 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -5,6 +5,7 @@
     <string name="app_name_private_5">Gizli %s</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (Gizli)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">Daha fazla seçenek</string>
@@ -48,6 +49,16 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">Seçildi</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">Son kaydedilenler</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">Son kaydedilen yer imleri</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">Tümünü göster</string>
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">Tüm kayıtlı yer imleri düğmesini göster</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s bir Mozilla ürünüdür.</string>
 
@@ -93,13 +104,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Kapat</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Açık sekmelerin görünümünü değiştirebilirsiniz. Ayarlara gidip “sekme görünümü” altından “ızgara”yı seçin.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Ayarlara git</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Kapat</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Yeni sekme</string>
@@ -109,6 +113,12 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">Sık kullanılanlar</string>
 
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">Açık sekmeler</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">Tümünü göster</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">Açık sekmeler</string>
@@ -178,12 +188,16 @@
     <string name="browser_menu_read_appearance">Görünüm</string>
 
     <!-- Browser menu button to show reader view appearance controls e.g. the used font type and size -->
-    <string name="browser_menu_customize_reader_view">Okuyucu görünümünü özelleştir</string>
+    <string name="browser_menu_customize_reader_view">Okuyucuyu özelleştir</string>
     <!-- Browser menu label for adding a bookmark -->
     <string name="browser_menu_add">Ekle</string>
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Düzenle</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Ana ekran</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">Bağlanılamıyor. Tanınmayan URL şeması.</string>
@@ -547,8 +561,6 @@
     <string name="library_new_tab">Yeni sekme</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Sayfada bul</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Eşitlenmiş sekmeler</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Okuma listesi</string>
     <!-- Menu Item Label for Search in Library -->
@@ -593,6 +605,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Bir ay sonra</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Ana ekrandan başla</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">Dört saat sonra</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Her zaman</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Asla</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Elle kapat</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -1570,6 +1591,10 @@
     <string name="credit_cards_card_number">Kart numarası</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">Son kullanma tarihi</string>
+    <!-- The label for the expiration date month of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_month">Son kullanma tarihi - Ay</string>
+    <!-- The label for the expiration date year of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_year">Son kullanma tarihi - Yıl</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">Kart üzerindeki ad</string>
     <!-- The header for the nickname for a credit card -->
@@ -1591,6 +1616,24 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Lütfen geçerli bir kredi kartı numarası girin</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Lütfen bu alanı doldurun</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Kayıtlı kartlarınızı görmek için kilidi açın</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Kredi kartlarını güvence altına al</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Cihazınız başka birinin eline geçerse kayıtlı kartlarınıza erişilmesini önlemek için cihaz kilidi deseni, PIN veya parola ayarlayın.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Hemen ayarla</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Daha sonra</string>
+
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Cihazınızın kilidini açın</string>
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Depolanan kredi kartı bilgilerini kullanmak için kilidi açın</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Arama motoru ekle</string>
     <!-- Title of the Edit search engine screen -->
diff --git a/app/src/main/res/values-tt/strings.xml b/app/src/main/res/values-tt/strings.xml
index 790303dce..cc3146b64 100644
--- a/app/src/main/res/values-tt/strings.xml
+++ b/app/src/main/res/values-tt/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_name_private_5">Хосусый %s</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (Хосусый)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">Күбрәк опцияләр</string>
@@ -81,11 +82,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Яшерү</string>
 
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Көйләүләргә күчү</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Яшерү</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Яңа таб</string>
@@ -170,6 +166,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Үзгәртү</string>
 
+    <!-- Error message to show when the user tries to access a scheme not
+        handled by the app (Ex: blob, tel etc) -->
+    <string name="unknown_scheme_error_message">Тоташып булмады. Танылмаган URL схемасы.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Сайланган тел </string>
@@ -202,6 +202,9 @@
     <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
     <string name="search_engine_suggestions_title">%s ярдәмендә эзләү</string>
 
+    <!-- Search engine suggestion description text -->
+    <string name="search_engine_suggestions_description">Адрес юлыннан турыдан-туры эзләү</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
     <string name="search_widget_content_description">Яңа Firefox табын ачу</string>
@@ -288,6 +291,8 @@
     <string name="preferences_sign_in_description">Кыстыргычларны, тарихны һәм башкаларны Firefox Хисабыгыз белән синхронлау</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
     <string name="preferences_account_default_name">Firefox хисап язмасы</string>
+    <!-- Preference text for account title when there was an error syncing FxA -->
+    <string name="preferences_account_sync_error">Синхронлауны дәвам итү өчен яңадан тоташыгыз</string>
     <!-- Preference for language -->
     <string name="preferences_language">Тел</string>
 
@@ -371,6 +376,10 @@
     <string name="empty_device_name_error">Җиһаз исеме буш була алмый.</string>
     <!-- Label indicating that sync is in progress -->
     <string name="sync_syncing_in_progress">Синхронлау...</string>
+    <!-- Label summary indicating that sync failed. The first parameter is the date stamp showing last time it succeeded -->
+    <string name="sync_failed_summary">Синхронлау барып чыкмады. Соңгы синхронлау: %s</string>
+    <!-- Label summary showing never synced -->
+    <string name="sync_failed_never_synced_summary">Синхронлау барып чыкмады. Соңгы синхронлау: һичкайчан</string>
     <!-- Label summary the date we last synced. The first parameter is date stamp showing last time synced -->
     <string name="sync_last_synced_summary">Соңгы синхронлау: %s</string>
     <!-- Label summary showing never synced -->
@@ -383,18 +392,27 @@
     <!-- Send Tab -->
     <!-- Name of the "receive tabs" notification channel. Displayed in the "App notifications" system settings for the app -->
     <string name="fxa_received_tab_channel_name">Башка җиһаздагы таблар</string>
+    <!-- Description of the "receive tabs" notification channel. Displayed in the "App notifications" system settings for the app -->
+    <string name="fxa_received_tab_channel_description">Башка Firefox җиһазларыннан алынган таблар өчен искәртүләр.</string>
     <!--  The body for these is the URL of the tab received  -->
     <string name="fxa_tab_received_notification_name">Таб кабул ителде</string>
     <!-- When multiple tabs have been received -->
     <string name="fxa_tabs_received_notification_name">Таблар кабул ителде</string>
 
+    <!-- %s is the device name -->
+    <string name="fxa_tab_received_from_notification_name">%s җиһазыннан таб</string>
+
     <!-- Advanced Preferences -->
     <!-- Preference for tracking protection settings -->
     <string name="preferences_tracking_protection_settings">Күзәтелүдән саклау</string>
     <!-- Preference switch for tracking protection -->
     <string name="preferences_tracking_protection">Күзәтелүдән саклау</string>
+    <!-- Preference switch description for tracking protection -->
+    <string name="preferences_tracking_protection_description">Интернетта Сезне күзәтүче эчтәлек һәм скриптларны блоклау</string>
     <!-- Preference for tracking protection exceptions -->
     <string name="preferences_tracking_protection_exceptions">Чыгармалар</string>
+    <!-- Preference description for tracking protection exceptions -->
+    <string name="preferences_tracking_protection_exceptions_description">Күзәтелүдән саклау бу сайтлар өчен cүнгән</string>
     <!-- Button in Exceptions Preference to turn on tracking protection for all sites (remove all exceptions) -->
     <string name="preferences_tracking_protection_exceptions_turn_on_for_all">Барлык сайтлар өчен дә кабызу</string>
     <!-- Text displayed when there are no exceptions, with learn more link that brings users to a tracking protection SUMO page -->
@@ -402,10 +420,20 @@
 
     <!-- Preference switch for Telemetry -->
     <string name="preferences_telemetry">Телеметрия</string>
+    <!-- Preference switch for usage and technical data collection -->
+    <string name="preference_usage_data">Куллану турында һәм техник мәгълүматлар</string>
     <!-- Preference switch for marketing data collection -->
     <string name="preferences_marketing_data">Маркетинг мәгълүматлары</string>
     <!-- Title for studies preferences -->
     <string name="preference_experiments_2">Тикшеренүләр</string>
+    <!-- Summary for studies preferences -->
+    <string name="preference_experiments_summary_2">Mozilla-га тикшеренүләр урнаштырырга һәм үткәрергә рөхсәт итү</string>
+    <!-- Title for experiments preferences -->
+    <string name="preference_experiments">Тәҗрибәләр</string>
+    <!-- Summary for experiments preferences -->
+    <string name="preference_experiments_summary">Mozilla-га эксперименталь мөмкинлекләр өчен мәгълүмат урнаштырырга һәм җыярга рөхсәт итү</string>
+    <!-- Preference switch for crash reporter -->
+    <string name="preferences_crash_reporter">Ватылулар хәбәрчесе</string>
     <!-- Preference switch for Mozilla location service -->
     <string name="preferences_mozilla_location_service">Mozilla урнашу хезмәте</string>
     <!-- Preference switch for app health report. The first parameter is the name of the application (For example: Fenix) -->
@@ -414,6 +442,8 @@
     <!-- Turn On Sync Preferences -->
     <!-- Header of the Turn on Sync preference view -->
     <string name="preferences_sync">Синхронлауны кабызу</string>
+    <!-- Preference for pairing -->
+    <string name="preferences_sync_pair">Эш өстәле компьютерындагы Firefox-та ялгау кодын сканерлау</string>
     <!-- Preference for account login -->
     <string name="preferences_sync_sign_in">Керү</string>
 
@@ -422,6 +452,9 @@
     <!-- Preference for removing FxA account -->
     <string name="preferences_sync_remove_account">Хисап язмасын бетерү</string>
 
+    <!-- Pairing Feature strings -->
+    <!-- Instructions on how to access pairing -->
+    <string name="pair_instructions_2"><![CDATA[<b>Firefox.com/pair</b> адресында күрсәтелгән QR кодны сканерлагыз]]></string>
     <!-- Button to open camera for pairing -->
     <string name="pair_open_camera">Камераны ачу</string>
     <!-- Button to cancel pairing -->
@@ -440,9 +473,22 @@
     <!-- Preference for using dark theme -->
     <string name="preference_dark_theme">Караңгы төсле</string>
 
+    <!-- Preference for using using dark or light theme automatically set by battery -->
+    <string name="preference_auto_battery_theme">Батареяны саклау режимын исәпкә алу</string>
     <!-- Preference for using following device theme -->
     <string name="preference_follow_device_theme">Җиһаз темасына иярү</string>
 
+    <!-- Gestures Preferences-->
+    <!-- Preferences for using pull to refresh in a webpage -->
+    <string name="preference_gestures_website_pull_to_refresh">Яңарту өчен тартыгыз</string>
+
+    <!-- Preference for using the dynamic toolbar -->
+    <string name="preference_gestures_dynamic_toolbar">Кораллар панелен яшерү өчен әйләндерегез</string>
+    <!-- Preference for switching tabs by swiping horizontally on the toolbar -->
+    <string name="preference_gestures_swipe_toolbar_switch_tabs">Табларны алыштыру өчен кораллар панелен кырыйга сөйрәгез</string>
+    <!-- Preference for showing the opened tabs by swiping up on the toolbar-->
+    <string name="preference_gestures_swipe_toolbar_show_tabs">Табларны ачу өчен кораллар панелен өскә таба сөйрәгез</string>
+
     <!-- Library -->
     <!-- Option in Library to open Sessions page -->
     <string name="library_sessions">Сессияләр</string>
@@ -466,14 +512,14 @@
     <string name="library_new_tab">Яңа таб</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Биттән табу</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Синхронланган таблар</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Уку исемлеге</string>
     <!-- Menu Item Label for Search in Library -->
     <string name="library_search">Эзләү</string>
     <!-- Settings Page Title -->
     <string name="settings_title">Көйләүләр</string>
+    <!-- Content description (not visible, for screen readers etc.): "Menu icon for items on a history item" -->
+    <string name="content_description_history_menu">Тарих элементы менюсы</string>
     <!-- Content description (not visible, for screen readers etc.): "Close button for library settings" -->
     <string name="content_description_close_button">Ябу</string>
 
@@ -494,6 +540,8 @@
     <!-- Tab Management -->
     <!-- Title of preference for tabs management -->
     <string name="preferences_tabs">Таблар</string>
+    <!-- Title of preference that allows a user to specify the tab view -->
+    <string name="preferences_tab_view">Таб күренеше</string>
     <!-- Option for a list tab view -->
     <string name="tab_view_list">Исемлек</string>
     <!-- Option for a grid tab view -->
@@ -559,6 +607,8 @@
     <string name="tab_tray_menu_open_new_tab">Яңа таб</string>
     <!-- Shortcut action to open the home screen -->
     <string name="tab_tray_menu_home">Баш биткә кайту </string>
+    <!-- Shortcut action to toggle private mode -->
+    <string name="tab_tray_menu_toggle">Таб режимын алыштыру</string>
     <!-- Text shown in the multiselect menu for bookmarking selected tabs. -->
     <string name="tab_tray_multiselect_menu_item_bookmark">Кыстыргыч</string>
     <!-- Text shown in the multiselect menu for closing selected tabs. -->
@@ -593,6 +643,8 @@
     <string name="current_session_save">Саклау</string>
     <!-- Button in the current session menu. Opens the share menu when pressed -->
     <string name="current_session_share">Уртаклашу</string>
+    <!-- Content description (not visible, for screen readers etc.): Title icon for current session menu -->
+    <string name="current_session_image">Агымдагы сессия рәсеме</string>
     <!-- Button to save the current set of tabs into a collection -->
     <string name="save_to_collection">Җыентыкка саклау</string>
     <!-- Text for the menu button to delete a collection -->
@@ -638,6 +690,9 @@
     <!-- History multi select title in app bar
     The first parameter is the number of bookmarks selected -->
     <string name="history_multi_select_title">%1$d сайланды</string>
+    <!-- Text for the button to clear selected history items. The first parameter
+        is a digit showing the number of items you have selected -->
+    <string name="history_delete_some">%1$d элементны бетерү</string>
     <!-- Text for the header that groups the history for today -->
     <string name="history_today">Бүген</string>
     <!-- Text for the header that groups the history for yesterday -->
@@ -677,6 +732,8 @@
     <!-- Title text displayed on the tab crash page. This first parameter is the name of the application (For example: Fenix) -->
     <string name="tab_crash_title_2">Гафу. %1$s бу сәхифәне йөкли алмый.</string>
 
+    <!-- Send crash report checkbox text on the tab crash page -->
+    <string name="tab_crash_send_report">Mozilla-га ватылу турында хәбәр җибәрү</string>
     <!-- Close tab button text on the tab crash page -->
     <string name="tab_crash_close">Табны ябу</string>
     <!-- Restore tab button text on the tab crash page -->
@@ -697,12 +754,12 @@
     <string name="bookmark_select_folder">Папка сайлау</string>
     <!-- Confirmation message for a dialog confirming if the user wants to delete the selected folder -->
     <string name="bookmark_delete_folder_confirmation_dialog">Папка бетерүне раслыйсызмы?</string>
+    <!-- Confirmation message for a dialog confirming if the user wants to delete multiple items including folders. Parameter will be replaced by app name. -->
+    <string name="bookmark_delete_multiple_folders_confirmation_dialog">%s сайланган элементларны бетерәчәк.</string>
     <!-- Snackbar title shown after a folder has been deleted. This first parameter is the name of the deleted folder -->
     <string name="bookmark_delete_folder_snackbar">%1$s бетерелде</string>
     <!-- Screen title for adding a bookmarks folder -->
     <string name="bookmark_add_folder">Папка өстәү</string>
-    <!-- deprecated: Snackbar title shown after a bookmark has been created. -->
-    <string name="bookmark_created_snackbar">Кыстыргыч ясалды.</string>
     <!-- Snackbar title shown after a bookmark has been created. -->
     <string name="bookmark_saved_snackbar">Кыстыргыч cакланды!</string>
     <!-- Snackbar edit button shown after a bookmark has been created. -->
@@ -790,6 +847,8 @@
     <string name="preference_phone_feature_notification">Искәртү</string>
     <!-- Preference for altering the persistent storage access for all websites -->
     <string name="preference_phone_feature_persistent_storage">Даими саклагыч</string>
+    <!-- Preference for altering the EME access for all websites -->
+    <string name="preference_phone_feature_media_key_system_access">DRM белән идарә ителгән эчтәлек</string>
     <!-- Label that indicates that a permission must be asked always -->
     <string name="preference_option_phone_feature_ask_to_allow">Рөхсәт итүне сорау</string>
     <!-- Label that indicates that a permission must be blocked -->
@@ -808,6 +867,10 @@
     <string name="preference_option_autoplay_allowed2">Аудио һәм видеоны рөхсәт итү</string>
     <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
     <string name="quick_setting_option_autoplay_allowed">Аудио һәм видеоны рөхсәт итү</string>
+    <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
+    <string name="preference_option_autoplay_allowed_wifi_only2">Аудио һәм видеоны мобиль интернетны кулланганда гына блоклау</string>
+    <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
+    <string name="preference_option_autoplay_allowed_wifi_subtext">Аудио һәм видео Wi-Fi аша уйнатылачак</string>
     <!-- Label for global setting that indicates that video autoplay is allowed, but audio autoplay is blocked -->
     <string name="preference_option_autoplay_block_audio2">Аудионы гына тыю</string>
     <!-- Label for site specific setting that indicates that video autoplay is allowed, but audio autoplay is blocked -->
@@ -884,11 +947,19 @@
     <string name="sync_sign_in">Синхронлауга керү</string>
     <!-- An option from the share dialog to send link to all other sync devices -->
     <string name="sync_send_to_all">Барлык җиһазларга җибәрү</string>
+    <!-- An option from the share dialog to reconnect to sync -->
+    <string name="sync_reconnect">Синхронлауга яңадан тоташу</string>
+    <!-- Text displayed when sync is offline and cannot be accessed -->
+    <string name="sync_offline">Офлайн</string>
     <!-- An option to connect additional devices -->
     <string name="sync_connect_device">Башка җиһазны тоташтыру</string>
+    <!-- The dialog text shown when additional devices are not available -->
+    <string name="sync_connect_device_dialog">Табны җибәрү өчен, кимендә тагын бер башка җиһаздан Firefox-ка керегез.</string>
     <!-- Confirmation dialog button -->
     <string name="sync_confirmation_button">Аңладым</string>
 
+    <!-- Share error message -->
+    <string name="share_error_snackbar">Бу кушымта белән бүлешеп булмый</string>
     <!-- Add new device screen title -->
     <string name="sync_add_new_device_title">Җиһазга җибәрү</string>
     <!-- Text for the warning message on the Add new device screen -->
@@ -945,12 +1016,17 @@
     <string name="a11y_dialog_deleted_undo">Кире алу</string>
     <!-- Text for action to confirm deleting a tab or collection shown in a11y dialog -->
     <string name="a11y_dialog_deleted_confirm">Раслау</string>
+    <!-- QR code scanner prompt which appears after scanning a code, but before navigating to it
+        First parameter is the name of the app, second parameter is the URL or text scanned-->
+    <string name="qr_scanner_confirmation_dialog_message">%1$s кушымтасына %2$s сылтамасын ачарга рөхсәт бирү</string>
     <!-- QR code scanner prompt dialog positive option to allow navigation to scanned link -->
     <string name="qr_scanner_dialog_positive">РӨXCӘT ИТҮ</string>
     <!-- QR code scanner prompt dialog positive option to deny navigation to scanned link -->
     <string name="qr_scanner_dialog_negative">КИРЕ КАГУ</string>
     <!-- Tab collection deletion prompt dialog message. Placeholder will be replaced with the collection name -->
     <string name="tab_collection_dialog_message">%1$s җыентыгын бетерүне раслыйсызмы?</string>
+    <!-- Collection and tab deletion prompt dialog message. This will show when the last tab from a collection is deleted -->
+    <string name="delete_tab_and_collection_dialog_message">Бу табны бетерү бөтен җыентыкны бетерәчәк. Сез һәрвакыт яңа җыентыклар булдыра аласыз.</string>
     <!-- Collection and tab deletion prompt dialog title. Placeholder will be replaced with the collection name. This will show when the last tab from a collection is deleted -->
     <string name="delete_tab_and_collection_dialog_title">%1$s җыентыгын бетерергәме?</string>
     <!-- Tab collection deletion prompt dialog option to delete the collection -->
@@ -962,9 +1038,14 @@
     <string name="full_screen_notification">Тулы экран режимына күчү</string>
     <!-- Message for copying the URL via long press on the toolbar -->
     <string name="url_copied">URL копияләнде</string>
+    <!-- Summary for Accessibility Text Size Scaling Preference -->
+    <string name="preference_accessibility_text_size_summary">Вебсайтларда текстны зурайту я кечерәйтү</string>
     <!-- Title for Accessibility Text Size Scaling Preference -->
     <string name="preference_accessibility_font_size_title">Шрифт үлчәме</string>
 
+    <!-- Title for Accessibility Text Automatic Size Scaling Preference -->
+    <string name="preference_accessibility_auto_size_2">Автоматик шрифт үлчәме</string>
+
     <!-- Title for the Delete browsing data preference -->
     <string name="preferences_delete_browsing_data">Гизү мәгълүматларын бетерү</string>
     <!-- Title for the tabs item in Delete browsing data -->
@@ -983,6 +1064,10 @@
     <string name="preferences_delete_browsing_data_browsing_history_subtitle">%d бит</string>
     <!-- Title for the cookies item in Delete browsing data -->
     <string name="preferences_delete_browsing_data_cookies">Кукилар</string>
+    <!-- Subtitle for the cookies item in Delete browsing data -->
+    <string name="preferences_delete_browsing_data_cookies_subtitle">Сез күпчелек сайтлардан чыгачаксыз</string>
+    <!-- Title for the cached images and files item in Delete browsing data -->
+    <string name="preferences_delete_browsing_data_cached_files">Кәшләнгән рәсемнәр һәм файллар</string>
     <!-- Subtitle for the cached images and files item in Delete browsing data -->
     <string name="preferences_delete_browsing_data_cached_files_subtitle">Саклагычта урын бушата</string>
 
@@ -992,9 +1077,15 @@
     <string name="preferences_delete_browsing_data_downloads">Йөкләүләр</string>
     <!-- Text for the button to delete browsing data -->
     <string name="preferences_delete_browsing_data_button">Гизү мәгълүматларын бетерү</string>
+    <!-- Title for the Delete browsing data on quit preference -->
+    <string name="preferences_delete_browsing_data_on_quit">Чыкканда гизү мәгълүматларын бетерү</string>
     <!-- Action item in menu for the Delete browsing data on quit feature -->
     <string name="delete_browsing_data_on_quit_action">Чыгу</string>
 
+    <!-- Dialog message to the user asking to delete browsing data. -->
+    <string name="delete_browsing_data_prompt_message">Бу сезнең барлык гизү мәгълүматларыгызны да бетерәчәк.</string>
+    <!-- Dialog message to the user asking to delete browsing data. Parameter will be replaced by app name. -->
+    <string name="delete_browsing_data_prompt_message_3">%s сайланган гизү мәгълүматларын бетерәчәк.</string>
     <!-- Text for the cancel button for the data deletion dialog -->
     <string name="delete_browsing_data_prompt_cancel">Баш тарту</string>
     <!-- Text for the allow button for the data deletion dialog -->
@@ -1005,6 +1096,9 @@
     <!-- Text for the snackbar to show the user that the deletion of browsing data is in progress -->
     <string name="deleting_browsing_data_in_progress">Гизү мәгълүматларын бетерү…</string>
 
+    <!-- Tips -->
+    <!-- text for firefox preview moving tip header "Firefox Preview" and "Firefox Nightly" are intentionally hardcoded -->
+    <string name="tip_firefox_preview_moved_header">Firefox Preview хәзер Firefox Nightly дип атала</string>
     <!-- text for firefox preview moving tip button. "Firefox for Android Beta" is intentionally hardcoded -->
     <string name="tip_firefox_preview_moved_button_2">Android Beta өчен Firefox алу</string>
 
@@ -1039,16 +1133,29 @@
     <string name="onboarding_firefox_account_signing_in">Керү...</string>
     <!-- text for the button to manually sign into Firefox account. -->
     <string name="onboarding_firefox_account_sign_in_1">Теркәлү</string>
+    <!-- text for the button to stay signed out when presented with an option to automatically sign-in. -->
+    <string name="onboarding_firefox_account_stay_signed_out">Кермичә генә тору</string>
     <!-- text to display in the snackbar once account is signed-in -->
     <string name="onboarding_firefox_account_sync_is_on">Синхронлау кабызылган</string>
     <!-- text to display in the snackbar if automatic sign-in fails. user may try again -->
     <string name="onboarding_firefox_account_automatic_signin_failed">Кереп булмады</string>
+    <!-- text for the tracking protection onboarding card header -->
+    <string name="onboarding_tracking_protection_header_3">Даими хосусыйлык</string>
     <!-- text for tracking protection radio button option for standard level of blocking -->
     <string name="onboarding_tracking_protection_standard_button_2">Стандарт (килешенгәнчә)</string>
     <!-- text for tracking protection radio button option for strict level of blocking -->
     <string name="onboarding_tracking_protection_strict_button">Катгый (киңәш ителә)</string>
     <!-- text for tracking protection radio button option for strict level of blocking -->
     <string name="onboarding_tracking_protection_strict_option">Катгый</string>
+    <!-- text for the toolbar position card header  -->
+    <string name="onboarding_toolbar_placement_header_1">Кораллар панеленең урнашуын сайлау</string>
+    <!-- text for the private browsing onboarding card header -->
+    <string name="onboarding_private_browsing_header">Хосусый режимда гизү</string>
+    <!-- text for the private browsing onboarding card description
+    The first parameter is an icon that represents private browsing -->
+    <string name="onboarding_private_browsing_description1">Бер тапкыр гына хосусый таб ачу өчен %s тамгачыгына басыгыз.</string>
+    <!-- text for the private browsing onboarding card description, explaining how to always using private browsing -->
+    <string name="onboarding_private_browsing_always_description">Хосусый табларны һәрвакыт ачу өчен хосусый гизү көйләүләрен яңартыгыз.</string>
     <!-- text for the private browsing onbording card button, that launches settings -->
     <string name="onboarding_private_browsing_button">Көйләүләрне ачу</string>
     <!-- text for the privacy notice onboarding card header -->
@@ -1058,11 +1165,18 @@
     <!-- Content description (not visible, for screen readers etc.): Close onboarding screen -->
     <string name="onboarding_close">Ябу</string>
 
+    <!-- text for the button to finish onboarding -->
+    <string name="onboarding_finish">Гизүне башлау</string>
+
     <!-- Onboarding theme -->
     <!-- text for the theme picker onboarding card header -->
     <string name="onboarding_theme_picker_header">Теманы сайлау</string>
+    <!-- text for the theme picker onboarding card description -->
+    <string name="onboarding_theme_picker_description_2">Караңгы режим ярдәмендә батареяны һәм күзләрегезне саклагыз.</string>
     <!-- Automatic theme setting (will follow device setting) -->
     <string name="onboarding_theme_automatic_title">Автоматик</string>
+    <!-- Summary of automatic theme setting (will follow device setting) -->
+    <string name="onboarding_theme_automatic_summary">Җиһаз көйләүләренә яраклаша</string>
     <!-- Theme setting for dark mode -->
     <string name="onboarding_theme_dark_title">Караңгы тема</string>
     <!-- Theme setting for light mode -->
@@ -1078,11 +1192,22 @@
     <string name="sync_sent_tab_error_snackbar_action">КАБАТЛАУ</string>
     <!-- Title of QR Pairing Fragment -->
     <string name="sync_scan_code">Кодны сканерлау</string>
+    <!-- Instructions on how to access pairing -->
+    <string name="sign_in_instructions"><![CDATA[Компьютерыгызда Firefox-ны ачыгыз һәм <b>https://firefox.com/pair</b> адресына үтегез]]></string>
+    <!-- Text shown for sign in pairing when ready -->
+    <string name="sign_in_ready_for_scan">Сканерлауга әзер</string>
+    <!-- Text shown for settings option for sign with pairing -->
+    <string name="sign_in_with_camera">Камерагыз ярдәмендә керегез</string>
+    <!-- Text shown for settings option for sign with email -->
+    <string name="sign_in_with_email">Моның урынына эл. почта кулланыгыз</string>
     <!-- Option to continue signing out of account shown in confirmation dialog to sign out of account -->
     <string name="sign_out_disconnect">Өзү</string>
     <!-- Option to cancel signing out shown in confirmation dialog to sign out of account -->
     <string name="sign_out_cancel">Баш тарту</string>
 
+    <!-- Error message snackbar shown after the user tried to select a default folder which cannot be altered -->
+    <string name="bookmark_cannot_edit_root">Стандарт папкаларны үзгәртә алмыйм</string>
+
     <!-- Enhanced Tracking Protection -->
     <!-- Link displayed in enhanced tracking protection panel to access tracking protection settings -->
     <string name="etp_settings">Саклау көйләүләре</string>
@@ -1092,13 +1217,25 @@
     <string name="preference_enhanced_tracking_protection_explanation_learn_more">Күбрәк белү</string>
     <!-- Preference for enhanced tracking protection for the standard protection settings -->
     <string name="preference_enhanced_tracking_protection_standard_default_1">Стандарт (килешенгәнчә)</string>
+    <!--  Accessibility text for the Standard protection information icon  -->
+    <string name="preference_enhanced_tracking_protection_standard_info_button">Стандарт күзәтелүдән саклау чаралары нәрсәләрне блоклый</string>
     <!-- Preference for enhanced tracking protection for the strict protection settings -->
     <string name="preference_enhanced_tracking_protection_strict">Катгый</string>
     <!-- Preference for enhanced tracking protection for the custom protection settings -->
     <string name="preference_enhanced_tracking_protection_custom">Үзгә</string>
+    <!-- Preference description for enhanced tracking protection for the strict protection settings -->
+    <string name="preference_enhanced_tracking_protection_custom_description_2">Кайсы төр трекерларны һәм скриптларны блокларга икәнен сайлагыз.</string>
+    <!--  Accessibility text for the Strict protection information icon  -->
+    <string name="preference_enhanced_tracking_protection_custom_info_button">Үзгә күзәтелүдән саклау чаралары нәрсәләрне блоклый</string>
     <!-- Header for categories that are being blocked by current Enhanced Tracking Protection settings -->
     <!-- Preference for enhanced tracking protection for the custom protection settings for cookies-->
     <string name="preference_enhanced_tracking_protection_custom_cookies">Кукилар</string>
+    <!-- Option for enhanced tracking protection for the custom protection settings for cookies-->
+    <string name="preference_enhanced_tracking_protection_custom_cookies_1">Сайт-ара һәм социаль челтәр күзәтүчеләре</string>
+    <!-- Option for enhanced tracking protection for the custom protection settings for cookies-->
+    <string name="preference_enhanced_tracking_protection_custom_cookies_2">Каралмаган сайтлардан булган кукилар</string>
+    <!-- Preference for enhanced tracking protection for the custom protection settings for tracking content -->
+    <string name="preference_enhanced_tracking_protection_custom_tracking_content">Күзәтүче эчтәлек</string>
     <!-- Option for enhanced tracking protection for the custom protection settings for tracking content-->
     <string name="preference_enhanced_tracking_protection_custom_tracking_content_1">Барлык табларда</string>
 
@@ -1108,11 +1245,27 @@
     <string name="preference_enhanced_tracking_protection_custom_tracking_content_3">Үзгә табларда гына</string>
     <!-- Preference for enhanced tracking protection for the custom protection settings -->
     <string name="preference_enhanced_tracking_protection_custom_cryptominers">Криптомайнерләр</string>
+    <!-- Preference for enhanced tracking protection for the custom protection settings -->
+    <string name="preference_enhanced_tracking_protection_custom_fingerprinters">Бармак эзләрен җыючылар (идентификаторлар)</string>
     <string name="enhanced_tracking_protection_blocked">Тыелган</string>
     <!-- Header for categories that are being not being blocked by current Enhanced Tracking Protection settings -->
     <string name="enhanced_tracking_protection_allowed">Рөхсәт ителгән</string>
+    <!-- Category of trackers (social media trackers) that can be blocked by Enhanced Tracking Protection -->
+    <string name="etp_social_media_trackers_title">Социаль челтәр күзәтүчеләре</string>
+    <!-- Category of trackers (cross-site tracking cookies) that can be blocked by Enhanced Tracking Protection -->
+    <string name="etp_cookies_title">Сайт-ара күзәтүче сookie файллары</string>
     <!-- Category of trackers (cryptominers) that can be blocked by Enhanced Tracking Protection -->
     <string name="etp_cryptominers_title">Криптомайнерләр</string>
+    <!-- Category of trackers (fingerprinters) that can be blocked by Enhanced Tracking Protection -->
+    <string name="etp_fingerprinters_title">Бармак эзләрен җыючылар (идентификаторлар)</string>
+    <!-- Category of trackers (tracking content) that can be blocked by Enhanced Tracking Protection -->
+    <string name="etp_tracking_content_title">Күзәтүче эчтәлек</string>
+    <!-- Enhanced Tracking Protection message that protection is currently on for this site -->
+    <string name="etp_panel_on">Бу сайт өчен саклау КАБЫНГАН</string>
+    <!-- Enhanced Tracking Protection message that protection is currently off for this site -->
+    <string name="etp_panel_off">Бу сайт өчен саклау СҮНГӘН</string>
+    <!-- Header for exceptions list for which sites enhanced tracking protection is always off -->
+    <string name="enhanced_tracking_protection_exceptions">Күзәтелүдән көчәйтелгән саклау бу вебсайтлар өчен сүндерелгән</string>
     <!-- Content description (not visible, for screen readers etc.): Navigate
     back from ETP details (Ex: Tracking content) -->
     <string name="etp_back_button_content_description">Кире кайту</string>
@@ -1126,8 +1279,13 @@
     The first parameter is the app name -->
     <string name="open_source_licenses_title">%s | OSS китапханәләр</string>
 
+    <!-- Category of trackers (redirect trackers) that can be blocked by Enhanced Tracking Protection -->
+    <string name="etp_redirect_trackers_title">Юнәлтүләрне күзәтеп торучылар</string>
+
     <!-- About page link text to open support link -->
     <string name="about_support">Техник ярдәм</string>
+    <!-- About page link text to list of past crashes (like about:crashes on desktop) -->
+    <string name="about_crashes">Өзеклеклер</string>
     <!-- About page link text to open privacy notice link -->
     <string name="about_privacy_notice">Хосусыйлык аңлатмасы</string>
     <!-- About page link text to open know your rights link -->
@@ -1137,6 +1295,11 @@
     <!-- About page link text to open a screen with libraries that are used -->
     <string name="about_other_open_source_libraries">Без кулланган китапханәләр</string>
 
+    <!-- Toast shown to the user when they are activating the secret dev menu
+        The first parameter is number of long clicks left to enable the menu -->
+    <string name="about_debug_menu_toast_progress">Хата төзәтү менюсы: кабызу өчен %1$d чиртү калды</string>
+    <string name="about_debug_menu_toast_done">Хата төзәтү менюсы кабынган</string>
+
     <!-- Content description of the tab counter toolbar button when one tab is open -->
     <string name="tab_counter_content_description_one_tab">1 таб</string>
     <!-- Content description of the tab counter toolbar button when multiple tabs are open. First parameter will be replaced with the number of tabs (always more than one) -->
@@ -1177,10 +1340,8 @@
     <string name="preferences_passwords_autofill">Автотутыру</string>
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Логиннарны синхронлау </string>
-    <!-- Syncing saved logins in Fenix is on -->
-    <string name="preferences_passwords_sync_logins_on">Кабынган</string>
-    <!-- Syncing saved logins in Fenix is off -->
-    <string name="preferences_passwords_sync_logins_off">Сүнгән</string>
+    <!-- Preference for syncing saved logins in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices">Логиннарны җиһазлар арасында синхронлау</string>
     <!-- Syncing saved logins in Fenix needs reconnect to sync -->
     <string name="preferences_passwords_sync_logins_reconnect">Яңадан тоташу</string>
     <!-- Syncing saved logins in Fenix needs login -->
@@ -1195,6 +1356,8 @@
     <string name="preferences_passwords_exceptions_description_empty">Сакланмаган логиннар һәм серсүзләр монда күрсәтеләчәк.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Бу сайтлар өчен логиннар һәм серсүзләр сакланмаячак.</string>
+    <!-- Text on button to remove all saved login exceptions -->
+    <string name="preferences_passwords_exceptions_remove_all">Барлык чыгармаларны бетерү</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Логиннардан эзләү</string>
     <!-- Option to sort logins list A-Z, alphabetically -->
@@ -1211,8 +1374,12 @@
     <string name="preferences_passwords_saved_logins_enter_pin">PIN-кодыгызны яңадан кертегез</string>
     <!-- Message displayed in security prompt to access saved logins -->
     <string name="preferences_passwords_saved_logins_enter_pin_description">Сакланган логиннарыгызны карау өчен йозакны ачыгыз</string>
+    <!-- Message displayed when a connection is insecure and we detect the user is entering a password -->
+    <string name="logins_insecure_connection_warning">Бу бәйләнеш шифрланмаган. Монда кертелгән логиннар башкалар кулына эләгергә мөмкин.</string>
     <!-- Learn more link that will link to a page with more information displayed when a connection is insecure and we detect the user is entering a password -->
     <string name="logins_insecure_connection_warning_learn_more">Күбрәк белү</string>
+    <!-- Prompt message displayed when Fenix detects a user has entered a password and user decides if Fenix should save it. The first parameter is the name of the application (For example: Fenix)  -->
+    <string name="logins_doorhanger_save">%s бу логинны сакласынмы?</string>
     <!-- Positive confirmation that Fenix should save the new or updated login -->
     <string name="logins_doorhanger_save_confirmation">Саклау</string>
     <!-- Negative confirmation that Fenix should not save the new or updated login -->
@@ -1242,34 +1409,53 @@
     <string name="saved_login_hide_password">Серсүзне яшерү</string>
     <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
     <string name="logins_biometric_prompt_message">Сакланган логиннарыгызны карау өчен йозакны ачыгыз</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title">Логиннарыгыз һәм серсүзләрегезне башкалардан саклагыз</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Cоңрак</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_set_up_now">Хәзер урнаштыру</string>
     <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their logins -->
     <string name="logins_biometric_prompt_message_pin">Җиһазыгызның йозагын ачыгыз</string>
+    <!-- Title for Accessibility Force Enable Zoom Preference -->
+    <string name="preference_accessibility_force_enable_zoom">Барлык вебсайтларны да масштаблау</string>
     <!-- Saved logins sorting strategy menu item -by name- (if selected, it will sort saved logins alphabetically) -->
     <string name="saved_logins_sort_strategy_alphabetically">Исем (А-Я)</string>
     <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
     <string name="saved_logins_sort_strategy_last_used">Соңгы кулланылган</string>
 
+    <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Логиннар менюсын тәртипкә китерү</string>
+
     <!-- Credit Cards Autofill -->
     <!-- Preference and title for managing the settings for credit cards -->
     <string name="preferences_credit_cards">Кредит карталары</string>
+    <!-- Preference for saving and autofilling credit cards -->
+    <string name="preferences_credit_cards_save_and_autofill_cards">Карталарны саклау һәм автотөгәлләү</string>
     <!-- Preference summary for saving and autofilling credit card data -->
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Мәгълүматлар шифрланган</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Карталарны җиһазлар арасында синхронлау</string>
+    <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
+    <string name="preferences_credit_cards_sync_cards">Карталарны синхронлау</string>
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Кредит картасын өстәү</string>
     <!-- Preference option for managing saved credit cards -->
     <string name="preferences_credit_cards_manage_saved_cards">Сакланган карталар белән идарә итү</string>
     <!-- Title of the "Add card" screen -->
     <string name="credit_cards_add_card">Картаны өстәү</string>
+    <!-- Title of the "Edit card" screen -->
+    <string name="credit_cards_edit_card">Картаны үзгәртү</string>
     <!-- The header for the card number of a credit card -->
     <string name="credit_cards_card_number">Карта номеры</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">Вакыты чыгу датасы</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">Картадагы исем</string>
+    <!-- The header for the nickname for a credit card -->
+    <string name="credit_cards_card_nickname">Карта исеме</string>
+    <!-- The text for the "Delete card" menu item for deleting a credit card -->
+    <string name="credit_cards_menu_delete_card">Картаны бетерү</string>
     <!-- The text for the "Delete card" button for deleting a credit card -->
     <string name="credit_cards_delete_card_button">Картаны бетерү</string>
     <!-- The title for the "Save" menu item for saving a credit card -->
@@ -1282,6 +1468,9 @@
     <!-- Title of the "Saved cards" screen -->
     <string name="credit_cards_saved_cards">Сакланган карталар</string>
 
+    <!-- Error message for credit card number validation -->
+    <string name="credit_cards_number_validation_error_message">Зинһар, дөрес бер карта номерын кертегез</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Эзләү системасын өстәү</string>
     <!-- Title of the Edit search engine screen -->
@@ -1301,18 +1490,26 @@
     <string name="search_add_custom_engine_name_hint">Исем</string>
     <!-- Placeholder text shown in the Search String TextField before a user enters text -->
     <string name="search_add_custom_engine_search_string_hint">Эзләнәчәк сүз я сүзтезмә</string>
+    <!-- Description text for the Search String TextField. The %s is part of the string -->
+    <string name="search_add_custom_engine_search_string_example">Сорауны “%s” юлы белән алыштырыгыз. Мисал өчен:\nhttps://www.google.com/search?q=%s</string>
     <!-- Text for the button to learn more about adding a custom search engine -->
     <string name="search_add_custom_engine_learn_more_label">Күбрәк белү</string>
 
+    <!-- Accessibility description for the form in which details about the custom search engine are entered -->
+    <string name="search_add_custom_engine_form_description">Үзгә эзләү системасының нечкәлекләре</string>
     <!-- Accessibility description for the 'Learn more' link -->
     <string name="search_add_custom_engine_learn_more_description">Күбрәк белү сылтамасы</string>
 
     <!-- Text shown when a user leaves the name field empty -->
     <string name="search_add_custom_engine_error_empty_name">Эзләү системасының исемен кертегез</string>
+    <!-- Text shown when a user tries to add a search engine that already exists -->
+    <string name="search_add_custom_engine_error_existing_name">“%s” исемле эзләү системасы инде бар.</string>
     <!-- Text shown when a user leaves the search string field empty -->
     <string name="search_add_custom_engine_error_empty_search_string">Эзләнәсе сүзтезмәне кертегез</string>
     <!-- Text shown when a user leaves out the required template string -->
     <string name="search_add_custom_engine_error_missing_template">Эзләнәсе сүзтезмәнең Мисал форматына туры килүен тикшерегез</string>
+    <!-- Text shown when we aren't able to validate the custom search query. The first parameter is the url of the custom search engine -->
+    <string name="search_add_custom_engine_error_cannot_reach">“%s” адресына тоташу хатасы</string>
     <!-- Text shown when a user creates a new search engine -->
     <string name="search_add_custom_engine_success_message">%s ясалды</string>
     <!-- Text shown when a user successfully edits a custom search engine -->
@@ -1320,6 +1517,8 @@
     <!-- Text shown when a user successfully deletes a custom search engine -->
     <string name="search_delete_search_engine_success_message">%s бетерелде</string>
 
+    <!-- Title text shown for the migration screen to the new browser. Placeholder replaced with app name -->
+    <string name="migration_title">Өр яңа %s-ка рәхим итегез</string>
     <!-- Text on the disabled button while in progress. Placeholder replaced with app name -->
     <string name="migration_updating_app_button_text">%s яңартыла…</string>
     <!-- Text on the enabled button. Placeholder replaced with app name-->
@@ -1329,6 +1528,13 @@
     <!--Text on list of migrated items (e.g. Settings, History, etc.)-->
     <string name="migration_text_passwords">Серсүзләр</string>
 
+    <!-- Heading for the instructions to allow a permission -->
+    <string name="phone_feature_blocked_intro">Рөхсәт итү өчен:</string>
+    <!-- First step for the allowing a permission -->
+    <string name="phone_feature_blocked_step_settings">1. Android көйләүләренә керегез</string>
+    <!-- Second step for the allowing a permission -->
+    <string name="phone_feature_blocked_step_permissions"><![CDATA[2. <b>Рөхсәтләр</b>’гә басыгыз]]></string>
+
     <!-- Label that indicates a site is using a secure connection -->
     <string name="quick_settings_sheet_secure_connection">Хәвефсез бәйләнеш</string>
     <!-- Label that indicates a site is using a insecure connection -->
@@ -1339,6 +1545,8 @@
     <string name="confirm_clear_permissions_site">Бу сайт өчен бирелгән барлык рөхсәтләрне дә чистартуны раслыйсызмы?</string>
     <!-- Confirmation message for a dialog confirming if the user wants to set default value a permission for a site-->
     <string name="confirm_clear_permission_site">Әлеге сайт өчен бирелгән бу рөхсәтне кире алуны раслыйсызмы?</string>
+    <!-- label shown when there are not site exceptions to show in the site exception settings -->
+    <string name="no_site_exceptions">Сайт өчен чыгармалар юк</string>
     <!-- Label for the Pocket default top site -->
     <string name="pocket_top_articles">Төп мәкаләләр</string>
     <!-- Bookmark deletion confirmation -->
@@ -1358,6 +1566,12 @@
     <string name="dialog_delete_positive">Бетерү</string>
     <!--  The saved login options menu description. -->
     <string name="login_options_menu">Логин көйләүләре </string>
+    <!--  The editable text field for a login's web address. -->
+    <string name="saved_login_hostname_description">Логинның веб-адресы өчен үзгәртелә торган текст кыры.</string>
+    <!--  The editable text field for a login's username. -->
+    <string name="saved_login_username_description">Логинның кулланучы исеме өчен үзгәртелә торган текст кыры.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description">Логинның серсүзе өчен үзгәртелә торган текст кыры.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Логин үзгәрешләрен саклау.</string>
     <!--  The button description to discard changes to an edited login. -->
@@ -1372,17 +1586,33 @@
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
     <string name="voice_search_explainer">Хәзер сөйләгез</string>
 
+    <!--  The error message in edit login view when a duplicate username exists. -->
+    <string name="saved_login_duplicate">Мондый исемле кулланучы бар инде</string>
+
     <!-- Synced Tabs -->
     <!-- Text displayed to ask user to connect another device as no devices found with account -->
     <string name="synced_tabs_connect_another_device">Башка бер җиһазны тоташтыру.</string>
+    <!-- Text displayed asking user to re-authenticate -->
+    <string name="synced_tabs_reauth">Зинһар, сайтка яңадан керегез.</string>
+    <!-- Text displayed when user has disabled tab syncing in Firefox Sync Account -->
+    <string name="synced_tabs_enable_tab_syncing">Зинһар, таблар синхронлауны кабызыгыз.</string>
+    <!-- Text displayed when user has no tabs that have been synced -->
+    <string name="synced_tabs_no_tabs">Башка җиһазларыгыздагы Firefox-ларда ачык таблар юк.</string>
+    <!-- Text displayed in the synced tabs screen when a user is not signed in to Firefox Sync describing Synced Tabs -->
+    <string name="synced_tabs_sign_in_message">Башка җиһазларыгызда ачылган таблар исемлеген карау.</string>
     <!-- Text displayed on a button in the synced tabs screen to link users to sign in when a user is not signed in to Firefox Sync -->
     <string name="synced_tabs_sign_in_button">Синхронлауга керү</string>
     <!-- The text displayed when a synced device has no tabs to show in the list of Synced Tabs. -->
     <string name="synced_tabs_no_open_tabs">Ачык таблар юк</string>
 
+    <!-- Top Sites -->
+    <!-- Title text displayed in the dialog when top sites limit is reached. -->
+    <string name="top_sites_max_limit_title">Төп сайтлар саны чиккә җитте</string>
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">Яхшы, аңладым</string>
-    <!-- Title text displayed in the rename top site dialog. -->
+    <!-- Label for the show most visited sites preference -->
+    <string name="top_sites_toggle_top_frecent_sites">Иң күп каралган сайтларны күрсәтү</string>
+	<!-- Title text displayed in the rename top site dialog. -->
 	<string name="top_sites_rename_dialog_title">Исем</string>
 	<!-- Hint for renaming title of a top site -->
 	<string name="top_site_name_hint">Төп сайт исеме</string>
@@ -1394,4 +1624,7 @@
     <!-- Content description for close button in collection placeholder. -->
     <string name="remove_home_collection_placeholder_content_description">Бетерү</string>
 
+    <!-- Content description radio buttons with a link to more information -->
+    <string name="radio_preference_info_content_description">Күбрәк белү өчен басыгыз</string>
+
     </resources>
diff --git a/app/src/main/res/values-tzm/strings.xml b/app/src/main/res/values-tzm/strings.xml
new file mode 100644
index 000000000..e223d2be2
--- /dev/null
+++ b/app/src/main/res/values-tzm/strings.xml
@@ -0,0 +1,296 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
+    <string name="app_name_private_5">Uslig %s</string>
+    <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
+    <string name="app_name_private_4">%s (Uslig)</string>
+    <!-- Label of editable text in create collection dialog for naming a new collection  -->
+    <string name="tab_tray_add_new_collection_name">Isem</string>
+
+    <!-- Text for the positive button -->
+    <string name="cfr_pos_button_text">Rnu asanf</string>
+    <!-- Text for the negative button -->
+    <string name="cfr_neg_button_text">Uhu, tanemmirt</string>
+
+    <!-- Text for the positive action button -->
+    <string name="open_in_app_cfr_positive_button_text">Ddu ɣer tisɣal</string>
+
+    <!-- Text for the positive action button to go to Android Settings to grant permissions. -->
+    <string name="camera_permissions_needed_positive_button_text">Ddu ɣer tisɣal</string>
+
+    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
+    <string name="tab_tray_grid_view_banner_positive_button_text">Ddu ɣer tisɣal</string>
+
+    <!-- Home screen icons - Long press shortcuts -->
+    <!-- Shortcut action to open new tab -->
+    <string name="home_screen_shortcut_open_new_tab_2">Iccer amaynu</string>
+    <!-- Shortcut action to open new private tab -->
+    <string name="home_screen_shortcut_open_new_private_tab_2">Iccer uslig amaynu</string>
+
+    <!-- Content description (not visible, for screen readers etc.): Stop loading current website -->
+    <string name="browser_menu_stop">Sbedd</string>
+    <!-- Browser menu button that sends a user to help articles -->
+    <string name="browser_menu_help">Tiwisi</string>
+    <!-- Browser menu button that sends a to a the what's new article -->
+    <string name="browser_menu_whats_new">Amaynu</string>
+    <!-- Browser menu button that opens the settings menu -->
+    <string name="browser_menu_settings">Tisɣal</string>
+    <!-- Browser menu button that opens a user's library -->
+    <string name="browser_menu_library">Tasedlist</string>
+    <!-- Browser menu button that opens the find in page menu -->
+    <string name="browser_menu_find_in_page">Rzu g tasna</string>
+    <!-- Browser menu button that creates a private tab -->
+    <string name="browser_menu_private_tab">Iccer uslig</string>
+    <!-- Browser menu button that open a share menu to share the current site -->
+    <string name="browser_menu_share">Bḍu</string>
+    <!-- Share menu title, displayed when a user is sharing their current site -->
+    <string name="menu_share_with">Bḍu d…</string>
+    <!-- Browser menu button shown in custom tabs that opens the current tab in Fenix
+        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
+    <string name="browser_menu_open_in_fenix">Ṛẓem g %1$s</string>
+    <!-- Browser menu button to open the current page in an external app -->
+    <string name="browser_menu_open_app_link">Ṛẓem g tsensi</string>
+    <!-- Browser menu label for adding a bookmark -->
+    <string name="browser_menu_add">Rnu</string>
+
+    <!-- Content description for search icon -->
+    <string name="a11y_search_icon_content_description">Rzu</string>
+    <!-- Text for default locale item -->
+    <string name="default_locale_text">Ḍfeṛ tutlay n wallal</string>
+    <!-- Placeholder text shown in the search bar before a user enters text -->
+    <string name="locale_search_hint">Tutlayt n urezzu</string>
+
+    <!-- Button in the search view that lets a user change their search engine -->
+    <string name="search_engine_button">Anesmassu n urezzu</string>
+    <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
+    <string name="search_shortcuts_engine_settings">Tisɣal n unesmassu n urezzu</string>
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_engines_search_with">Tikkelt-a, rzu s:</string>
+    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <string name="search_engine_suggestions_title">Rzu %s</string>
+
+    <!-- Search Widget -->
+    <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
+    <string name="search_widget_content_description">Ṛẓem iccer amaynu n Firefox</string>
+    <!-- Text preview for smaller sized widgets -->
+    <string name="search_widget_text_short">Rzu</string>
+    <!-- Text preview for larger sized widgets -->
+    <string name="search_widget_text_long">Rzu g web</string>
+
+    <!-- Preferences -->
+    <!-- Title for the settings page-->
+    <string name="settings">Tisɣal</string>
+    <!-- Preference category for all links about Fenix -->
+    <string name="preferences_category_about">Ɣef</string>
+    <!-- Preference for settings related to Search -->
+    <string name="preferences_search">Arezzu</string>
+    <!-- Preference linking to help about Fenix -->
+    <string name="preferences_help">Tiwisi</string>
+    <!-- Preference linking to about page for Fenix
+        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
+    <string name="preferences_about">Ɣef %1$s</string>
+    <!-- Preference category for account information -->
+    <string name="preferences_category_account">Amiḍan</string>
+    <!-- Preference shown on banner to sign into account -->
+    <string name="preferences_sign_in">Kcem</string>
+    <!-- Preference for changing default theme to dark or light mode -->
+    <string name="preferences_theme">Asgum</string>
+    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
+    <string name="preferences_account_default_name">Amiḍan Firefox</string>
+    <!-- Preference for language -->
+    <string name="preferences_language">Tutlayt</string>
+    <!-- Preference for account settings -->
+    <string name="preferences_account_settings">Tisɣal n umiḍan</string>
+
+    <!-- Preference for notifications -->
+    <string name="preferences_notifications">Tineɣmisin</string>
+
+    <!-- Button caption to confirm the add-on collection configuration -->
+    <string name="customize_addon_collection_ok">WAXXA</string>
+
+    <!-- Preference for syncing logins -->
+    <string name="preferences_sync_logins">Inekcam</string>
+    <!-- Preference for signing out -->
+    <string name="preferences_sign_out">Ffeɣ</string>
+    <!-- Preference displays and allows changing current FxA device name -->
+    <string name="preferences_sync_device_name">Isem n wallal</string>
+    <!-- Text for displaying the default device name.
+        The first parameter is the application name, the second is the device manufacturer name
+        and the third is the device model. -->
+    <string name="default_device_name_2">%1$s g %2$s %3$s</string>
+
+    <!-- Preference for syncing addresses -->
+    <string name="preferences_sync_address">Tansiwin</string>
+
+    <!-- Preference for account login -->
+    <string name="preferences_sync_sign_in">Kcem</string>
+    <!-- Preference for removing FxA account -->
+    <string name="preferences_sync_remove_account">Kkes amiḍan</string>
+
+    <!-- Theme Preferences -->
+    <!-- Preference for using light theme -->
+    <string name="preference_light_theme">Anafaw</string>
+    <!-- Preference for using dark theme -->
+    <string name="preference_dark_theme">Adeɣmum</string>
+
+    <!-- Option in Library to find text in page -->
+    <string name="library_find_in_page">Af g tesna</string>
+    <!-- Menu Item Label for Search in Library -->
+    <string name="library_search">Rzu</string>
+    <!-- Settings Page Title -->
+    <string name="settings_title">Tisɣal</string>
+
+    <!-- Content description (not visible, for screen readers etc.): "Close button for library settings" -->
+    <string name="content_description_close_button">Mḍel</string>
+
+    <!-- Text for the new tab button to indicate adding a new private tab in the tab -->
+    <string name="tab_drawer_fab_content">Uslig</string>
+    <!-- Text shown in the menu to view account settings -->
+    <string name="tab_tray_menu_account_settings">Tisɣal n umiḍan</string>
+    <!-- Text shown in the multiselect menu for closing selected tabs. -->
+    <string name="tab_tray_multiselect_menu_item_close">Mḍel</string>
+    <!-- Button in the current session menu. Deletes the session when pressed -->
+    <string name="current_session_delete">Kkes</string>
+    <!-- Button in the current session menu. Opens the share menu when pressed -->
+    <string name="current_session_share">Bḍu</string>
+    <!-- Text for the menu button to remove a top site -->
+	<string name="remove_top_site">Kkes</string>
+
+    <!-- Text for positive action to delete history in deleting history dialog -->
+    <string name="history_clear_dialog">Sfeḍ</string>
+    <!-- History overflow menu share button -->
+    <string name="history_menu_share_button">Bḍu</string>
+    <!-- Text for the button to delete a single history item -->
+    <string name="history_delete_item">Kkes</string>
+
+    <!-- Text for the button to clear selected history items. The first parameter
+        is a digit showing the number of items you have selected -->
+    <string name="history_delete_some">Kkes %1$d iferdas</string>
+    <!-- Text for the header that groups the history for today -->
+    <string name="history_today">Ass-a</string>
+    <!-- Text for the header that groups the history for yesterday -->
+    <string name="history_yesterday">Assennaṭ</string>
+    <!-- Text for the header that groups the history for last 24 hours -->
+    <string name="history_24_hours">24 n tesragin timeggura</string>
+    <!-- Text for the header that groups the history the past 7 days -->
+    <string name="history_7_days">7 n wussan imeggura</string>
+    <!-- Text for the header that groups the history the past 30 days -->
+    <string name="history_30_days">30 n wussan imeggura</string>
+    <!-- Text for the header that groups the history older than the last month -->
+    <string name="history_older">Iqbuṛen</string>
+
+    <!-- History overflow menu open in new tab button -->
+    <string name="download_menu_open">Ṛẓem</string>
+    <!-- Text for the button to remove a single download item -->
+    <string name="download_delete_item_1">Kkes</string>
+
+
+    <!-- Screen title for adding a bookmarks folder -->
+    <string name="bookmark_add_folder">Rnu asdaw</string>
+    <!-- Bookmark overflow menu share button -->
+    <string name="bookmark_menu_share_button">Bḍu</string>
+    <!-- Bookmark overflow menu delete button -->
+    <string name="bookmark_menu_delete_button">Kkes</string>
+    <!-- Bookmark URL editing field label -->
+    <string name="bookmark_url_label">URL</string>
+    <!-- Bookmark FOLDER editing field label -->
+    <string name="bookmark_folder_label">ASDAW</string>
+    <!-- Bookmark NAME editing field label -->
+    <string name="bookmark_name_label">ISEM</string>
+
+    <!-- Bookmark add folder screen title -->
+    <string name="bookmark_add_folder_fragment_label">Rnu asdaw</string>
+
+    <!-- Button label that take the user to the Android App setting -->
+    <string name="phone_feature_go_to_settings">Ddu ɣer tisɣal</string>
+    <!-- Preference for altering the notification access for all websites -->
+    <string name="preference_phone_feature_notification">Tineɣmisin</string>
+
+    <!-- Content description (not visible, for screen readers etc.): button to close the collection creator -->
+    <string name="create_collection_close">Mḍel</string>
+
+    <!-- Share screen header -->
+    <string name="share_header_2">Bḍu</string>
+    <!-- Content description (not visible, for screen readers etc.):
+        "Share" button. Opens the share menu when pressed. -->
+    <string name="share_button_content_description">Bḍu</string>
+
+    <!-- Sub-header in the dialog to share a link to another app -->
+    <string name="share_link_subheader">Bḍu asɣen</string>
+    <!-- Sub-header in the dialog to share a link to another sync device -->
+    <string name="share_device_subheader">Azen ɣer wallal</string>
+    <!-- Add new device screen title -->
+    <string name="sync_add_new_device_title">Azen ɣer wallal</string>
+
+    <!-- Notification action to open Fenix and resume the current browsing session. -->
+    <string name="notification_pbm_action_open">Ṛẓem</string>
+    <!-- Collection and tab deletion prompt dialog title. Placeholder will be replaced with the collection name. This will show when the last tab from a collection is deleted -->
+    <string name="delete_tab_and_collection_dialog_title">Kkes %1$s?</string>
+    <!-- Tab collection deletion prompt dialog option to delete the collection -->
+    <string name="tab_collection_dialog_positive">Kkes</string>
+
+    <!-- Subtitle for the data and history items in delete browsing data, parameter will be replaced with the
+        number of history items the user has -->
+    <string name="preferences_delete_browsing_data_browsing_data_subtitle">%d n tansiwin</string>
+    <!-- Subtitle for the history items in delete browsing data, parameter will be replaced with the
+        number of history pages the user has -->
+    <string name="preferences_delete_browsing_data_browsing_history_subtitle">%d n tasniwin</string>
+    <!-- Action item in menu for the Delete browsing data on quit feature -->
+    <string name="delete_browsing_data_on_quit_action">Ffeɣ</string>
+
+    <!-- Text for the allow button for the data deletion dialog -->
+    <string name="delete_browsing_data_prompt_allow">Kkes</string>
+
+    <!-- Onboarding -->
+    <!-- Text for onboarding welcome message
+    The first parameter is the name of the app (e.g. Firefox Preview) -->
+    <string name="onboarding_header">Ansuf ɣer %s!</string>
+    <!-- text for the private browsing onbording card button, that launches settings -->
+    <string name="onboarding_private_browsing_button">Ṛẓem tisɣal</string>
+
+    <!-- Content description (not visible, for screen readers etc.): Close onboarding screen -->
+    <string name="onboarding_close">Mḍel</string>
+
+    <!-- Add button text for the Add to Homescreen dialog -->
+    <string name="add_to_homescreen_add">Rnu</string>
+
+    <!-- Saved logins sorting strategy menu item -by name- (if selected, it will sort saved logins alphabetically) -->
+    <string name="saved_logins_sort_strategy_alphabetically">Isem (A-Ẓ)</string>
+
+    <!-- Title of the "Add card" screen -->
+    <string name="credit_cards_add_card">Rnu takaṛḍa</string>
+    <!-- The header for the card number of a credit card -->
+    <string name="credit_cards_card_number">Uṭṭun n tkaṛḍa</string>
+    <!-- The header for the name on the credit card -->
+    <string name="credit_cards_name_on_card">Isem g tkaṛḍa</string>
+    <!-- The text for the "Delete card" menu item for deleting a credit card -->
+    <string name="credit_cards_menu_delete_card">Kkes takaṛḍa</string>
+    <!-- The text for the "Delete card" button for deleting a credit card -->
+    <string name="credit_cards_delete_card_button">Kkes takaṛḍa</string>
+
+    <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
+    <string name="search_engine_add_button_content_description">Rnu</string>
+    <!-- Text for the menu button to delete a search engine -->
+    <string name="search_engine_delete">Kkes</string>
+
+    <!-- Placeholder text shown in the Search Engine Name TextField before a user enters text -->
+    <string name="search_add_custom_engine_name_hint">Isem</string>
+
+    <!-- First step for the allowing a permission -->
+    <string name="phone_feature_blocked_step_settings">1. Ddu ɣer tisɣal n Android</string>
+
+    <!-- Login overflow menu delete button -->
+    <string name="login_menu_delete_button">Kkes</string>
+    <!-- Positive action of a dialog asking to delete  -->
+    <string name="dialog_delete_positive">Kkes</string>
+
+    <!-- Title text displayed in the rename top site dialog. -->
+	<string name="top_sites_rename_dialog_title">Isem</string>
+
+    <!-- Button caption to confirm the renaming of the top site. -->
+	<string name="top_sites_rename_dialog_ok">WAXXA</string>
+
+    <!-- Content description for close button in collection placeholder. -->
+    <string name="remove_home_collection_placeholder_content_description">Kkes</string>
+
+    </resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 4121d9621..d794f71d6 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_name_private_5">Приватний перегляд %s</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (Приватний перегляд)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">Додатково</string>
@@ -47,6 +48,16 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">Вибрано</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">Недавно збережені</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">Недавно збережені закладки</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">Показати всі</string>
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">Показати всі збережені закладки</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s розроблено Mozilla.</string>
 
@@ -93,13 +104,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Відхилити</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Змініть вигляд відкритих вкладок. Перейдіть до налаштувань і виберіть подання вкладок сіткою.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Перейти до налаштувань</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Відхилити</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Нова вкладка</string>
@@ -109,6 +113,12 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">Популярні сайти</string>
 
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">Назад до</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">Показати всі</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">Відкриті вкладки</string>
@@ -186,6 +196,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Редагувати</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Домашній екран</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">Неможливо з’єднатися. Невідома схема URL-адреси.</string>
@@ -354,7 +368,7 @@
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">Автозавершення URL-адрес</string>
     <!-- Preference for open links in third party apps -->
-    <string name="preferences_open_links_in_apps">Відкривати посилання в програмах</string>
+    <string name="preferences_open_links_in_apps">Відкривати посилання у програмах</string>
 
     <!-- Preference for open download with an external download manager app -->
     <string name="preferences_external_download_manager">Зовнішній менеджер завантажень</string>
@@ -554,8 +568,6 @@
     <string name="library_new_tab">Нова вкладка</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Знайти на сторінці</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Синхронізовані вкладки</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Список читання</string>
     <!-- Menu Item Label for Search in Library -->
@@ -600,6 +612,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Через місяць</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Відкривати домівку після запуску</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">Через чотири години</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Завжди</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Ніколи</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Закрити власноруч</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -1585,6 +1606,10 @@
     <string name="credit_cards_card_number">Номер картки</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">Термін дії</string>
+    <!-- The label for the expiration date month of a credit card -->
+    <string name="credit_cards_expiration_date_month">Місяць закінчення терміну дії</string>
+    <!-- The label for the expiration date year of a credit card -->
+    <string name="credit_cards_expiration_date_year">Рік закінчення терміну дії</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">Ім’я на картці</string>
     <!-- The header for the nickname for a credit card -->
@@ -1606,6 +1631,24 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Введіть дійсний номер кредитної картки</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Будь ласка, заповніть це поле</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Розблокуйте для перегляду збережених карток</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Захистіть свої банківські картки</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Встановіть графічний ключ, ПІН, чи пароль, щоб захистити збережені банківські картки від інших, хто може отримати доступ до вашого пристрою.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Встановити</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Пізніше</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Розблокуйте свій пристрій</string>
+
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Розблокуйте, щоб використовувати збережену інформацію про кредитну картку</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Додати засіб пошуку</string>
     <!-- Title of the Edit search engine screen -->
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index d43fd38a6..e8d1525f1 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_name_private_5">نجی %s</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (نجی)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">مزید اختیارات</string>
@@ -20,10 +21,6 @@
     <!-- No Private Tabs Message Description -->
     <string name="no_private_tabs_description">آپ کے نجی ٹیبز یہاں دکھائے جائیں گے۔</string>
 
-    <!-- Default title for pinned Baidu top site that links to Baidu home page  -->
-    <string name="default_top_site_baidu">بیدو</string>
-    <!-- Default title for pinned JD top site that links to JD home page  -->
-    <string name="default_top_site_jd">JD</string>
     <!-- Message announced to the user when tab tray is selected with 1 tab -->
     <string name="open_tab_tray_single">1 کھلا ٹیب۔ ٹیبز بدلنے کے لئے دبائیں۔</string>
     <!-- Message announced to the user when tab tray is selected with 0 or 2+ tabs -->
@@ -54,6 +51,12 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">منتخب شدہ</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">حال ہی میں محفوظ شدہ</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">تمام دکھائیں</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s ء@fork-maintainers کے ذریعہ تیار کیا گیا ہے۔</string>
 
@@ -89,11 +92,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">برخاست کریں</string>
 
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">سیٹنگز پر جائیں</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">برخاست کریں</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">نیا ٹیب</string>
@@ -103,6 +101,9 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">سر فہرست سائٹین</string>
 
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">تمام دکھائیں</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">ٹیب کھولیں</string>
@@ -172,6 +173,15 @@
     <!-- Browser menu button to configure reader mode appearance e.g. the used font type and size -->
     <string name="browser_menu_read_appearance">ظاہرى شکل</string>
 
+    <!-- Browser menu label for adding a bookmark -->
+    <string name="browser_menu_add">اضافہ کریں</string>
+    <!-- Browser menu label for editing a bookmark -->
+    <string name="browser_menu_edit">تدوین کریں</string>
+
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">ابتدائی اسکرین</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">رابطہ قائم کرنے میں ناکام رہا۔ ناقابل شناخت URL اسکیم۔</string>
@@ -212,6 +222,9 @@
     <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
     <string name="search_engine_suggestions_title">%s تلاش کریں</string>
 
+    <!-- Search engine suggestion description text -->
+    <string name="search_engine_suggestions_description">ایڈریس بار سے براہ راست تلاش کریں</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
     <string name="search_widget_content_description">ایک نیا Firefox ٹیب کھولیں</string>
@@ -398,6 +411,11 @@
         and the third is the device model. -->
     <string name="default_device_name_2">%3$s %2$s پر %1$s</string>
 
+    <!-- Preference for syncing credit cards -->
+    <string name="preferences_sync_credit_cards">کریڈٹ کارڈز</string>
+    <!-- Preference for syncing addresses -->
+    <string name="preferences_sync_address">پتے</string>
+
     <!-- Send Tab -->
     <!-- Name of the "receive tabs" notification channel. Displayed in the "App notifications" system settings for the app -->
     <string name="fxa_received_tab_channel_name">موصول شدہ ٹیب</string>
@@ -428,9 +446,6 @@
     <!-- Text displayed when there are no exceptions, with learn more link that brings users to a tracking protection SUMO page -->
     <string name="exceptions_empty_message_learn_more_link">مزید سیکھیں</string>
 
-    <!-- Description in Quick Settings that tells user tracking protection is off globally for all sites, and links to Settings to turn it on -->
-    <string name="preferences_tracking_protection_turned_off_globally">سبھی کے لیے بند ہو گیا، اسے شروع کرنے کے لیے سیٹنگس میں جائیں۔</string>
-
     <!-- Preference switch for Telemetry -->
     <string name="preferences_telemetry">ٹیلیمیٹری</string>
     <!-- Preference switch for usage and technical data collection -->
@@ -524,8 +539,6 @@
     <string name="library_new_tab">نیا ٹیب</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">صفحے میں تلاش کریں</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">سینک ہو چکے ٹیبز</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">پڑھنے کی فہرست</string>
     <!-- Menu Item Label for Search in Library -->
@@ -572,6 +585,12 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">ایک مہینے کے بعد</string>
 
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">چار گھنٹے بعد</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">ہمیشہ</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">کبھی نہیں</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">دستی طور پر بند کریں</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -595,6 +614,8 @@
     <string name="add_private_tab">نجی ٹیب شامل کریں</string>
     <!-- Text for the new tab button to indicate adding a new private tab in the tab -->
     <string name="tab_drawer_fab_content">نجی</string>
+    <!-- Text for the new tab button to indicate syncing command on the synced tabs page -->
+    <string name="tab_drawer_fab_sync">سنک</string>
     <!-- Text shown as the title of the open tab tray -->
     <string name="tab_tray_title">ٹیب کھولیں</string>
     <!-- Text shown in the menu for saving tabs to a collection -->
@@ -605,6 +626,8 @@
     <string name="tab_tray_menu_item_share">تمام ٹیبز شیئر کریں</string>
     <!-- Text shown in the menu to view recently closed tabs -->
     <string name="tab_tray_menu_recently_closed">حالیہ بند کیے گئے ٹیبز</string>
+    <!-- Text shown in the menu to view account settings -->
+    <string name="tab_tray_menu_account_settings">اکاؤنٹ کی سیٹنگز</string>
     <!-- Text shown in the menu to view tab settings -->
     <string name="tab_tray_menu_tab_settings">ٹیب کی سیٹنگز</string>
     <!-- Text shown in the menu for closing all tabs -->
@@ -773,8 +796,6 @@
     <string name="bookmark_delete_folder_snackbar">%1$s حذف ہو گیا</string>
     <!-- Screen title for adding a bookmarks folder -->
     <string name="bookmark_add_folder">فولڈر بناؤ</string>
-    <!-- deprecated: Snackbar title shown after a bookmark has been created. -->
-    <string name="bookmark_created_snackbar">بُکمارک بنایا گیا۔</string>
     <!-- Snackbar title shown after a bookmark has been created. -->
     <string name="bookmark_saved_snackbar">بکمارک محفوظ!</string>
     <!-- Snackbar edit button shown after a bookmark has been created. -->
@@ -1142,46 +1163,28 @@
     <string name="onboarding_header">%s میں خوش آمدید!</string>
     <!-- text for the Firefox Accounts section header -->
     <string name="onboarding_fxa_section_header">کیا پہلے سے ہی ایک اکاؤنٹ ہے؟</string>
-    <!-- text for the Firefox Preview feature section header
-    The first parameter is the name of the app (e.g. Firefox Preview) -->
-    <string name="onboarding_feature_section_header">%s سے واقف ہوں</string>
     <!-- text for the "What's New" onboarding card header -->
     <string name="onboarding_whats_new_header1">دیکھیں نیا کیا ہے</string>
     <!-- text for underlined clickable link that is part of "what's new" onboarding card description that links to an FAQ -->
     <string name="onboarding_whats_new_description_linktext">یہاں جوابات حاصل کریں</string>
-    <!-- Text for the button to learn more about signing in to your Firefox account -->
-    <string name="onboarding_manual_sign_in_learn_more">مزید سیکھیں</string>
     <!-- text for the button to confirm automatic sign-in -->
     <string name="onboarding_firefox_account_auto_signin_confirm">ہاں ، مجھے سائن ان کریں</string>
     <!-- text for the automatic sign-in button while signing in is in process -->
     <string name="onboarding_firefox_account_signing_in">سائن ان ہو رہا ہے…</string>
-    <!-- text for the button to manually sign into Firefox account. The word "Firefox" should not be translated -->
-    <string name="onboarding_firefox_account_sign_in">Firefox کے لیے سائن ان کریں</string>
+    <!-- text for the button to manually sign into Firefox account. -->
+    <string name="onboarding_firefox_account_sign_in_1">سائن اپ کریں</string>
     <!-- text for the button to stay signed out when presented with an option to automatically sign-in. -->
     <string name="onboarding_firefox_account_stay_signed_out">سائن آؤٹ رہیں</string>
     <!-- text to display in the snackbar once account is signed-in -->
     <string name="onboarding_firefox_account_sync_is_on">Sync چالو ہے</string>
     <!-- text to display in the snackbar if automatic sign-in fails. user may try again -->
     <string name="onboarding_firefox_account_automatic_signin_failed">سائن ان کرنے میں ناکام</string>
-    <!-- text for the tracking protection onboarding card header -->
-    <string name="onboarding_tracking_protection_header_2">خودکار رازداری</string>
-    <!-- text for the tracking protection card description
-    The first parameter is the name of the app (e.g. Firefox Preview) -->
-    <string name="onboarding_tracking_protection_description_2">رازداری اور سلامتی سیٹنگز ٹریکرز، مالویئر، اور آپ کا پیچھا کرنے والی کمپنیوں کو روکتی ہیں۔</string>
     <!-- text for tracking protection radio button option for standard level of blocking -->
     <string name="onboarding_tracking_protection_standard_button_2">معیاری (پہلے سے طے شدہ)</string>
-    <!-- text for standard blocking option button description -->
-    <string name="onboarding_tracking_protection_standard_button_description_2">چند ٹریکروں کو روکتا ہے۔ صفحات عام طور پر لوڈ ہوں گے۔</string>
     <!-- text for tracking protection radio button option for strict level of blocking -->
     <string name="onboarding_tracking_protection_strict_button">سخت (سفارش شدا)</string>
     <!-- text for tracking protection radio button option for strict level of blocking -->
     <string name="onboarding_tracking_protection_strict_option">سخت</string>
-    <!-- text for strict blocking option button description -->
-    <string name="onboarding_tracking_protection_strict_button_description_2">زیادہ ٹریکر ، اشتہارات اور پاپ اپ کو بلاک کرتا ہے۔ صفحات تیزی سے لوڈ ہوتے ہے ، لیکن کچھ فعالیت کام نہیں کرسکتی ہے۔</string>
-    <!-- text for the toolbar position card header
-        In English this is an idiom for "choose a side as in an argument or fight"
-        but it is ok to make this more literally about "choosing a position in a physical space -->
-    <string name="onboarding_toolbar_position_header">ایک پہلو چنے</string>
     <!-- text for the private browsing onboarding card header -->
     <string name="onboarding_private_browsing_header">رازداری سے براؤز کریں</string>
 
@@ -1383,10 +1386,6 @@
     <string name="preferences_passwords_autofill">آٹوفل</string>
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">لاگ ان کو Sync کریں</string>
-    <!-- Syncing saved logins in Fenix is on -->
-    <string name="preferences_passwords_sync_logins_on">آن</string>
-    <!-- Syncing saved logins in Fenix is off -->
-    <string name="preferences_passwords_sync_logins_off">آف</string>
     <!-- Syncing saved logins in Fenix needs reconnect to sync -->
     <string name="preferences_passwords_sync_logins_reconnect">‏‏پھر جوڑیں</string>
     <!-- Syncing saved logins in Fenix needs login -->
@@ -1439,8 +1438,12 @@
     <string name="logins_site_copied">سائٹ کو کلپ بورڈ میں کاپی کیا گیا</string>
     <!-- Content Description (for screenreaders etc) read for the button to copy a password in logins-->
     <string name="saved_logins_copy_password">پاس ورڈ نقل کریں</string>
+    <!-- Content Description (for screenreaders etc) read for the button to clear a password while editing a login-->
+    <string name="saved_logins_clear_password">پاس ورڈ صاف کریں </string>
     <!-- Content Description (for screenreaders etc) read for the button to copy a username in logins -->
     <string name="saved_login_copy_username">صارف نام نقل کریں</string>
+    <!-- Content Description (for screenreaders etc) read for the button to clear a username while editing a login -->
+    <string name="saved_login_clear_username">صارف نام صاف کریں</string>
     <!-- Content Description (for screenreaders etc) read for the button to copy a site in logins -->
     <string name="saved_login_copy_site">سائٹ کاپی کریں</string>
     <!-- Content Description (for screenreaders etc) read for the button to open a site in logins -->
@@ -1474,6 +1477,41 @@
     <!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
     <string name="saved_logins_menu_dropdown_chevron_icon_content_description">لاگ ان مینو کو ترتیب دیں</string>
 
+    <!-- Title of the "Add card" screen -->
+    <string name="credit_cards_add_card">کارڈ شامل کریں</string>
+    <!-- Title of the "Edit card" screen -->
+    <string name="credit_cards_edit_card">کارڈ میں تدوین کریں</string>
+    <!-- The header for the card number of a credit card -->
+    <string name="credit_cards_card_number">کارڈ نمبر</string>
+    <!-- The header for the expiration date of a credit card -->
+    <string name="credit_cards_expiration_date">میعاد ختم ہونے کی تاریخ</string>
+    <!-- The label for the expiration date month of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_month">میعاد ختم ہونے کی تاریخ کا مہینہ</string>
+    <!-- The label for the expiration date year of a credit card to be used by a11y services-->
+    <string name="credit_cards_expiration_date_year">میعاد ختم ہونے کی تاریخ کا سال</string>
+    <!-- The header for the name on the credit card -->
+    <string name="credit_cards_name_on_card">کارڈ پر نام</string>
+    <!-- The header for the nickname for a credit card -->
+    <string name="credit_cards_card_nickname">کارڈ کا نام</string>
+    <!-- The text for the "Delete card" menu item for deleting a credit card -->
+    <string name="credit_cards_menu_delete_card">کارڈ حذف کریں</string>
+    <!-- The text for the "Delete card" button for deleting a credit card -->
+    <string name="credit_cards_delete_card_button">کارڈ حذف کریں</string>
+    <!-- The title for the "Save" menu item for saving a credit card -->
+    <string name="credit_cards_menu_save">محفوظ کریں</string>
+    <!-- The text for the "Save" button for saving a credit card -->
+    <string name="credit_cards_save_button">محفوظ کریں</string>
+    <!-- The text for the "Cancel" button for cancelling adding or updating a credit card -->
+    <string name="credit_cards_cancel_button">منسوخ کریں</string>
+    <!-- Title of the "Saved cards" screen -->
+    <string name="credit_cards_saved_cards">محفوظ شدہ کارڈ</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">ابھی سیٹ اپ کریں</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">بعد میں</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">اپنے آلے کو ان لاک کریں</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">تلاش انجن شامل کریں</string>
     <!-- Title of the Edit search engine screen -->
@@ -1617,7 +1655,9 @@
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">ٹھیک ہے سمجھ گیا</string>
 
-    <!-- Title text displayed in the rename top site dialog. -->
+    <!-- Label for the show most visited sites preference -->
+    <string name="top_sites_toggle_top_frecent_sites">سب سے زیادہ ملاحظہ کی جانے والی سائٹیں دکھائیں</string>
+	<!-- Title text displayed in the rename top site dialog. -->
 	<string name="top_sites_rename_dialog_title">نام</string>
 	<!-- Button caption to confirm the renaming of the top site. -->
 	<string name="top_sites_rename_dialog_ok">ٹھیک ہے</string>
@@ -1627,12 +1667,13 @@
     <!-- Content description for close button in collection placeholder. -->
     <string name="remove_home_collection_placeholder_content_description">ہٹائیں</string>
 
-    <!-- Deprecated: text for the firefox account onboarding card header
-    The first parameter is the name of the app (e.g. Firefox Preview) -->
-    <string name="onboarding_firefox_account_header">%s کا زیادہ سے زیادہ فائدہ اٹھائیں۔</string>
+    <!-- Content description radio buttons with a link to more information -->
+    <string name="radio_preference_info_content_description">تفصیلات کے لیے کلک کریں</string>
+
+    <!-- Content description for the action bar "up" button -->
+    <string name="action_bar_up_description">اوپر جائیں</string>
+
+    <!-- Content description for privacy content close button -->
+    <string name="privacy_content_close_button_content_description">بند کریں</string>
 
-    <!-- Deprecated: No Open Tabs Message Header -->
-    <string name="no_collections_header1">آپ کے لئے اہم چیزیں جمع کریں</string>
-    <!-- Deprecated: Label to describe what collections are to a new user without any collections -->
-    <string name="no_collections_description1">ایک طرح کی تلاشیں ، سائٹیں اور ٹیبز کو   بعد میں فوری رسائی کے  لئے گروہ بندی کریں۔</string>
-    </resources>
+</resources>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 0890effa6..58d7e9562 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -5,6 +5,7 @@
     <string name="app_name_private_5">%s riêng tư</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (Riêng tư)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">Tùy chọn khác</string>
@@ -48,6 +49,16 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">Đã chọn</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">Đã lưu gần đây</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">Dấu trang đã lưu gần đây</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">Hiển thị tất cả</string>
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">Hiển thị nút tất cả dấu trang đã lưu</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s được sản xuất bởi Mozilla.</string>
 
@@ -93,13 +104,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Bỏ qua</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">Thay đổi bố cục của các thẻ đang mở. Đi tới cài đặt và chọn lưới trong chế độ xem thẻ.</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">Đi tới cài đặt</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">Bỏ qua</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">Thẻ mới</string>
@@ -109,6 +113,12 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">Trang web hàng đầu</string>
 
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">Quay lại trang trước</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">Hiển thị tất cả</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">Các thẻ đang mở</string>
@@ -184,6 +194,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Chỉnh sửa</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Màn hình chính</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">Không thể kết nối. Không thể nhận dạng URL.</string>
@@ -544,8 +558,6 @@
     <string name="library_new_tab">Thẻ mới</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">Tìm trong trang</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">Các thẻ đã đồng bộ</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">Danh sách đọc</string>
     <!-- Menu Item Label for Search in Library -->
@@ -590,6 +602,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">Sau một tháng</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">Bắt đầu tại màn hình chính</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">Sau bốn giờ</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">Luôn luôn</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">Không bao giờ</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">Đóng thủ công</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -1561,6 +1582,10 @@
     <string name="credit_cards_card_number">Số thẻ</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">Ngày hết hạn</string>
+    <!-- The label for the expiration date month of a credit card -->
+    <string name="credit_cards_expiration_date_month">Tháng hết hạn</string>
+    <!-- The label for the expiration date year of a credit card -->
+    <string name="credit_cards_expiration_date_year">Năm hết hạn</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">Tên trên thẻ</string>
     <!-- The header for the nickname for a credit card -->
@@ -1582,6 +1607,23 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">Vui lòng nhập số thẻ tín dụng hợp lệ</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">Vui lòng điền vào trường này</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Mở khóa để xem các thẻ tín dụng đã lưu của bạn</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Bảo mật thẻ tín dụng của bạn</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Thiết lập màn hình khóa thiết bị với mẫu hình, mã PIN hoặc mật khẩu để bảo vệ thẻ tín dụng đã lưu của bạn không bị truy cập nếu người khác có thiết bị của bạn.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Thiết lập ngay</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Để sau</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Mở khóa thiết bị của bạn</string>
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Mở khóa để sử dụng thông tin thẻ tín dụng được lưu trữ</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Thêm công cụ tìm kiếm</string>
     <!-- Title of the Edit search engine screen -->
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index af863296b..ce8f4eca8 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -6,6 +6,7 @@
     <string name="app_name_private_5">私密 %s</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s (隐私模式)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">更多选项</string>
@@ -53,6 +54,16 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">已选择</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">最近保存</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">最近保存的书签</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">显示全部</string>
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">显示所有保存书签按钮</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s 由 Mozilla 倾力打造。</string>
 
@@ -97,13 +108,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">知道了</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">要更改打开的标签页布局。请转至设置，在“标签页视图”下选择“网格”。</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">前往设置</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">关闭</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">新建标签页</string>
@@ -113,6 +117,12 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">常用网站</string>
 
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">回到先前页面</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">显示全部</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">打开的标签页</string>
@@ -191,6 +201,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">编辑</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">主屏幕</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">未知的 URL 规范，无法连接。</string>
@@ -564,8 +578,6 @@
     <string name="library_new_tab">新建标签页</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">在页面中查找</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">受同步的标签页</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">阅读列表</string>
     <!-- Menu Item Label for Search in Library -->
@@ -610,6 +622,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">1 个月后</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">启动后进入主屏幕</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">4 小时后</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">总是</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">永不</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">手动关闭</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -1612,6 +1633,10 @@
     <string name="credit_cards_card_number">卡号</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">失效日期</string>
+    <!-- The label for the expiration date month of a credit card -->
+    <string name="credit_cards_expiration_date_month">到期月份</string>
+    <!-- The label for the expiration date year of a credit card -->
+    <string name="credit_cards_expiration_date_year">到期年份</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">卡上姓名</string>
     <!-- The header for the nickname for a credit card -->
@@ -1633,6 +1658,25 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">请输入有效的信用卡卡号</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">请填写此栏</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">解锁后即可查看保存的卡片信息</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">保护您的卡片信息</string>
+
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">设置锁定方式、PIN 码或密码以保护您保存的卡片信息，避免他人盗用。</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">立即设置</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">以后再说</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">解锁设备</string>
+
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">解锁以使用存储的卡片信息</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">添加搜索引擎</string>
     <!-- Title of the Edit search engine screen -->
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 881dc581f..b71d6787c 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -6,6 +6,7 @@
     <string name="app_name_private_5">隱私 %s</string>
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_4">%s（隱私）</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
     <string name="content_description_menu">更多選項</string>
@@ -51,6 +52,16 @@
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">已選取</string>
 
+    <!-- Home - Recently saved bookmarks -->
+    <!-- Title for the home screen section with recently saved bookmarks. -->
+    <string name="recently_saved_bookmarks">最近儲存</string>
+    <!-- Content description for the recently saved bookmarks section on the home screen. -->
+    <string name="recently_saved_bookmarks_content_description">最近加入的書籤</string>
+    <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all">顯示全部</string>
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description">顯示所有儲存書籤按鈕</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s 是由 Mozilla 所打造。</string>
 
@@ -94,13 +105,6 @@
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">知道了！</string>
 
-    <!-- Text for the banner message to tell users about our grid view feature. -->
-    <string name="tab_tray_grid_view_banner_message">可到設定，於「分頁檢視」下方選擇「格線」來更改開啟分頁的版面。</string>
-    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
-    <string name="tab_tray_grid_view_banner_positive_button_text">開啟設定</string>
-    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
-    <string name="tab_tray_grid_view_banner_negative_button_text">關閉</string>
-
     <!-- Home screen icons - Long press shortcuts -->
     <!-- Shortcut action to open new tab -->
     <string name="home_screen_shortcut_open_new_tab_2">開新分頁</string>
@@ -110,6 +114,12 @@
     <!-- Heading for the Top Sites block -->
     <string name="home_screen_top_sites_heading">熱門網站</string>
 
+    <!-- Recent Tabs -->
+    <!-- Header text for jumping back into the recent tab in the home screen -->
+    <string name="recent_tabs_header">回到先前開啟頁面</string>
+    <!-- Button text for showing all the tabs in the tabs tray -->
+    <string name="recent_tabs_show_all">顯示全部</string>
+
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
     <string name="browser_tabs_button">開啟分頁</string>
@@ -187,6 +197,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">編輯</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">主畫面</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">不認識的通訊協定，無法連線。</string>
@@ -554,8 +568,6 @@
     <string name="library_new_tab">開新分頁</string>
     <!-- Option in Library to find text in page -->
     <string name="library_find_in_page">在頁面中搜尋</string>
-    <!-- Option in Library to open Synced Tabs page -->
-    <string name="library_synced_tabs">同步的分頁</string>
     <!-- Option in Library to open Reading List -->
     <string name="library_reading_list">閱讀清單</string>
     <!-- Menu Item Label for Search in Library -->
@@ -601,6 +613,15 @@
     <!-- Option for auto closing tabs that will auto close tabs after one month -->
     <string name="close_tabs_after_one_month">1 個月後</string>
 
+    <!-- Start on Home -->
+    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
+    <string name="preferences_start_on_home">啟動時，直接進入主畫面</string>
+    <!-- Option for starting on the home screen after after four hours or inactivity -->
+    <string name="start_on_home_after_four_hours">4 小時後</string>
+    <!-- Option for always starting on the home screen -->
+    <string name="start_on_home_always">總是</string>
+    <!-- Option for never starting on the home screen -->
+    <string name="start_on_home_never">永不</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
     <string name="close_tabs_manually_summary">手動關閉</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to auto close tabs after one day-->
@@ -1555,7 +1576,7 @@
     <!-- Title of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_title">保護您的登入資訊與密碼</string>
     <!-- Message of warning dialog if users have no device authentication set up -->
-    <string name="logins_warning_dialog_message">設定裝備解鎖圖形、PIN 碼或密碼來保護您儲存下來的登入資訊與密碼，避免別人盜用。</string>
+    <string name="logins_warning_dialog_message">設定裝置解鎖圖形、PIN 碼或密碼來保護您儲存下來的登入資訊與密碼，避免別人盜用。</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">稍後處理</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
@@ -1599,6 +1620,10 @@
     <string name="credit_cards_card_number">卡號</string>
     <!-- The header for the expiration date of a credit card -->
     <string name="credit_cards_expiration_date">到期日</string>
+    <!-- The label for the expiration date month of a credit card -->
+    <string name="credit_cards_expiration_date_month">到期月份</string>
+    <!-- The label for the expiration date year of a credit card -->
+    <string name="credit_cards_expiration_date_year">到期年份</string>
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">持卡人姓名</string>
     <!-- The header for the nickname for a credit card -->
@@ -1620,6 +1645,24 @@
     <!-- Error message for credit card number validation -->
     <string name="credit_cards_number_validation_error_message">請輸入有效的信用卡號</string>
 
+    <!-- Error message for credit card name on card validation -->
+    <string name="credit_cards_name_on_card_validation_error_message">請填寫此欄位</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">解鎖後即可檢視儲存的卡片資訊</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">保護您的信用卡資訊</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">設定裝置解鎖圖形、PIN 碼或密碼來保護您儲存的信用卡資訊，避免別人盜用。</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">立即設定</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">稍後再設</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">裝置解鎖</string>
+
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">解鎖後，即可使用儲存的信用卡資訊</string>
+
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">新增搜尋引擎</string>
     <!-- Title of the Edit search engine screen -->
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 1143fed8a..de00358b1 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -39,4 +39,4 @@
         <item>@string/chrome_scheme</item>
         <item>@string/about_scheme</item>
     </string-array>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 1c8ce3c53..8f71ae4a4 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -27,6 +27,7 @@
     <attr name="toolbarDivider" format="reference"/>
     <attr name="menuCategoryText" format="reference"/>
     <attr name="preferenceSectionHeader" format="reference"/>
+    <attr name="recentlyUsedShareMenu" format="reference" />
 
     <!-- Color used in DefaultToolbarMenu for buttons placed at the end of menu items -->
     <attr name="menuItemButtonTintColor" format="reference"/>
@@ -96,6 +97,7 @@
     </declare-styleable>
 
     <attr name="selectLoginHeaderTextColor" format="reference"/>
+    <attr name="selectCreditCardHeaderTextColor" format="reference"/>
 
     <declare-styleable name="TextPercentageSeekBarPreference">
         <attr format="integer" name="min"/>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 0809ebebf..de34efd09 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,25 +3,17 @@
    - 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/. -->
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Photon colors -->
-    <color name="ink_20_48a">#7A312A65</color>
-    <color name="violet_50_32a">#529059FF</color>
-    <color name="violet_50_48a">#7A9059FF</color>
-    <color name="violet_70_12a">#1F592ACB</color>
-    <color name="dark_grey_90">#15141A</color>
-    <color name="violet_05">#E7DFFF</color>
-
     <!-- Light theme color palette -->
-    <color name="primary_text_light_theme">#20123A</color>
+    <color name="primary_text_light_theme">@color/photonInk80</color>
     <color name="secondary_text_light_theme">@color/photonGrey50</color>
     <color name="contrast_text_light_theme">@color/primary_text_dark_theme</color>
     <color name="caption_text_light_theme">@color/photonLightGrey90</color>
-    <color name="foundation_light_theme">#F9F9FB</color>
-    <color name="inset_light_theme">#E0E0E6</color>
+    <color name="foundation_light_theme">@color/photonLightGrey10</color>
+    <color name="inset_light_theme">@color/photonLightGrey30</color>
     <color name="above_light_theme">#FFF</color>
-    <color name="accent_light_theme">#312A65</color>
-    <color name="accent_bright_light_theme">#592ACB</color>
-    <color name="about_link_normal_theme">#592ACB</color>
+    <color name="accent_light_theme">@color/photonInk20</color>
+    <color name="accent_bright_light_theme">@color/photonViolet70</color>
+    <color name="about_link_normal_theme">@color/photonViolet70</color>
     <color name="accent_high_contrast_light_theme">@color/accent_light_theme</color>
     <color name="tab_ring_light_theme">@color/accent_light_theme</color>
     <color name="neutral_light_theme">@color/photonGrey30</color>
@@ -34,7 +26,7 @@
     <color name="dark_grey_90_gradient_start">#FF15141A</color>
     <color name="dark_grey_90_gradient_end">#0015141A</color>
     <color name="synced_tabs_separator_light_theme">@color/photonLightGrey30</color>
-    <color name="top_site_title_text_light_theme">@color/dark_grey_90</color>
+    <color name="top_site_title_text_light_theme">@color/photonDarkGrey90</color>
     <color name="collection_icon_color_violet_light_theme">#7542E5</color>
     <color name="collection_icon_color_blue_light_theme">#0250BB</color>
     <color name="collection_icon_color_pink_light_theme">#E31587</color>
@@ -47,7 +39,7 @@
     <color name="fill_link_from_clipboard_light_theme">@color/accent_light_theme</color>
     <color name="sync_disconnected_icon_fill_light_theme">#C45A27</color>
     <color name="sync_disconnected_background_light_theme">#FFFDE2</color>
-    <color name="swipe_delete_background_light_theme">#E0E0E6</color>
+    <color name="swipe_delete_background_light_theme">@color/photonLightGrey30</color>
     <color name="onboarding_card_button_light_theme">#F0F0F4</color>
     <color name="onboarding_card_finish_button_light_theme">@color/accent_light_theme</color>
     <color name="onboarding_illustration_selected_light_theme">@color/accent_bright_light_theme</color>
@@ -72,28 +64,28 @@
     <color name="tab_tray_item_selected_background_light_theme">#E5DFF4</color>
     <color name="tab_tray_toolbar_background_light_theme">@color/photonLightGrey10</color>
     <color name="tab_tray_item_divider_light_theme">@color/photonLightGrey30</color>
-    <color name="tab_tray_item_media_stroke">#ffffff</color>
-    <color name="tab_tray_item_media_background_light_theme">#312A65</color>
+    <color name="tab_tray_item_media_stroke">@color/photonWhite</color>
+    <color name="tab_tray_item_media_background_light_theme">@color/photonInk20</color>
     <color name="tab_tray_heading_icon_light_theme">@color/photonInk20</color>
-    <color name="tab_tray_heading_icon_inactive_light_theme">@color/ink_20_48a</color>
+    <color name="tab_tray_heading_icon_inactive_light_theme">@color/photonInk20A48</color>
     <color name="tab_tray_heading_icon_menu_light_theme">@color/accent_normal_theme</color>
     <color name="tab_tray_item_thumbnail_background_light_theme">@color/photonLightGrey10</color>
     <color name="tab_tray_item_thumbnail_icon_light_theme">@color/photonLightGrey60</color>
-    <color name="tab_tray_selected_mask_light_theme">@color/violet_70_12a</color>
+    <color name="tab_tray_selected_mask_light_theme">@color/photonViolet70A12</color>
 
     <!-- Tab History -->
     <color name="tab_history_item_selected_background_light_theme">@color/tab_tray_item_selected_background_light_theme</color>
 
     <!-- Dark theme color palette -->
-    <color name="primary_text_dark_theme">#FBFBFE</color>
+    <color name="primary_text_dark_theme">@color/photonLightGrey05</color>
     <color name="secondary_text_dark_theme">#A7A2B7</color>
     <color name="contrast_text_dark_theme">@color/primary_text_dark_theme</color>
     <color name="caption_text_dark_theme">@color/photonLightGrey70</color>
-    <color name="foundation_dark_theme">#1C1B22</color>
+    <color name="foundation_dark_theme">@color/photonDarkGrey80</color>
     <color name="inset_dark_theme">#32313C</color>
     <color name="above_dark_theme">#32313C</color>
-    <color name="accent_dark_theme">#9059FF</color>
-    <color name="accent_bright_dark_theme">#592ACB</color>
+    <color name="accent_dark_theme">@color/photonViolet50</color>
+    <color name="accent_bright_dark_theme">@color/photonViolet70</color>
     <color name="about_link_dark_theme">#AB71FF</color>
     <color name="accent_high_contrast_dark_theme">#AB71FF</color>
     <color name="tab_ring_dark_theme">@color/accent_dark_theme</color>
@@ -114,7 +106,7 @@
     <color name="toolbar_start_gradient_dark_theme">@color/foundation_dark_theme</color>
     <color name="toolbar_center_gradient_dark_theme">@color/foundation_dark_theme</color>
     <color name="toolbar_end_gradient_dark_theme">@color/foundation_dark_theme</color>
-    <color name="toolbar_divider_color_dark_theme">#52525E</color>
+    <color name="toolbar_divider_color_dark_theme">@color/photonDarkGrey10</color>
     <color name="fill_link_from_clipboard_dark_theme">@color/accent_on_dark_background_normal_theme</color>
     <color name="sync_disconnected_icon_fill_dark_theme">#FFF36E</color>
     <color name="sync_disconnected_background_dark_theme">#5B5846</color>
@@ -131,6 +123,7 @@
     <color name="search_suggestion_indicator_icon_color_dark_theme">#2ac3a2</color>
     <color name="search_suggestion_indicator_icon_bookmark_color_dark_theme">#0090ed</color>
     <color name="preference_section_header_dark_theme">@color/accent_high_contrast_dark_theme</color>
+    <color name="recently_used_share_menu_dark_theme">@color/photonDarkGrey10</color>
 
     <color name="mozac_widget_favicon_background_dark_theme">@color/photonDarkGrey50</color>
     <color name="mozac_widget_favicon_border_dark_theme">@color/photonDarkGrey10</color>
@@ -142,27 +135,27 @@
     <color name="tab_tray_item_selected_background_dark_theme">#412E69</color>
     <color name="tab_tray_toolbar_background_dark_theme">@color/photonDarkGrey50</color>
     <color name="tab_tray_item_divider_dark_theme">@color/photonDarkGrey10</color>
-    <color name="tab_tray_item_media_background_dark_theme">#9059FF</color>
+    <color name="tab_tray_item_media_background_dark_theme">@color/photonViolet50</color>
     <color name="tab_tray_heading_icon_dark_theme">@color/photonViolet50</color>
     <color name="tab_tray_heading_icon_inactive_dark_theme">@color/photonLightGrey05</color>
     <color name="tab_tray_heading_icon_menu_dark_theme">@color/photonLightGrey05</color>
     <color name="tab_tray_item_thumbnail_background_dark_theme">@color/photonDarkGrey50</color>
     <color name="tab_tray_item_thumbnail_icon_dark_theme">@color/photonDarkGrey05</color>
-    <color name="tab_tray_selected_mask_dark_theme">@color/violet_50_32a</color>
+    <color name="tab_tray_selected_mask_dark_theme">@color/photonViolet50A32</color>
 
     <!-- Tab History -->
     <color name="tab_history_item_selected_background_dark_theme">@color/tab_tray_item_selected_background_dark_theme</color>
 
     <!-- Private theme color palette -->
-    <color name="primary_text_private_theme">#FBFBFE</color>
+    <color name="primary_text_private_theme">@color/photonLightGrey05</color>
     <color name="secondary_text_private_theme">#A7A2B7</color>
     <color name="contrast_text_private_theme">@color/primary_text_private_theme</color>
     <color name="caption_text_private_theme">@color/photonLightGrey70</color>
     <color name="foundation_private_theme">#261E4B</color>
     <color name="inset_private_theme">@color/photonInk50</color>
     <color name="above_private_theme">@color/photonInk50</color>
-    <color name="accent_private_theme">#9059FF</color>
-    <color name="accent_bright_private_theme">#592ACB</color>
+    <color name="accent_private_theme">@color/photonViolet50</color>
+    <color name="accent_bright_private_theme">@color/photonViolet70</color>
     <color name="about_link_private_theme">#AB71FF</color>
     <color name="accent_high_contrast_private_theme">#AA71FF</color>
     <color name="tab_ring_private_theme">#F565FF</color>
@@ -178,7 +171,7 @@
     <color name="toolbar_start_gradient_private_theme">#7529A7</color>
     <color name="toolbar_center_gradient_private_theme">#492E85</color>
     <color name="toolbar_end_gradient_private_theme">#383372</color>
-    <color name="toolbar_divider_color_private_theme">#52525E</color>
+    <color name="toolbar_divider_color_private_theme">@color/photonDarkGrey10</color>
     <color name="fill_link_from_clipboard_private_theme">@color/accent_on_dark_background_private_theme</color>
     <color name="menu_category_private_theme">@color/primary_text_private_theme</color>
     <color name="sync_disconnected_icon_fill_private_theme">#C45A27</color>
@@ -205,9 +198,9 @@
     <color name="tab_tray_item_selected_background_private_theme">#422875</color>
     <color name="tab_tray_toolbar_background_private_theme">@color/photonInk50</color>
     <color name="tab_tray_item_divider_private_theme">@color/photonDarkGrey10</color>
-    <color name="tab_tray_item_media_background_private_theme">#9059FF</color>
+    <color name="tab_tray_item_media_background_private_theme">@color/photonViolet50</color>
     <color name="tab_tray_heading_icon_private_theme">@color/photonViolet50</color>
-    <color name="tab_tray_heading_icon_inactive_private_theme">@color/violet_50_48a</color>
+    <color name="tab_tray_heading_icon_inactive_private_theme">@color/photonViolet50A48</color>
 
     <!-- Tab History -->
     <color name="tab_history_item_selected_background_private_theme">@color/tab_tray_item_selected_background_dark_theme</color>
@@ -255,10 +248,12 @@
     <color name="search_suggestion_indicator_icon_color_normal_theme">@color/search_suggestion_indicator_icon_color_light_theme</color>
     <color name="search_suggestion_indicator_icon_bookmark_color_normal_theme">@color/search_suggestion_indicator_icon_bookmark_color_light_theme</color>
     <color name="select_login_header_normal_theme">@color/accent_bright_light_theme</color>
+    <color name="select_credit_card_header_normal_theme">@color/accent_bright_light_theme</color>
     <color name="mozac_widget_favicon_background_normal_theme">@color/mozac_widget_favicon_background_light_theme</color>
     <color name="mozac_widget_favicon_border_normal_theme">@color/mozac_widget_favicon_border_light_theme</color>
     <color name="notification_accent_color_normal_theme">@color/accent_bright_light_theme</color>
     <color name="menu_item_button_normal_theme">@color/menu_item_button_light_theme</color>
+    <color name="recently_used_share_theme">@color/inset_light_theme</color>
 
     <!-- Tab tray -->
     <color name="tab_tray_item_text_normal_theme">@color/tab_tray_item_text_light_theme</color>
@@ -285,7 +280,7 @@
     <color name="top_site_title_text">@color/top_site_title_text_light_theme</color>
     <color name="top_site_pager_dot">@color/photonLightGrey30</color>
     <color name="top_site_pager_dot_selected">@color/photonLightGrey50</color>
-    <color name="top_site_pin_icon_background_tint">@color/photonInk20</color>
+    <color name="top_site_pin_icon_color">@color/foundation_dark_theme</color>
     <color name="top_sites_border_color">@color/photonLightGrey30</color>
 
     <!-- Synced tabs colors-->
@@ -315,8 +310,8 @@
     <color name="library_downloads_icon_background">#D4C1FA</color>
     <color name="library_downloads_icon">#2E2060</color>
 
-    <color name="library_app_links_icon_background">#E0E0E6</color>
-    <color name="library_app_links_icon">#20123A</color>
+    <color name="library_app_links_icon_background">@color/photonLightGrey30</color>
+    <color name="library_app_links_icon">@color/photonInk80</color>
 
     <color name="bookmarks_icon_background_filled">#C60084</color>
     <color name="bookmarks_icon_filled">#FFB4DB</color>
@@ -350,7 +345,7 @@
 
     <!-- Toggle Colors -->
     <color name="toggle_off_knob_light_theme">@color/photonGrey10</color>
-    <color name="toggle_off_track_light_theme">@color/dark_grey_90</color>
+    <color name="toggle_off_track_light_theme">@color/photonDarkGrey90</color>
     <color name="toggle_off_knob_dark_theme">@color/photonLightGrey05</color>
     <color name="toggle_off_track_dark_theme">@color/photonLightGrey05</color>
     <color name="toggle_off_knob_normal_theme">@color/toggle_off_knob_light_theme</color>
@@ -359,7 +354,7 @@
     <!-- Misc colors applied universally-->
     <color name="suggestion_highlight_color">#5C592ACB</color>
     <color name="private_browsing_button_accent_color">@color/foundation_private_theme</color>
-    <color name="white_color">#FBFBFE</color>
+    <color name="white_color">@color/photonLightGrey05</color>
     <color name="neutral_text">@color/white_color</color>
     <color name="disabled_text">#cccccc</color>
     <color name="text_scale_example_text_color">#232749</color>
@@ -374,35 +369,35 @@
 
     <!-- Onboarding colors -->
     <color name="onboarding_padded_background_color">#1F000000</color>
-    <color name="onboarding_card_background_dark">#20123A</color>
+    <color name="onboarding_card_background_dark">@color/photonInk80</color>
     <color name="onboarding_card_primary_text_dark">#FFFFFF</color>
-    <color name="onboarding_card_button_background_dark">#F9F9FB</color>
-    <color name="onboarding_card_button_text_dark">#312A65</color>
+    <color name="onboarding_card_button_background_dark">@color/photonLightGrey10</color>
+    <color name="onboarding_card_button_text_dark">@color/photonInk20</color>
 
     <!-- Share UI -->
     <color name="default_share_background">#E3E2E3</color>
     <color name="device_type_desktop_background">#F091C3</color>
     <color name="device_type_mobile_background">#D4C1FA</color>
-    <color name="device_foreground">#20123A</color>
+    <color name="device_foreground">@color/photonInk80</color>
 
     <!-- Launcher Icon colors -->
     <color name="default_launcher_background">#FDFDFD</color>
     <color name="nightly_launcher_background">#220033</color>
-    <color name="debug_launcher_background">#312A65</color>
+    <color name="debug_launcher_background">@color/photonInk20</color>
     <color name="ic_launcher_background">@color/default_launcher_background</color>
 
     <!-- Button Colors -->
-    <color name="grey_button_color">#E0E0E6</color>
-    <color name="destructive_button_text_color">#C50042</color>
-    <color name="button_text_color">#312A65</color>
+    <color name="grey_button_color">@color/photonLightGrey30</color>
+    <color name="destructive_button_text_color">@color/destructive_normal_theme</color>
+    <color name="button_text_color">@color/photonInk20</color>
 
     <!-- Search Widget -->
     <color name="search_widget_background">@color/white_color</color>
     <color name="search_widget_mic_fill_color">#FF000000</color>
-    <color name="search_widget_text">#737373</color>
+    <color name="search_widget_text">@color/photonGrey50</color>
 
     <!-- Private Browsing Mode Persistent Notification -->
-    <color name="pbm_notification_color">#592ACB</color>
+    <color name="pbm_notification_color">@color/photonViolet70</color>
 
     <!-- Notification Color -->
     <color name="whats_new_notification_color">#00B3F4</color>
@@ -411,7 +406,7 @@
     <color name="static_shortcut_background">#F5F5F5</color>
 
     <!-- SearchView Hint Color -->
-    <color name="search_view_hint_color">#5B5B66</color>
+    <color name="search_view_hint_color">@color/photonDarkGrey05</color>
 
     <!-- TextInputLayout default Error Color -->
     <color name="design_error" tools:override="true">@color/destructive_light_theme</color>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 32440af48..3a0506e8c 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -206,21 +206,21 @@
     <dimen name="account_settings_device_name_min_height">48dp</dimen>
 
     <!-- Top sites  -->
-    <dimen name="top_sites_favicon_size">60dp</dimen>
-    <dimen name="top_sites_favicon_padding">12dp</dimen>
     <dimen name="top_sites_item_size">84dp</dimen>
     <dimen name="top_sites_item_margin_top">8dp</dimen>
     <dimen name="top_sites_item_margin_bottom">12dp</dimen>
     <dimen name="top_sites_text_margin_top">8dp</dimen>
+    <dimen name="top_sites_favicon_size">36dp</dimen>
+    <dimen name="top_sites_favicon_elevation">0dp</dimen>
+    <dimen name="top_sites_favicon_corner_size">4dp</dimen>
+
+    <dimen name="top_sites_card_size">60dp</dimen>
+    <dimen name="top_sites_card_padding">12dp</dimen>
+    <dimen name="top_sites_card_elevation">6dp</dimen>
+    <dimen name="top_sites_card_radius">8dp</dimen>
+    <dimen name="top_sites_card_stroke_width">1dp</dimen>
 
     <!-- Credit Cards Fragment -->
-    <!-- The height of the "Add credit card" button in the Credit Cards fragment.
-         This should be the same value as search_engine_radio_button_height. -->
-    <dimen name="credit_cards_add_credit_card_button_height">48dp</dimen>
-    <!-- The horizontal margin for the "Add credit card" text.
-         This should be the same value as radio_button_padding_horizontal. -->
-    <dimen name="credit_cards_add_credit_card_text_horizontal_margin">16dp</dimen>
-    <dimen name="credit_cards_add_credit_card_text_size">16sp</dimen>
     <dimen name="credit_cards_saved_cards_item_margin_start">16dp</dimen>
     <dimen name="credit_cards_saved_cards_item_margin_end">48dp</dimen>
 
diff --git a/app/src/main/res/values/mozonline_strings.xml b/app/src/main/res/values/mozonline_strings.xml
index 61724501e..a9b52aba1 100644
--- a/app/src/main/res/values/mozonline_strings.xml
+++ b/app/src/main/res/values/mozonline_strings.xml
@@ -36,4 +36,3 @@
     <!-- Instructions on how to access pairing -->
     <string name="sign_in_instructions_cn"><![CDATA[On your computer open Firefox and go to <b>https://firefox.com.cn/pair</b>]]></string>
 </resources>
-
diff --git a/app/src/main/res/values/preference_keys.xml b/app/src/main/res/values/preference_keys.xml
index 6a1996bae..ef1e717e5 100644
--- a/app/src/main/res/values/preference_keys.xml
+++ b/app/src/main/res/values/preference_keys.xml
@@ -91,6 +91,10 @@
     <string name="pref_key_fxa_has_synced_items" translatable="false">pref_key_fxa_has_synced_items</string>
     <string name="pref_key_search_widget_installed" translatable="false">pref_key_search_widget_installed</string>
     <string name="pref_key_saved_logins_sorting_strategy" translatable="false">pref_key_saved_logins_sorting_strategy</string>
+    <!-- Key for credit cards sync preference in the account settings fragment -->
+    <string name="pref_key_sync_credit_cards" translatable="false">pref_key_sync_credit_cards</string>
+    <!-- Key for Address sync preference in the account settings fragment -->
+    <string name="pref_key_sync_address" translatable="false">pref_key_sync_address</string>
 
     <!-- Search Settings -->
     <string name="pref_key_search_engine_list" translatable="false">pref_key_search_engine_list</string>
@@ -177,7 +181,7 @@
     <string name="pref_key_saved_logins" translatable="false">pref_key_saved_logins</string>
     <string name="pref_key_password_sync_logins" translatable="false">pref_key_password_sync_logins</string>
     <string name="pref_key_logins_secure_warning_sync" translatable="false">pref_key_logins_secure_warning_sync</string>
-    <string name="pref_key_logins_secure_warning" translatable="false">pref_key_logins_secure_warning</string>
+    <string name="pref_key_secure_warning" translatable="false">pref_key_secure_warning</string>
 
     <!-- Credit Cards Settings -->
     <!-- Key for the "Credit cards" preference in the "Settings" fragment -->
@@ -186,10 +190,14 @@
     <string name="pref_key_credit_cards_save_and_autofill_cards" translatable="false">pref_key_credit_cards_save_and_autofill_cards</string>
     <!-- Key for the "Sync cards across devices" preference in the "Credit cards" fragment -->
     <string name="pref_key_credit_cards_sync_cards_across_devices" translatable="false">pref_key_credit_cards_sync_cards_across_devices</string>
-    <!-- Key for the "Add credit card" preference in the "Credit cards" fragment -->
-    <string name="pref_key_credit_cards_add_credit_card" translatable="false">pref_key_credit_cards_add_credit_card</string>
     <!-- Key for the "Manage saved cards" preference in the "Credit cards" fragment -->
-    <string name="pref_key_credit_cards_manage_saved_cards" translatable="false">pref_key_credit_cards_manage_saved_cards</string>
+    <string name="pref_key_credit_cards_manage_cards" translatable="false">pref_key_credit_cards_manage_cards</string>
+    <!-- Key for the number of credit cards that have been saved manually by the user metric value -->
+    <string name="pref_key_credit_cards_saved_count" translatable="false">pref_key_credit_cards_saved_count</string>
+    <!-- Key for the number of credit cards that have been deleted by the user metric value -->
+    <string name="pref_key_credit_cards_deleted_count" translatable="false">pref_key_credit_cards_deleted_count</string>
+    <!-- Key for the number of times the user has autofilled a credit card metric value -->
+    <string name="pref_key_credit_cards_autofilled_count" translatable="false">pref_key_credit_cards_autofilled_count</string>
 
     <!-- Privacy Settings -->
     <string name="pref_key_open_links_in_a_private_tab" translatable="false">pref_key_open_links_in_a_private_tab</string>
@@ -252,6 +260,8 @@
 
     <string name="pref_key_default_browser" translatable="false">pref_key_default_browser</string>
 
+    <string name="pref_key_fxa_signed_in" translatable="false">pref_key_fxa_signed_in</string>
+
     <string name="pref_key_login_exceptions" translatable="false">pref_key_login_exceptions</string>
 
     <string name="pref_key_show_collections_placeholder_home" translatable="false">pref_key_show_collections_home</string>
@@ -265,6 +275,7 @@
     <string name="pref_key_close_tabs_after_one_week" translatable="false">pref_key_close_tabs_after_one_week</string>
     <string name="pref_key_close_tabs_after_one_month" translatable="false">pref_key_close_tabs_after_one_month</string>
     <string name="pref_key_new_tabs_tray" translatable="false">pref_key_new_tabs_tray</string>
+    <string name="pref_key_allow_third_party_root_certs" translatable="false">pref_key_allow_third_party_cert_roots</string>
 
     <string name="pref_key_camera_permissions_needed" translatable="false">pref_key_camera_permissions_needed</string>
 
@@ -281,7 +292,6 @@
     <string name="pref_key_search_region_current" translatable="false">pref_key_search_region_current</string>
 
     <!-- Secret Settings -->
-    <string name="pref_key_show_credit_cards_feature" translatable="false">pref_key_show_credit_cards_feature</string>
     <string name="pref_key_show_address_feature" translatable="false">pref_key_show_address_feature</string>
     <string name="pref_key_nimbus_experiments" translatable="false">pref_key_nimbus_experiments</string>
 </resources>
diff --git a/app/src/main/res/values/static_strings.xml b/app/src/main/res/values/static_strings.xml
index cca417637..4045be6d8 100644
--- a/app/src/main/res/values/static_strings.xml
+++ b/app/src/main/res/values/static_strings.xml
@@ -37,12 +37,14 @@
     <string name="preferences_debug_info" translatable="false">Secret Debug Info</string>
     <!-- Label for enabling Address Autofill -->
     <string name="preferences_debug_settings_enable_address_feature" translatable="false">Enable Address Autofill</string>
-    <!-- Label for enabling Credit Card Autofill -->
-    <string name="preferences_debug_settings_enable_credit_cards_feature" translatable="false">Enable Credit Card Autofill</string>
     <!-- Label for the new tabs tray preference -->
     <string name="preferences_debug_settings_tabs_tray_rewrite">Use new Tabs Tray</string>
     <!-- Label for a longer description of the new tabs tray preference -->
     <string name="preferences_debug_settings_tabs_tray_rewrite_summary">A refactored tabs tray that will include Synced Tabs.</string>
+    <!-- Label for allowing third party root certificates from the Android OS CA store preference -->
+    <string name="preferences_debug_settings_allow_third_party_root_certs">Use third party CA certificates</string>
+    <!-- Label for a longer description of allowing third party root certificates from the Android OS CA store preference -->
+    <string name="preferences_debug_settings_allow_third_party_root_certs_summary">Allows the use of third party certificates from the Android CA store</string>
     <!-- Label for the Nimbus experiments preference -->
     <string name="preferences_nimbus_experiments">Nimbus Experiments</string>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e89fd06f6..6345e97d2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -412,6 +412,10 @@
         The first parameter is the application name, the second is the device manufacturer name
         and the third is the device model. -->
     <string name="default_device_name_2">%1$s on %2$s %3$s</string>
+    <!-- Preference for syncing credit cards -->
+    <string name="preferences_sync_credit_cards">Credit cards</string>
+    <!-- Preference for syncing addresses -->
+    <string name="preferences_sync_address">Addresses</string>
 
     <!-- Send Tab -->
     <!-- Name of the "receive tabs" notification channel. Displayed in the "App notifications" system settings for the app -->
@@ -785,8 +789,6 @@
     <string name="bookmark_delete_folder_snackbar">Deleted %1$s</string>
     <!-- Screen title for adding a bookmarks folder -->
     <string name="bookmark_add_folder">Add folder</string>
-    <!-- deprecated: Snackbar title shown after a bookmark has been created. -->
-    <string name="bookmark_created_snackbar">Bookmark created.</string>
     <!-- Snackbar title shown after a bookmark has been created. -->
     <string name="bookmark_saved_snackbar">Bookmark saved!</string>
     <!-- Snackbar edit button shown after a bookmark has been created. -->
@@ -1448,10 +1450,8 @@
     <string name="preferences_passwords_autofill">Autofill</string>
     <!-- Preference for syncing saved logins in Fenix -->
     <string name="preferences_passwords_sync_logins">Sync logins</string>
-    <!-- Syncing saved logins in Fenix is on -->
-    <string name="preferences_passwords_sync_logins_on">On</string>
-    <!-- Syncing saved logins in Fenix is off -->
-    <string name="preferences_passwords_sync_logins_off">Off</string>
+    <!-- Preference for syncing saved logins in Fenix, when not signed in-->
+    <string name="preferences_passwords_sync_logins_across_devices">Sync logins across devices</string>
     <!-- Syncing saved logins in Fenix needs reconnect to sync -->
     <string name="preferences_passwords_sync_logins_reconnect">Reconnect</string>
     <!-- Syncing saved logins in Fenix needs login -->
@@ -1554,6 +1554,8 @@
     <string name="preferences_credit_cards_save_and_autofill_cards_summary">Data is encrypted</string>
     <!-- Preference option for syncing credit cards across devices. This is displayed when the user is not signed into sync -->
     <string name="preferences_credit_cards_sync_cards_across_devices">Sync cards across devices</string>
+    <!-- Preference option for syncing credit cards across devices. This is displayed when the user is signed into sync -->
+    <string name="preferences_credit_cards_sync_cards">Sync cards</string>
     <!-- Preference option for adding a credit card -->
     <string name="preferences_credit_cards_add_credit_card">Add credit card</string>
     <!-- Preference option for managing saved credit cards -->
@@ -1582,6 +1584,22 @@
     <string name="credit_cards_cancel_button">Cancel</string>
     <!-- Title of the "Saved cards" screen -->
     <string name="credit_cards_saved_cards">Saved cards</string>
+    <!-- Error message for credit card number validation -->
+    <string name="credit_cards_number_validation_error_message">Please enter a valid credit card number</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their saved credit cards -->
+    <string name="credit_cards_biometric_prompt_message">Unlock to view your saved cards</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_title">Secure your credit cards</string>
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_message">Set up a device lock pattern, PIN, or password to protect your saved credit cards from being accessed if someone else has your device.</string>
+    <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_set_up_now">Set up now</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="credit_cards_warning_dialog_later">Later</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their credit cards -->
+    <string name="credit_cards_biometric_prompt_message_pin">Unlock your device</string>
+    <!-- Message displayed in biometric prompt for authentication, before allowing users to use their stored credit card information -->
+    <string name="credit_cards_biometric_prompt_unlock_message">Unlock to use stored credit card information</string>
 
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Add search engine</string>
@@ -1770,19 +1788,13 @@
     <!-- Content description for close button in collection placeholder. -->
     <string name="remove_home_collection_placeholder_content_description">Remove</string>
 
-    <!-- Deprecated: text for the firefox account onboarding card header
-    The first parameter is the name of the app (e.g. Firefox Preview) -->
-    <string name="onboarding_firefox_account_header">Get the most out of %s.</string>
-
     <!-- Content description radio buttons with a link to more information -->
     <string name="radio_preference_info_content_description">Click for more details</string>
 
-    <!-- Deprecated: No Open Tabs Message Header -->
-    <string name="no_collections_header1">Collect the things that matter to you</string>
-    <!-- Deprecated: Label to describe what collections are to a new user without any collections -->
-    <string name="no_collections_description1">Group together similar searches, sites, and tabs for quick access later.</string>
-    <!-- Deprecated: text for the firefox account onboarding card header when we detect you're already signed in to -->
-    <string name="onboarding_firefox_account_auto_signin_header_2">You are signed in as %s on another Firefox browser on this phone. Would you like to sign in with this account?</string>
-    <!-- Deprecated: Describes the add to homescreen functionality -->
-    <string name="add_to_homescreen_description">You can easily add this website to your phone’s Home screen to have instant access and browse faster with an app-like experience.</string>
+    <!-- Content description for the action bar "up" button -->
+    <string name="action_bar_up_description">Navigate up</string>
+
+    <!-- Content description for privacy content close button -->
+    <string name="privacy_content_close_button_content_description">Close</string>
+
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 143fd6b7a..9d6230374 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -28,6 +28,7 @@
         <item name="mozacInputLayoutErrorIconColor"
             tools:ignore="UnusedResources">@color/destructive_normal_theme</item>
         <item name="mozacLoginSelectHeaderTextStyle" tools:ignore="UnusedResources">@style/SelectLoginHeaderTextStyle</item>
+        <item name="mozacSelectCreditCardHeaderTextStyle" tools:ignore="UnusedResources">@style/SelectCreditCardHeaderTextStyle</item>
 
         <!-- Active thumb color & Active track color (30% transparency) -->
         <item name="colorControlActivated">@color/accent_high_contrast_normal_theme</item>
@@ -81,8 +82,10 @@
         <item name="awesomeBarIndicatorColor">@color/search_suggestion_indicator_icon_color_normal_theme</item>
         <item name="awesomeBarIndicatorBookmarkColor">@color/search_suggestion_indicator_icon_bookmark_color_normal_theme</item>
         <item name="selectLoginHeaderTextColor">@color/select_login_header_normal_theme</item>
+        <item name="selectCreditCardHeaderTextColor">@color/select_credit_card_header_normal_theme</item>
         <item name="preferenceSectionHeader">@color/preference_section_header_normal_theme</item>
         <item name="menuItemButtonTintColor">@color/menu_item_button_normal_theme</item>
+        <item name="recentlyUsedShareMenu">@color/recently_used_share_theme</item>
 
         <!-- Shared widget colors -->
         <item name="mozac_primary_text_color">@color/primary_text_normal_theme</item>
@@ -136,6 +139,11 @@
         <item name="drawableTint">?accentHighContrast</item>
     </style>
 
+    <style name="SelectCreditCardHeaderTextStyle" parent="Header16TextStyle">
+        <item name="android:textColor">?selectCreditCardHeaderTextColor</item>
+        <item name="drawableTint">?accentHighContrast</item>
+    </style>
+
     <style name="Checkable.Colored" parent="Theme.AppCompat">
         <item name="colorControlActivated">?attr/onboardingSelected</item>
         <item name="colorControlNormal">?attr/onboardingDeselected</item>
@@ -185,6 +193,7 @@
         <item name="mozacInputLayoutErrorIconColor"
             tools:ignore="UnusedResources">@color/destructive_private_theme</item>
         <item name="mozacLoginSelectHeaderTextStyle" tools:ignore="UnusedResources">@style/SelectLoginHeaderTextStyle</item>
+        <item name="mozacSelectCreditCardHeaderTextStyle" tools:ignore="UnusedResources">@style/SelectCreditCardHeaderTextStyle</item>
 
         <!-- Inactive thumb color -->
         <item name="colorSwitchThumbNormal">@color/toggle_off_knob_dark_theme</item>
@@ -233,6 +242,7 @@
         <item name="awesomeBarIndicatorColor">@color/search_suggestion_indicator_icon_color_dark_theme</item>
         <item name="awesomeBarIndicatorBookmarkColor">@color/search_suggestion_indicator_icon_bookmark_color_dark_theme</item>
         <item name="selectLoginHeaderTextColor">@color/accent_high_contrast_private_theme</item>
+        <item name="selectCreditCardHeaderTextColor">@color/accent_high_contrast_private_theme</item>
         <item name="preferenceSectionHeader">@color/preference_section_header_dark_theme</item>
         <item name="menuItemButtonTintColor">@color/accent_high_contrast_private_theme</item>
 
@@ -600,13 +610,29 @@
         <item name="behavior_halfExpandedRatio">0.001</item>
     </style>
 
-    <style name="TopSite.Favicon" parent="Mozac.Widgets.Favicon">
+    <style name="TopSite.FaviconCard" parent="Mozac.Widgets.Favicon">
+        <item name="android:layout_width">@dimen/top_sites_card_size</item>
+        <item name="android:layout_height">@dimen/top_sites_card_size</item>
+        <item name="android:padding">@dimen/top_sites_card_padding</item>
+        <item name="cardBackgroundColor">?mozac_widget_favicon_background_color</item>
+        <item name="cardCornerRadius">@dimen/top_sites_card_radius</item>
+        <item name="cardElevation">@dimen/top_sites_card_elevation</item>
+        <item name="strokeColor">@color/top_sites_border_color</item>
+        <item name="strokeWidth">@dimen/top_sites_card_stroke_width</item>
+    </style>
+
+    <style name="topSiteFavicon">
         <item name="android:layout_width">@dimen/top_sites_favicon_size</item>
         <item name="android:layout_height">@dimen/top_sites_favicon_size</item>
         <item name="android:scaleType">fitCenter</item>
-        <item name="android:padding">@dimen/top_sites_favicon_padding</item>
-        <item name="android:background">@drawable/top_sites_background</item>
-        <item name="android:elevation">6dp</item>
+        <item name="android:layout_gravity">center</item>
+        <item name="shapeAppearanceOverlay">@style/topSiteFaviconShape</item>
+    </style>
+
+    <style name="topSiteFaviconShape">
+        <item name="cornerFamily">rounded</item>
+        <item name="elevation">@dimen/top_sites_favicon_elevation</item>
+        <item name="cornerSize">@dimen/top_sites_favicon_corner_size</item>
     </style>
 
     <style name="TabTrayFab" parent="Widget.MaterialComponents.ExtendedFloatingActionButton">
diff --git a/app/src/main/res/xml/account_settings_preferences.xml b/app/src/main/res/xml/account_settings_preferences.xml
index 0e409fbc4..68894cf73 100644
--- a/app/src/main/res/xml/account_settings_preferences.xml
+++ b/app/src/main/res/xml/account_settings_preferences.xml
@@ -29,6 +29,12 @@
             android:layout="@layout/checkbox_left_preference"
             android:title="@string/preferences_sync_bookmarks" />
 
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="@string/pref_key_sync_credit_cards"
+            android:layout="@layout/checkbox_left_preference"
+            android:title="@string/preferences_sync_credit_cards" />
+
         <CheckBoxPreference
             android:defaultValue="true"
             android:key="@string/pref_key_sync_history"
@@ -42,10 +48,17 @@
             android:title="@string/preferences_sync_logins" />
 
         <CheckBoxPreference
-            android:defaultValue="false"
+            android:defaultValue="true"
             android:key="@string/pref_key_sync_tabs"
             android:layout="@layout/checkbox_left_preference"
             android:title="@string/preferences_sync_tabs_2"/>
 
+        <!-- The default visibility is 'false' because we don't display this on most channels. -->
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:visible="false"
+            android:key="@string/pref_key_sync_address"
+            android:layout="@layout/checkbox_left_preference"
+            android:title="@string/preferences_sync_address" />
     </PreferenceCategory>
 </PreferenceScreen>
diff --git a/app/src/main/res/xml/credit_cards_preferences.xml b/app/src/main/res/xml/credit_cards_preferences.xml
index ea745e992..0dacb36aa 100644
--- a/app/src/main/res/xml/credit_cards_preferences.xml
+++ b/app/src/main/res/xml/credit_cards_preferences.xml
@@ -9,15 +9,13 @@
         android:key="@string/pref_key_credit_cards_save_and_autofill_cards"
         android:summary="@string/preferences_credit_cards_save_and_autofill_cards_summary"
         android:title="@string/preferences_credit_cards_save_and_autofill_cards" />
-    <Preference
+    <org.mozilla.fenix.settings.SyncPreference
         android:key="@string/pref_key_credit_cards_sync_cards_across_devices"
         android:title="@string/preferences_credit_cards_sync_cards_across_devices"
+        app:singleLineTitle="false"
         app:allowDividerBelow="true" />
     <Preference
-        android:key="@string/pref_key_credit_cards_add_credit_card"
-        android:title="@string/preferences_credit_cards_add_credit_card"
-        android:layout="@layout/preference_credit_cards_add_credit_card" />
-    <Preference
-        android:key="@string/pref_key_credit_cards_manage_saved_cards"
-        android:title="@string/preferences_credit_cards_manage_saved_cards" />
+        android:key="@string/pref_key_credit_cards_manage_cards"
+        android:title="@string/preferences_credit_cards_manage_saved_cards"
+        app:allowDividerAbove="true" />
 </PreferenceScreen>
diff --git a/app/src/main/res/xml/logins_preferences.xml b/app/src/main/res/xml/logins_preferences.xml
index 0c003b154..608a23303 100644
--- a/app/src/main/res/xml/logins_preferences.xml
+++ b/app/src/main/res/xml/logins_preferences.xml
@@ -12,9 +12,8 @@
         android:defaultValue="true"
         android:key="@string/pref_key_autofill_logins"
         android:title="@string/preferences_passwords_autofill" />
-    <Preference
-        android:key="@string/pref_key_password_sync_logins"
-        android:summary="@string/preferences_passwords_sync_logins_off"
+    <org.mozilla.fenix.settings.SyncPreference
+        android:key="@string/pref_key_sync_logins"
         android:title="@string/preferences_passwords_sync_logins" />
     <Preference
         android:key="@string/pref_key_saved_logins"
@@ -24,4 +23,3 @@
         android:title="@string/preferences_passwords_exceptions"
         app:icon="@drawable/ic_internet" />
 </PreferenceScreen>
-
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index fa3778b13..ab16a037d 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -73,8 +73,7 @@
         <androidx.preference.Preference
             app:iconSpaceReserved="false"
             android:key="@string/pref_key_credit_cards"
-            android:title="@string/preferences_credit_cards"
-            app:isPreferenceVisible="false" />
+            android:title="@string/preferences_credit_cards" />
 
         <androidx.preference.Preference
             android:key="@string/pref_key_accessibility"
diff --git a/app/src/main/res/xml/search_widget_info.xml b/app/src/main/res/xml/search_widget_info.xml
index ddd4549bf..ce7e44a2a 100644
--- a/app/src/main/res/xml/search_widget_info.xml
+++ b/app/src/main/res/xml/search_widget_info.xml
@@ -12,4 +12,4 @@
     android:updatePeriodMillis="3600000"
     android:initialLayout="@layout/search_widget_large"
     android:widgetCategory="home_screen">
-</appwidget-provider>
\ No newline at end of file
+</appwidget-provider>
diff --git a/app/src/main/res/xml/secret_settings_preferences.xml b/app/src/main/res/xml/secret_settings_preferences.xml
index 851a27964..68066eee0 100644
--- a/app/src/main/res/xml/secret_settings_preferences.xml
+++ b/app/src/main/res/xml/secret_settings_preferences.xml
@@ -9,15 +9,16 @@
         android:key="@string/pref_key_show_address_feature"
         android:title="@string/preferences_debug_settings_enable_address_feature"
         app:iconSpaceReserved="false" />
-    <SwitchPreference
-        android:defaultValue="false"
-        android:key="@string/pref_key_show_credit_cards_feature"
-        android:title="@string/preferences_debug_settings_enable_credit_cards_feature"
-        app:iconSpaceReserved="false" />
     <SwitchPreference
         android:defaultValue="false"
         android:key="@string/pref_key_new_tabs_tray"
         android:title="@string/preferences_debug_settings_tabs_tray_rewrite"
         android:summary="@string/preferences_debug_settings_tabs_tray_rewrite_summary"
         app:iconSpaceReserved="false" />
+    <SwitchPreference
+        android:defaultValue="false"
+        android:key="@string/pref_key_allow_third_party_root_certs"
+        android:title="@string/preferences_debug_settings_allow_third_party_root_certs"
+        android:summary="@string/preferences_debug_settings_allow_third_party_root_certs_summary"
+        app:iconSpaceReserved="false" />
 </PreferenceScreen>
diff --git a/app/src/main/res/xml/shortcuts.xml b/app/src/main/res/xml/shortcuts.xml
index 434607e82..e250a8904 100644
--- a/app/src/main/res/xml/shortcuts.xml
+++ b/app/src/main/res/xml/shortcuts.xml
@@ -26,4 +26,4 @@
             android:targetPackage="org.mozilla.fenix"
             android:targetClass="org.mozilla.fenix.IntentReceiverActivity" />
     </shortcut>
-</shortcuts>
\ No newline at end of file
+</shortcuts>
diff --git a/app/src/test/java/org/mozilla/fenix/FenixApplicationTest.kt b/app/src/test/java/org/mozilla/fenix/FenixApplicationTest.kt
index f1c508960..08a2395f0 100644
--- a/app/src/test/java/org/mozilla/fenix/FenixApplicationTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/FenixApplicationTest.kt
@@ -8,19 +8,30 @@ import androidx.test.core.app.ApplicationProvider
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.verify
+import mozilla.components.browser.state.store.BrowserStore
 import mozilla.components.concept.engine.webextension.DisabledFlags
 import mozilla.components.concept.engine.webextension.Metadata
 import mozilla.components.concept.engine.webextension.WebExtension
 import mozilla.components.feature.addons.migration.DefaultSupportedAddonsChecker
 import mozilla.components.service.glean.testing.GleanTestRule
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.mozilla.fenix.GleanMetrics.Addons
+import org.mozilla.fenix.GleanMetrics.Metrics
 import org.mozilla.fenix.GleanMetrics.PerfStartup
+import org.mozilla.fenix.GleanMetrics.Preferences
+import org.mozilla.fenix.GleanMetrics.SearchDefaultEngine
+import org.mozilla.fenix.components.metrics.MozillaProductDetector
+import org.mozilla.fenix.components.toolbar.ToolbarPosition
 import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
+import org.mozilla.fenix.utils.BrowsersCache
+import org.mozilla.fenix.utils.Settings
 
 @RunWith(FenixRobolectricTestRunner::class)
 class FenixApplicationTest {
@@ -28,10 +39,16 @@ class FenixApplicationTest {
     @get:Rule val gleanTestRule = GleanTestRule(ApplicationProvider.getApplicationContext())
 
     private lateinit var application: FenixApplication
+    private lateinit var browsersCache: BrowsersCache
+    private lateinit var mozillaProductDetector: MozillaProductDetector
+    private lateinit var browserStore: BrowserStore
 
     @Before
     fun setUp() {
         application = ApplicationProvider.getApplicationContext()
+        browsersCache = mockk(relaxed = true)
+        mozillaProductDetector = mockk(relaxed = true)
+        browserStore = BrowserStore()
     }
 
     @Ignore("See https://github.com/mozilla-mobile/fenix/issues/18102")
@@ -69,4 +86,97 @@ class FenixApplicationTest {
 
         verify { checker.unregisterForChecks() }
     }
+
+    @Test
+    fun `WHEN setStartupMetrics is called THEN sets some base metrics`() {
+        val expectedAppName = "org.mozilla.fenix"
+        val settings: Settings = mockk()
+        every { browsersCache.all(any()).isDefaultBrowser } returns true
+        every { mozillaProductDetector.getMozillaBrowserDefault(any()) } returns expectedAppName
+        every { mozillaProductDetector.getInstalledMozillaProducts(any()) } returns listOf(expectedAppName)
+        every { settings.adjustCampaignId } returns "ID"
+        every { settings.adjustAdGroup } returns "group"
+        every { settings.adjustCreative } returns "creative"
+        every { settings.adjustNetwork } returns "network"
+        every { settings.searchWidgetInstalled } returns true
+        every { settings.openTabsCount } returns 1
+        every { settings.topSitesSize } returns 2
+        every { settings.installedAddonsCount } returns 3
+        every { settings.installedAddonsList } returns "test1,test2,test3"
+        every { settings.enabledAddonsCount } returns 2
+        every { settings.enabledAddonsList } returns "test1,test2"
+        every { settings.desktopBookmarksSize } returns 4
+        every { settings.mobileBookmarksSize } returns 5
+        every { settings.toolbarPosition } returns ToolbarPosition.BOTTOM
+        every { settings.getTabViewPingString() } returns "test"
+        every { settings.getTabTimeoutPingString() } returns "test"
+        every { settings.shouldShowSearchSuggestions } returns true
+        every { settings.shouldUseTrackingProtection } returns true
+        every { settings.isRemoteDebuggingEnabled } returns true
+        every { settings.isTelemetryEnabled } returns true
+        every { settings.shouldShowHistorySuggestions } returns true
+        every { settings.shouldShowBookmarkSuggestions } returns true
+        every { settings.shouldShowClipboardSuggestions } returns true
+        every { settings.shouldShowSearchShortcuts } returns true
+        every { settings.openLinksInAPrivateTab } returns true
+        every { settings.shouldShowSearchSuggestionsInPrivate } returns true
+        every { settings.shouldShowVoiceSearch } returns true
+        every { settings.openLinksInExternalApp } returns true
+        every { settings.shouldUseFixedTopToolbar } returns true
+        every { settings.useStandardTrackingProtection } returns true
+        every { settings.switchServiceIsEnabled } returns true
+        every { settings.touchExplorationIsEnabled } returns true
+        every { settings.shouldUseLightTheme } returns true
+        every { settings.signedInFxaAccount } returns true
+        every { settings.creditCardsSavedCount } returns 1
+        every { settings.creditCardsDeletedCount } returns 2
+        every { settings.creditCardsAutofilledCount } returns 3
+
+        application.setStartupMetrics(browserStore, settings, browsersCache, mozillaProductDetector)
+
+        // Verify that browser defaults metrics are set.
+        assertEquals("Mozilla", Metrics.distributionId.testGetValue())
+        assertEquals(true, Metrics.defaultBrowser.testGetValue())
+        assertEquals(expectedAppName, Metrics.defaultMozBrowser.testGetValue())
+        assertEquals(listOf(expectedAppName), Metrics.mozillaProducts.testGetValue())
+        assertEquals("ID", Metrics.adjustCampaign.testGetValue())
+        assertEquals("group", Metrics.adjustAdGroup.testGetValue())
+        assertEquals("creative", Metrics.adjustCreative.testGetValue())
+        assertEquals("network", Metrics.adjustNetwork.testGetValue())
+        assertEquals(true, Metrics.searchWidgetInstalled.testGetValue())
+        assertEquals(true, Metrics.hasOpenTabs.testGetValue())
+        assertEquals(1, Metrics.tabsOpenCount.testGetValue())
+        assertEquals(true, Metrics.hasTopSites.testGetValue())
+        assertEquals(2, Metrics.topSitesCount.testGetValue())
+        assertEquals(true, Addons.hasInstalledAddons.testGetValue())
+        assertEquals(1, Metrics.creditCardsSavedCount.testGetValue())
+        assertEquals(2, Metrics.creditCardsDeletedCount.testGetValue())
+        assertEquals(3, Metrics.creditCardsAutofillCount.testGetValue())
+        assertEquals(listOf("test1", "test2", "test3"), Addons.installedAddons.testGetValue())
+        assertEquals(true, Addons.hasEnabledAddons.testGetValue())
+        assertEquals(listOf("test1", "test2"), Addons.enabledAddons.testGetValue())
+        assertEquals(true, Preferences.searchSuggestionsEnabled.testGetValue())
+        assertEquals(true, Preferences.remoteDebuggingEnabled.testGetValue())
+        assertEquals(true, Preferences.telemetryEnabled.testGetValue())
+        assertEquals(true, Preferences.browsingHistorySuggestion.testGetValue())
+        assertEquals(true, Preferences.bookmarksSuggestion.testGetValue())
+        assertEquals(true, Preferences.clipboardSuggestionsEnabled.testGetValue())
+        assertEquals(true, Preferences.searchShortcutsEnabled.testGetValue())
+        assertEquals(true, Preferences.openLinksInPrivate.testGetValue())
+        assertEquals(true, Preferences.privateSearchSuggestions.testGetValue())
+        assertEquals(true, Preferences.voiceSearchEnabled.testGetValue())
+        assertEquals(true, Preferences.openLinksInAppEnabled.testGetValue())
+        assertEquals(true, Preferences.signedInSync.testGetValue())
+        assertEquals(emptyList<String>(), Preferences.syncItems.testGetValue())
+        assertEquals("fixed_top", Preferences.toolbarPositionSetting.testGetValue())
+        assertEquals("standard", Preferences.enhancedTrackingProtection.testGetValue())
+        assertEquals(listOf("switch", "touch exploration"), Preferences.accessibilityServices.testGetValue())
+        assertEquals("light", Preferences.userTheme.testGetValue())
+
+        // Verify that search engine defaults are NOT set. This test does
+        // not mock most of the objects telemetry is collected from.
+        assertFalse(SearchDefaultEngine.code.testHasValue())
+        assertFalse(SearchDefaultEngine.name.testHasValue())
+        assertFalse(SearchDefaultEngine.submissionUrl.testHasValue())
+    }
 }
diff --git a/app/src/test/java/org/mozilla/fenix/components/AbstractBindingTest.kt b/app/src/test/java/org/mozilla/fenix/components/AbstractBindingTest.kt
deleted file mode 100644
index 55177b86a..000000000
--- a/app/src/test/java/org/mozilla/fenix/components/AbstractBindingTest.kt
+++ /dev/null
@@ -1,71 +0,0 @@
-/* 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/. */
-
-package org.mozilla.fenix.components
-
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.test.TestCoroutineDispatcher
-import mozilla.components.browser.state.action.TabListAction
-import mozilla.components.browser.state.state.BrowserState
-import mozilla.components.browser.state.state.createTab
-import mozilla.components.browser.state.store.BrowserStore
-import mozilla.components.support.test.libstate.ext.waitUntilIdle
-import mozilla.components.support.test.rule.MainCoroutineRule
-import org.junit.Assert.assertTrue
-import org.junit.Rule
-import org.junit.Test
-
-class AbstractBindingTest {
-
-    @OptIn(ExperimentalCoroutinesApi::class)
-    @get:Rule
-    val coroutinesTestRule = MainCoroutineRule(TestCoroutineDispatcher())
-
-    @Test
-    fun `WHEN started THEN onState flow is invoked`() {
-        val store = BrowserStore()
-        var invoked = false
-        val binding = TestBinding(store) {
-            invoked = true
-        }
-
-        binding.start()
-
-        store.waitUntilIdle()
-
-        assertTrue(invoked)
-    }
-
-    @Test
-    fun `WHEN actions are dispatched THEN onState flow is invoked`() {
-        val store = BrowserStore()
-        var invoked = false
-        val binding = TestBinding(store) {
-            if (store.state.tabs.isNotEmpty()) {
-                invoked = true
-            }
-        }
-
-        binding.start()
-
-        store.dispatch(TabListAction.AddTabAction(createTab("https://mozilla.org")))
-
-        store.waitUntilIdle()
-
-        assertTrue(invoked)
-    }
-
-    class TestBinding(
-        store: BrowserStore,
-        private val invoked: (BrowserState) -> Unit
-    ) : AbstractBinding<BrowserState>(store) {
-        override suspend fun onState(flow: Flow<BrowserState>) {
-            flow.collect {
-                invoked(it)
-            }
-        }
-    }
-}
diff --git a/app/src/test/java/org/mozilla/fenix/components/BackgroundServicesTest.kt b/app/src/test/java/org/mozilla/fenix/components/BackgroundServicesTest.kt
index eaf915a60..7fc6a89ba 100644
--- a/app/src/test/java/org/mozilla/fenix/components/BackgroundServicesTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/components/BackgroundServicesTest.kt
@@ -38,6 +38,7 @@ class BackgroundServicesTest {
     fun setup() {
         MockKAnnotations.init(this)
         every { metrics.track(any()) } just Runs
+        every { settings.signedInFxaAccount = any() } just Runs
 
         observer = TelemetryAccountObserver(settings, metrics)
         registry = ObserverRegistry<AccountObserver>().apply { register(observer) }
@@ -49,6 +50,7 @@ class BackgroundServicesTest {
 
         registry.notifyObservers { onAuthenticated(account, AuthType.Signin) }
         verify { metrics.track(Event.SyncAuthSignIn) }
+        verify { settings.signedInFxaAccount = true }
         confirmVerified(metrics, settings)
     }
 
@@ -58,6 +60,7 @@ class BackgroundServicesTest {
 
         registry.notifyObservers { onAuthenticated(account, AuthType.Signup) }
         verify { metrics.track(Event.SyncAuthSignUp) }
+        verify { settings.signedInFxaAccount = true }
         confirmVerified(metrics, settings)
     }
 
@@ -67,6 +70,7 @@ class BackgroundServicesTest {
 
         registry.notifyObservers { onAuthenticated(account, AuthType.Pairing) }
         verify { metrics.track(Event.SyncAuthPaired) }
+        verify { settings.signedInFxaAccount = true }
         confirmVerified(metrics, settings)
     }
 
@@ -76,6 +80,7 @@ class BackgroundServicesTest {
 
         registry.notifyObservers { onAuthenticated(account, AuthType.MigratedReuse) }
         verify { metrics.track(Event.SyncAuthFromSharedReuse) }
+        verify { settings.signedInFxaAccount = true }
         confirmVerified(metrics, settings)
 
         registry.notifyObservers { onAuthenticated(account, AuthType.MigratedCopy) }
@@ -88,6 +93,7 @@ class BackgroundServicesTest {
 
         registry.notifyObservers { onAuthenticated(account, AuthType.Recovered) }
         verify { metrics.track(Event.SyncAuthRecovered) }
+        verify { settings.signedInFxaAccount = true }
         confirmVerified(metrics, settings)
     }
 
@@ -97,6 +103,7 @@ class BackgroundServicesTest {
 
         registry.notifyObservers { onAuthenticated(account, AuthType.OtherExternal(null)) }
         verify { metrics.track(Event.SyncAuthOtherExternal) }
+        verify { settings.signedInFxaAccount = true }
         confirmVerified(metrics, settings)
     }
 
@@ -106,6 +113,7 @@ class BackgroundServicesTest {
 
         registry.notifyObservers { onAuthenticated(account, AuthType.OtherExternal("someAction")) }
         verify { metrics.track(Event.SyncAuthOtherExternal) }
+        verify { settings.signedInFxaAccount = true }
         confirmVerified(metrics, settings)
     }
 
@@ -115,6 +123,7 @@ class BackgroundServicesTest {
 
         registry.notifyObservers { onAuthenticated(account, AuthType.Existing) }
         verify { metrics wasNot Called }
+        verify { settings.signedInFxaAccount = true }
         confirmVerified(metrics, settings)
     }
 
@@ -122,6 +131,7 @@ class BackgroundServicesTest {
     fun `telemetry account observer tracks sign out event`() {
         registry.notifyObservers { onLoggedOut() }
         verify { metrics.track(Event.SyncAuthSignOut) }
+        verify { settings.signedInFxaAccount = false }
         confirmVerified(metrics, settings)
     }
 }
diff --git a/app/src/test/java/org/mozilla/fenix/components/metrics/GleanMetricsServiceTest.kt b/app/src/test/java/org/mozilla/fenix/components/metrics/GleanMetricsServiceTest.kt
index 3ae76d2a1..be12b174a 100644
--- a/app/src/test/java/org/mozilla/fenix/components/metrics/GleanMetricsServiceTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/components/metrics/GleanMetricsServiceTest.kt
@@ -5,10 +5,6 @@
 package org.mozilla.fenix.components.metrics
 
 import io.mockk.MockKAnnotations
-import io.mockk.every
-import io.mockk.impl.annotations.MockK
-import io.mockk.mockk
-import mozilla.components.browser.state.store.BrowserStore
 import mozilla.components.service.glean.testing.GleanTestRule
 import mozilla.components.support.test.robolectric.testContext
 import org.junit.Assert.assertEquals
@@ -23,15 +19,10 @@ import org.mozilla.fenix.GleanMetrics.Awesomebar
 import org.mozilla.fenix.GleanMetrics.BookmarksManagement
 import org.mozilla.fenix.GleanMetrics.Events
 import org.mozilla.fenix.GleanMetrics.History
-import org.mozilla.fenix.GleanMetrics.Metrics
-import org.mozilla.fenix.GleanMetrics.SearchDefaultEngine
 import org.mozilla.fenix.GleanMetrics.SyncedTabs
 import org.mozilla.fenix.GleanMetrics.TabsTray
 import org.mozilla.fenix.GleanMetrics.TabsTrayCfr
-import org.mozilla.fenix.components.toolbar.ToolbarPosition
 import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
-import org.mozilla.fenix.utils.BrowsersCache
-import org.mozilla.fenix.utils.Settings
 
 @RunWith(FenixRobolectricTestRunner::class)
 class GleanMetricsServiceTest {
@@ -40,66 +31,11 @@ class GleanMetricsServiceTest {
 
     private lateinit var gleanService: GleanMetricsService
 
-    @MockK private lateinit var browsersCache: BrowsersCache
-    @MockK private lateinit var mozillaProductDetector: MozillaProductDetector
-
     @Before
     fun setup() {
         MockKAnnotations.init(this)
 
-        val store = BrowserStore()
-        gleanService = GleanMetricsService(testContext, lazy { store }, browsersCache, mozillaProductDetector)
-    }
-
-    @Test
-    fun `setStartupMetrics sets some base metrics`() {
-        val expectedAppName = "org.mozilla.fenix"
-        val settings: Settings = mockk()
-        every { browsersCache.all(any()).isDefaultBrowser } returns true
-        every { mozillaProductDetector.getMozillaBrowserDefault(any()) } returns expectedAppName
-        every { mozillaProductDetector.getInstalledMozillaProducts(any()) } returns listOf(expectedAppName)
-        every { settings.adjustCampaignId } returns "ID"
-        every { settings.adjustAdGroup } returns "group"
-        every { settings.adjustCreative } returns "creative"
-        every { settings.adjustNetwork } returns "network"
-        every { settings.searchWidgetInstalled } returns true
-        every { settings.openTabsCount } returns 1
-        every { settings.topSitesSize } returns 2
-        every { settings.installedAddonsCount } returns 3
-        every { settings.installedAddonsList } returns "test1,test2,test3"
-        every { settings.enabledAddonsCount } returns 2
-        every { settings.enabledAddonsList } returns "test1,test2"
-        every { settings.desktopBookmarksSize } returns 4
-        every { settings.mobileBookmarksSize } returns 5
-        every { settings.toolbarPosition } returns ToolbarPosition.BOTTOM
-        every { settings.getTabViewPingString() } returns "test"
-        every { settings.getTabTimeoutPingString() } returns "test"
-
-        gleanService.setStartupMetrics(settings)
-
-        // Verify that browser defaults metrics are set.
-        assertEquals(true, Metrics.defaultBrowser.testGetValue())
-        assertEquals(expectedAppName, Metrics.defaultMozBrowser.testGetValue())
-        assertEquals(listOf(expectedAppName), Metrics.mozillaProducts.testGetValue())
-        assertEquals("ID", Metrics.adjustCampaign.testGetValue())
-        assertEquals("group", Metrics.adjustAdGroup.testGetValue())
-        assertEquals("creative", Metrics.adjustCreative.testGetValue())
-        assertEquals("network", Metrics.adjustNetwork.testGetValue())
-        assertEquals(true, Metrics.searchWidgetInstalled.testGetValue())
-        assertEquals(true, Metrics.hasOpenTabs.testGetValue())
-        assertEquals(1, Metrics.tabsOpenCount.testGetValue())
-        assertEquals(true, Metrics.hasTopSites.testGetValue())
-        assertEquals(2, Metrics.topSitesCount.testGetValue())
-        assertEquals(true, Addons.hasInstalledAddons.testGetValue())
-        assertEquals(listOf("test1", "test2", "test3"), Addons.installedAddons.testGetValue())
-        assertEquals(true, Addons.hasEnabledAddons.testGetValue())
-        assertEquals(listOf("test1", "test2"), Addons.enabledAddons.testGetValue())
-
-        // Verify that search engine defaults are NOT set. This test does
-        // not mock most of the objects telemetry is collected from.
-        assertFalse(SearchDefaultEngine.code.testHasValue())
-        assertFalse(SearchDefaultEngine.name.testHasValue())
-        assertFalse(SearchDefaultEngine.submissionUrl.testHasValue())
+        gleanService = GleanMetricsService(testContext)
     }
 
     @Test
diff --git a/app/src/test/java/org/mozilla/fenix/components/metrics/MetricControllerTest.kt b/app/src/test/java/org/mozilla/fenix/components/metrics/MetricControllerTest.kt
index 2a824564f..026efeed8 100644
--- a/app/src/test/java/org/mozilla/fenix/components/metrics/MetricControllerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/components/metrics/MetricControllerTest.kt
@@ -10,16 +10,22 @@ import io.mockk.impl.annotations.MockK
 import io.mockk.mockk
 import io.mockk.verify
 import io.mockk.verifyAll
+import mozilla.components.feature.prompts.facts.CreditCardAutofillDialogFacts
 import mozilla.components.feature.top.sites.facts.TopSitesFacts
 import mozilla.components.support.base.Component
 import mozilla.components.support.base.facts.Action
 import mozilla.components.support.base.facts.Fact
 import mozilla.components.support.base.log.logger.Logger
+import mozilla.components.support.test.robolectric.testContext
 import mozilla.components.support.webextensions.facts.WebExtensionFacts
+import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
+import org.junit.runner.RunWith
+import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
 import org.mozilla.fenix.utils.Settings
 
+@RunWith(FenixRobolectricTestRunner::class)
 class MetricControllerTest {
 
     @MockK(relaxUnitFun = true) private lateinit var dataService1: MetricsService
@@ -338,7 +344,7 @@ class MetricControllerTest {
     @Test
     fun `web extension fact should set value in SharedPreference`() {
         val enabled = true
-        val settings: Settings = mockk(relaxed = true)
+        val settings = Settings(testContext)
         val controller = ReleaseMetricController(
             services = listOf(dataService1),
             isDataTelemetryEnabled = { enabled },
@@ -350,19 +356,48 @@ class MetricControllerTest {
             Action.INTERACTION,
             WebExtensionFacts.Items.WEB_EXTENSIONS_INITIALIZED,
             metadata = mapOf(
-                "installed" to listOf("test1"),
-                "enabled" to listOf("test2")
+                "installed" to listOf("test1", "test2", "test3", "test4"),
+                "enabled" to listOf("test2", "test4")
             )
         )
 
-        verify(exactly = 0) { settings.installedAddonsCount = any() }
-        verify(exactly = 0) { settings.installedAddonsList = any() }
-        verify(exactly = 0) { settings.enabledAddonsCount = any() }
-        verify(exactly = 0) { settings.enabledAddonsList = any() }
+        assertEquals(settings.installedAddonsCount, 0)
+        assertEquals(settings.installedAddonsList, "")
+        assertEquals(settings.enabledAddonsCount, 0)
+        assertEquals(settings.enabledAddonsList, "")
+
+        controller.factToEvent(fact)
+
+        assertEquals(settings.installedAddonsCount, 4)
+        assertEquals(settings.installedAddonsList, "test1,test2,test3,test4")
+        assertEquals(settings.enabledAddonsCount, 2)
+        assertEquals(settings.enabledAddonsList, "test2,test4")
+    }
+
+    @Test
+    fun `credit card autofill fact shold set value in SharedPreference`() {
+        val enabled = true
+        val settings = Settings(testContext)
+        val controller = ReleaseMetricController(
+            services = listOf(dataService1),
+            isDataTelemetryEnabled = { enabled },
+            isMarketingDataTelemetryEnabled = { enabled },
+            settings
+        )
+        val fact = Fact(
+            component = Component.FEATURE_PROMPTS,
+            action = Action.INTERACTION,
+            item = CreditCardAutofillDialogFacts.Items.AUTOFILL_CREDIT_CARD_SUCCESS
+        )
+
+        assertEquals(0, settings.creditCardsAutofilledCount)
+
         controller.factToEvent(fact)
-        verify(exactly = 1) { settings.installedAddonsCount = any() }
-        verify(exactly = 1) { settings.installedAddonsList = any() }
-        verify(exactly = 1) { settings.enabledAddonsCount = any() }
-        verify(exactly = 1) { settings.enabledAddonsList = any() }
+
+        assertEquals(1, settings.creditCardsAutofilledCount)
+
+        controller.factToEvent(fact)
+
+        assertEquals(2, settings.creditCardsAutofilledCount)
     }
 }
diff --git a/app/src/test/java/org/mozilla/fenix/components/settings/sitepermissions/ExtensionsTest.kt b/app/src/test/java/org/mozilla/fenix/components/settings/sitepermissions/ExtensionsTest.kt
index 0c91f91d0..a736c9dbb 100644
--- a/app/src/test/java/org/mozilla/fenix/components/settings/sitepermissions/ExtensionsTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/components/settings/sitepermissions/ExtensionsTest.kt
@@ -10,6 +10,7 @@ import io.mockk.verify
 import mozilla.components.browser.state.state.BrowserState
 import mozilla.components.browser.state.state.createTab
 import mozilla.components.browser.state.store.BrowserStore
+import mozilla.components.support.ktx.kotlin.getOrigin
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mozilla.fenix.components.Components
@@ -33,13 +34,13 @@ class ExtensionsTest {
         val components: Components = mockk(relaxed = true)
         every { components.core.store } returns store
 
-        components.tryReloadTabBy("www.getpocket.com")
+        components.tryReloadTabBy("https://www.getpocket.com".getOrigin()!!)
         verify(exactly = 0) { components.useCases.sessionUseCases.reload(any<String>()) }
 
-        components.tryReloadTabBy("www.mozilla.org")
+        components.tryReloadTabBy("https://www.mozilla.org".getOrigin()!!)
         verify { components.useCases.sessionUseCases.reload("2") }
 
-        components.tryReloadTabBy("www.firefox.com")
+        components.tryReloadTabBy("https://www.firefox.com".getOrigin()!!)
         verify { components.useCases.sessionUseCases.reload("3") }
     }
 }
diff --git a/app/src/test/java/org/mozilla/fenix/ext/DownloadItemKtTest.kt b/app/src/test/java/org/mozilla/fenix/ext/DownloadItemKtTest.kt
index e5fdf24b4..8190c4c69 100644
--- a/app/src/test/java/org/mozilla/fenix/ext/DownloadItemKtTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/ext/DownloadItemKtTest.kt
@@ -14,7 +14,15 @@ import org.mozilla.fenix.library.downloads.DownloadItem
 class DownloadItemKtTest {
     @Test
     fun getIcon() {
-        val downloadItem = DownloadItem("0", "MyAwesomeFile", "", "", "image/png", DownloadState.Status.COMPLETED)
+        val downloadItem = DownloadItem(
+            id = "0",
+            url = "url",
+            fileName = "MyAwesomeFile",
+            filePath = "",
+            size = "",
+            contentType = "image/png",
+            status = DownloadState.Status.COMPLETED
+        )
 
         assertEquals(R.drawable.ic_file_type_image, downloadItem.getIcon())
         assertEquals(R.drawable.ic_file_type_audio_note, downloadItem.copy(contentType = "audio/mp3").getIcon())
diff --git a/app/src/test/java/org/mozilla/fenix/ext/ListTest.kt b/app/src/test/java/org/mozilla/fenix/ext/ListTest.kt
index e6ff4a337..2b0a7dbbd 100644
--- a/app/src/test/java/org/mozilla/fenix/ext/ListTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/ext/ListTest.kt
@@ -27,9 +27,33 @@ class ListTest {
         file1.createNewFile()
         file3.createNewFile()
 
-        val item1 = DownloadItem("71", "filepath.txt", filePath1, "71 Mb", "Image/png", DownloadState.Status.COMPLETED)
-        val item2 = DownloadItem("71", "filepath2.txt", "filepath2.txt", "71 Mb", "Image/png", DownloadState.Status.COMPLETED)
-        val item3 = DownloadItem("71", "filepath3.txt", filePath3, "71 Mb", "Image/png", DownloadState.Status.COMPLETED)
+        val item1 = DownloadItem(
+            id = "71",
+            url = "url",
+            fileName = "filepath.txt",
+            filePath = filePath1,
+            size = "71 Mb",
+            contentType = "Image/png",
+            status = DownloadState.Status.COMPLETED
+        )
+        val item2 = DownloadItem(
+            id = "71",
+            url = "url",
+            fileName = "filepath2.txt",
+            filePath = "filepath2.txt",
+            size = "71 Mb",
+            contentType = "Image/png",
+            status = DownloadState.Status.COMPLETED
+        )
+        val item3 = DownloadItem(
+            id = "71",
+            url = "url",
+            fileName = "filepath3.txt",
+            filePath = filePath3,
+            size = "71 Mb",
+            contentType = "Image/png",
+            status = DownloadState.Status.COMPLETED
+        )
 
         val testList = mutableListOf(item1, item2, item3)
         val comparisonList: MutableList<DownloadItem> = mutableListOf(item1, item3)
@@ -58,9 +82,33 @@ class ListTest {
         file2.createNewFile()
         file3.createNewFile()
 
-        val item1 = DownloadItem("71", "filepath.txt", filePath1, "71 Mb", "text/plain", DownloadState.Status.COMPLETED)
-        val item2 = DownloadItem("72", "filepath2.txt", filePath2, "71 Mb", "text/plain", DownloadState.Status.COMPLETED)
-        val item3 = DownloadItem("73", "filepath3.txt", filePath3, "71 Mb", "text/plain", DownloadState.Status.COMPLETED)
+        val item1 = DownloadItem(
+            id = "71",
+            url = "url",
+            fileName = "filepath.txt",
+            filePath = filePath1,
+            size = "71 Mb",
+            contentType = "text/plain",
+            status = DownloadState.Status.COMPLETED
+        )
+        val item2 = DownloadItem(
+            id = "72",
+            url = "url",
+            fileName = "filepath2.txt",
+            filePath = filePath2,
+            size = "71 Mb",
+            contentType = "text/plain",
+            status = DownloadState.Status.COMPLETED
+        )
+        val item3 = DownloadItem(
+            id = "73",
+            url = "url",
+            fileName = "filepath3.txt",
+            filePath = filePath3,
+            size = "71 Mb",
+            contentType = "text/plain",
+            status = DownloadState.Status.COMPLETED
+        )
 
         val testList = mutableListOf(item1, item2, item3)
         val comparisonList: MutableList<DownloadItem> = mutableListOf(item1, item2, item3)
diff --git a/app/src/test/java/org/mozilla/fenix/home/sessioncontrol/viewholders/topsites/TopSiteItemViewHolderTest.kt b/app/src/test/java/org/mozilla/fenix/home/sessioncontrol/viewholders/topsites/TopSiteItemViewHolderTest.kt
index 02b5f5a6c..2b2154fd3 100644
--- a/app/src/test/java/org/mozilla/fenix/home/sessioncontrol/viewholders/topsites/TopSiteItemViewHolderTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/home/sessioncontrol/viewholders/topsites/TopSiteItemViewHolderTest.kt
@@ -6,15 +6,14 @@ package org.mozilla.fenix.home.sessioncontrol.viewholders.topsites
 
 import android.view.LayoutInflater
 import android.view.View
-import android.widget.FrameLayout
-import androidx.core.view.isVisible
+import android.widget.TextView
 import io.mockk.mockk
 import io.mockk.verify
 import kotlinx.android.synthetic.main.top_site_item.view.*
 import mozilla.components.feature.top.sites.TopSite
 import mozilla.components.support.test.robolectric.testContext
-import org.junit.Assert.assertFalse
-import org.junit.Assert.assertTrue
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertNull
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -59,7 +58,7 @@ class TopSiteItemViewHolderTest {
     }
 
     @Test
-    fun `pin indicator is visible for default top sites`() {
+    fun `GIVEN a default top site WHEN bind is called THEN the title has a pin indicator`() {
         val defaultTopSite = TopSite(
             id = 1L,
             title = "Pocket",
@@ -69,13 +68,13 @@ class TopSiteItemViewHolderTest {
         )
 
         TopSiteItemViewHolder(view, interactor).bind(defaultTopSite)
-        val pinIndicator = view.findViewById<FrameLayout>(R.id.pin_indicator)
+        val pinIndicator = view.findViewById<TextView>(R.id.top_site_title).compoundDrawables[0]
 
-        assertTrue(pinIndicator.isVisible)
+        assertNotNull(pinIndicator)
     }
 
     @Test
-    fun `pin indicator is visible for pinned top sites`() {
+    fun `GIVEN a pinned top site WHEN bind is called THEN the title has a pin indicator`() {
         val pinnedTopSite = TopSite(
             id = 1L,
             title = "Mozilla",
@@ -85,13 +84,13 @@ class TopSiteItemViewHolderTest {
         )
 
         TopSiteItemViewHolder(view, interactor).bind(pinnedTopSite)
-        val pinIndicator = view.findViewById<FrameLayout>(R.id.pin_indicator)
+        val pinIndicator = view.findViewById<TextView>(R.id.top_site_title).compoundDrawables[0]
 
-        assertTrue(pinIndicator.isVisible)
+        assertNotNull(pinIndicator)
     }
 
     @Test
-    fun `pin indicator is not visible for frecent top sites`() {
+    fun `GIVEN a frecent top site WHEN bind is called THEN the title does not have a pin indicator`() {
         val frecentTopSite = TopSite(
             id = 1L,
             title = "Mozilla",
@@ -101,8 +100,8 @@ class TopSiteItemViewHolderTest {
         )
 
         TopSiteItemViewHolder(view, interactor).bind(frecentTopSite)
-        val pinIndicator = view.findViewById<FrameLayout>(R.id.pin_indicator)
+        val pinIndicator = view.findViewById<TextView>(R.id.top_site_title).compoundDrawables[0]
 
-        assertFalse(pinIndicator.isVisible)
+        assertNull(pinIndicator)
     }
 }
diff --git a/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkControllerTest.kt b/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkControllerTest.kt
index e2d6c8960..9708a253b 100644
--- a/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkControllerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkControllerTest.kt
@@ -27,6 +27,7 @@ import kotlinx.coroutines.test.TestCoroutineScope
 import mozilla.appservices.places.BookmarkRoot
 import mozilla.components.concept.storage.BookmarkNode
 import mozilla.components.concept.storage.BookmarkNodeType
+import mozilla.components.feature.tabs.TabsUseCases
 import org.junit.After
 import org.junit.Assert.assertEquals
 import org.junit.Before
@@ -54,14 +55,18 @@ class BookmarkControllerTest {
     private val clipboardManager: ClipboardManager = mockk(relaxUnitFun = true)
     private val navController: NavController = mockk(relaxed = true)
     private val sharedViewModel: BookmarksSharedViewModel = mockk()
+    private val tabsUseCases: TabsUseCases = mockk()
     private val loadBookmarkNode: suspend (String) -> BookmarkNode? = mockk(relaxed = true)
     private val showSnackbar: (String) -> Unit = mockk(relaxed = true)
     private val deleteBookmarkNodes: (Set<BookmarkNode>, Event) -> Unit = mockk(relaxed = true)
     private val deleteBookmarkFolder: (Set<BookmarkNode>) -> Unit = mockk(relaxed = true)
     private val invokePendingDeletion: () -> Unit = mockk(relaxed = true)
+    private val showTabTray: () -> Unit = mockk(relaxed = true)
 
     private val homeActivity: HomeActivity = mockk(relaxed = true)
     private val services: Services = mockk(relaxed = true)
+    private val addNewTabUseCase: TabsUseCases.AddNewTabUseCase = mockk(relaxed = true)
+    private val addNewPrivateTabUseCase: TabsUseCases.AddNewPrivateTabUseCase = mockk(relaxed = true)
 
     private val item =
         BookmarkNode(BookmarkNodeType.ITEM, "456", "123", 0, "Mozilla", "http://mozilla.org", null)
@@ -100,6 +105,8 @@ class BookmarkControllerTest {
         }
         every { bookmarkStore.dispatch(any()) } returns mockk()
         every { sharedViewModel.selectedFolder = any() } just runs
+        every { tabsUseCases.addTab } returns addNewTabUseCase
+        every { tabsUseCases.addPrivateTab } returns addNewPrivateTabUseCase
 
         controller = DefaultBookmarkController(
             activity = homeActivity,
@@ -108,11 +115,13 @@ class BookmarkControllerTest {
             scope = scope,
             store = bookmarkStore,
             sharedViewModel = sharedViewModel,
+            tabsUseCases = tabsUseCases,
             loadBookmarkNode = loadBookmarkNode,
             showSnackbar = showSnackbar,
             deleteBookmarkNodes = deleteBookmarkNodes,
             deleteBookmarkFolder = deleteBookmarkFolder,
-            invokePendingDeletion = invokePendingDeletion
+            invokePendingDeletion = invokePendingDeletion,
+            showTabTray = showTabTray
         )
     }
 
@@ -267,6 +276,16 @@ class BookmarkControllerTest {
         }
     }
 
+    @Test
+    fun `handleBookmarkTapped should open the bookmark`() {
+        controller.handleBookmarkTapped(item)
+
+        verifyOrder {
+            invokePendingDeletion.invoke()
+            homeActivity.openToBrowserAndLoad(item.url!!, true, BrowserDirection.FromBookmarks)
+        }
+    }
+
     @Test
     fun `handleOpeningBookmark should open the bookmark a new 'Normal' tab`() {
         controller.handleOpeningBookmark(item, BrowsingMode.Normal)
@@ -274,7 +293,9 @@ class BookmarkControllerTest {
         verifyOrder {
             invokePendingDeletion.invoke()
             homeActivity.browsingModeManager.mode = BrowsingMode.Normal
-            homeActivity.openToBrowserAndLoad(item.url!!, true, BrowserDirection.FromBookmarks)
+            tabsUseCases.addTab
+            addNewTabUseCase.invoke(item.url!!)
+            showTabTray
         }
     }
 
@@ -285,7 +306,9 @@ class BookmarkControllerTest {
         verifyOrder {
             invokePendingDeletion.invoke()
             homeActivity.browsingModeManager.mode = BrowsingMode.Private
-            homeActivity.openToBrowserAndLoad(item.url!!, true, BrowserDirection.FromBookmarks)
+            tabsUseCases.addPrivateTab
+            addNewPrivateTabUseCase.invoke(item.url!!)
+            showTabTray
         }
     }
 
diff --git a/app/src/test/java/org/mozilla/fenix/library/downloads/DownloadControllerTest.kt b/app/src/test/java/org/mozilla/fenix/library/downloads/DownloadControllerTest.kt
index 1cdf21a44..55b92c7fb 100644
--- a/app/src/test/java/org/mozilla/fenix/library/downloads/DownloadControllerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/library/downloads/DownloadControllerTest.kt
@@ -21,7 +21,15 @@ import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
 @ExperimentalCoroutinesApi
 @RunWith(FenixRobolectricTestRunner::class)
 class DownloadControllerTest {
-    private val downloadItem = DownloadItem("0", "title", "url", "77", "jpg", DownloadState.Status.COMPLETED)
+    private val downloadItem = DownloadItem(
+        id = "0",
+        url = "url",
+        fileName = "title",
+        filePath = "url",
+        size = "77",
+        contentType = "jpg",
+        status = DownloadState.Status.COMPLETED
+    )
     private val scope = TestCoroutineScope()
     private val store: DownloadFragmentStore = mockk(relaxed = true)
     private val state: DownloadFragmentState = mockk(relaxed = true)
diff --git a/app/src/test/java/org/mozilla/fenix/library/downloads/DownloadFragmentStoreTest.kt b/app/src/test/java/org/mozilla/fenix/library/downloads/DownloadFragmentStoreTest.kt
index be7889ac4..6cc0dd443 100644
--- a/app/src/test/java/org/mozilla/fenix/library/downloads/DownloadFragmentStoreTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/library/downloads/DownloadFragmentStoreTest.kt
@@ -11,8 +11,24 @@ import org.junit.Assert.assertNotSame
 import org.junit.Test
 
 class DownloadFragmentStoreTest {
-    private val downloadItem = DownloadItem("0", "title", "url", "77", "jpg", DownloadState.Status.COMPLETED)
-    private val newDownloadItem = DownloadItem("1", "title", "url", "77", "jpg", DownloadState.Status.COMPLETED)
+    private val downloadItem = DownloadItem(
+        id = "0",
+        url = "url",
+        fileName = "title",
+        filePath = "url",
+        size = "77",
+        contentType = "jpg",
+        status = DownloadState.Status.COMPLETED
+    )
+    private val newDownloadItem = DownloadItem(
+        id = "1",
+        url = "url",
+        fileName = "title",
+        filePath = "url",
+        size = "77",
+        contentType = "jpg",
+        status = DownloadState.Status.COMPLETED
+    )
 
     @Test
     fun exitEditMode() = runBlocking {
diff --git a/app/src/test/java/org/mozilla/fenix/library/downloads/DownloadFragmentTest.kt b/app/src/test/java/org/mozilla/fenix/library/downloads/DownloadFragmentTest.kt
index b2b6d889f..726cfa9a4 100644
--- a/app/src/test/java/org/mozilla/fenix/library/downloads/DownloadFragmentTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/library/downloads/DownloadFragmentTest.kt
@@ -45,28 +45,31 @@ class DownloadFragmentTest {
 
         val expectedList = listOf(
             DownloadItem(
-                "3",
-                "3.pdf",
-                downloadedFile3.path,
-                "0",
-                null,
-                DownloadState.Status.COMPLETED
+                id = "3",
+                url = "url",
+                fileName = "3.pdf",
+                filePath = downloadedFile3.path,
+                size = "0",
+                contentType = null,
+                status = DownloadState.Status.COMPLETED
             ),
             DownloadItem(
-                "2",
-                "2.pdf",
-                downloadedFile2.path,
-                "0",
-                null,
-                DownloadState.Status.COMPLETED
+                id = "2",
+                url = "url",
+                fileName = "2.pdf",
+                filePath = downloadedFile2.path,
+                size = "0",
+                contentType = null,
+                status = DownloadState.Status.COMPLETED
             ),
             DownloadItem(
-                "1",
-                "1.pdf",
-                downloadedFile1.path,
-                "0",
-                null,
-                DownloadState.Status.COMPLETED
+                id = "1",
+                url = "url",
+                fileName = "1.pdf",
+                filePath = downloadedFile1.path,
+                size = "0",
+                contentType = null,
+                status = DownloadState.Status.COMPLETED
             )
         )
 
@@ -118,12 +121,13 @@ class DownloadFragmentTest {
 
         val expectedList = listOf(
             DownloadItem(
-                "1",
-                "1.pdf",
-                downloadedFile0.path,
-                "0",
-                null,
-                DownloadState.Status.COMPLETED
+                id = "1",
+                url = "url",
+                fileName = "1.pdf",
+                filePath = downloadedFile0.path,
+                size = "0",
+                contentType = null,
+                status = DownloadState.Status.COMPLETED
             )
         )
 
diff --git a/app/src/test/java/org/mozilla/fenix/library/downloads/DownloadInteractorTest.kt b/app/src/test/java/org/mozilla/fenix/library/downloads/DownloadInteractorTest.kt
index b7ace6a3e..dc3386deb 100644
--- a/app/src/test/java/org/mozilla/fenix/library/downloads/DownloadInteractorTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/library/downloads/DownloadInteractorTest.kt
@@ -12,7 +12,15 @@ import org.junit.Assert.assertTrue
 import org.junit.Test
 
 class DownloadInteractorTest {
-    private val downloadItem = DownloadItem("0", "title", "url", "5.6 mb", "png", DownloadState.Status.COMPLETED)
+    private val downloadItem = DownloadItem(
+        id = "0",
+        url = "url",
+        fileName = "title",
+        filePath = "filePath",
+        size = "5.6 mb",
+        contentType = "png",
+        status = DownloadState.Status.COMPLETED
+    )
     val controller: DownloadController = mockk(relaxed = true)
     val interactor = DownloadInteractor(controller)
 
diff --git a/app/src/test/java/org/mozilla/fenix/library/history/HistoryControllerTest.kt b/app/src/test/java/org/mozilla/fenix/library/history/HistoryControllerTest.kt
index 601c8cc41..ea03f239d 100644
--- a/app/src/test/java/org/mozilla/fenix/library/history/HistoryControllerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/library/history/HistoryControllerTest.kt
@@ -41,7 +41,8 @@ class HistoryControllerTest {
     private val resources: Resources = mockk(relaxed = true)
     private val snackbar: FenixSnackbar = mockk(relaxed = true)
     private val clipboardManager: ClipboardManager = mockk(relaxed = true)
-    private val openInBrowser: (HistoryItem, BrowsingMode?) -> Unit = mockk(relaxed = true)
+    private val openInBrowser: (HistoryItem) -> Unit = mockk(relaxed = true)
+    private val openAndShowTray: (HistoryItem, BrowsingMode) -> Unit = mockk(relaxed = true)
     private val displayDeleteAll: () -> Unit = mockk(relaxed = true)
     private val invalidateOptionsMenu: () -> Unit = mockk(relaxed = true)
     private val deleteHistoryItems: (Set<HistoryItem>) -> Unit = mockk(relaxed = true)
@@ -55,6 +56,7 @@ class HistoryControllerTest {
         clipboardManager,
         scope,
         openInBrowser,
+        openAndShowTray,
         displayDeleteAll,
         invalidateOptionsMenu,
         deleteHistoryItems,
@@ -77,25 +79,25 @@ class HistoryControllerTest {
         controller.handleOpen(historyItem)
 
         verify {
-            openInBrowser(historyItem, null)
+            openInBrowser(historyItem)
         }
     }
 
     @Test
     fun onOpenItemInNormalMode() {
-        controller.handleOpen(historyItem, BrowsingMode.Normal)
+        controller.handleOpenInNewTab(historyItem, BrowsingMode.Normal)
 
         verify {
-            openInBrowser(historyItem, BrowsingMode.Normal)
+            openAndShowTray(historyItem, BrowsingMode.Normal)
         }
     }
 
     @Test
     fun onOpenItemInPrivateMode() {
-        controller.handleOpen(historyItem, BrowsingMode.Private)
+        controller.handleOpenInNewTab(historyItem, BrowsingMode.Private)
 
         verify {
-            openInBrowser(historyItem, BrowsingMode.Private)
+            openAndShowTray(historyItem, BrowsingMode.Private)
         }
     }
 
diff --git a/app/src/test/java/org/mozilla/fenix/library/history/HistoryInteractorTest.kt b/app/src/test/java/org/mozilla/fenix/library/history/HistoryInteractorTest.kt
index 05e054b3e..4d5365657 100644
--- a/app/src/test/java/org/mozilla/fenix/library/history/HistoryInteractorTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/library/history/HistoryInteractorTest.kt
@@ -89,7 +89,7 @@ class HistoryInteractorTest {
         interactor.onOpenInNormalTab(historyItem)
 
         verifyAll {
-            controller.handleOpen(historyItem, BrowsingMode.Normal)
+            controller.handleOpenInNewTab(historyItem, BrowsingMode.Normal)
         }
     }
 
@@ -98,7 +98,7 @@ class HistoryInteractorTest {
         interactor.onOpenInPrivateTab(historyItem)
 
         verifyAll {
-            controller.handleOpen(historyItem, BrowsingMode.Private)
+            controller.handleOpenInNewTab(historyItem, BrowsingMode.Private)
         }
     }
 
diff --git a/app/src/test/java/org/mozilla/fenix/nimbus/NimbusBranchesControllerTest.kt b/app/src/test/java/org/mozilla/fenix/nimbus/NimbusBranchesControllerTest.kt
new file mode 100644
index 000000000..6f436f4b3
--- /dev/null
+++ b/app/src/test/java/org/mozilla/fenix/nimbus/NimbusBranchesControllerTest.kt
@@ -0,0 +1,48 @@
+/* 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/. */
+
+package org.mozilla.fenix.nimbus
+
+import io.mockk.mockk
+import io.mockk.verify
+import mozilla.components.service.nimbus.NimbusApi
+import mozilla.components.support.test.libstate.ext.waitUntilIdle
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import org.mozilla.experiments.nimbus.Branch
+import org.mozilla.fenix.nimbus.controller.NimbusBranchesController
+
+class NimbusBranchesControllerTest {
+
+    private val experiments: NimbusApi = mockk(relaxed = true)
+    private val experimentId = "id"
+
+    private lateinit var controller: NimbusBranchesController
+    private lateinit var nimbusBranchesStore: NimbusBranchesStore
+
+    @Before
+    fun setup() {
+        nimbusBranchesStore = NimbusBranchesStore(NimbusBranchesState(emptyList()))
+        controller = NimbusBranchesController(nimbusBranchesStore, experiments, experimentId)
+    }
+
+    @Test
+    fun `WHEN branch item is clicked THEN branch is opted into and selectedBranch state is updated`() {
+        val branch = Branch(
+            slug = "slug",
+            ratio = 1
+        )
+
+        controller.onBranchItemClicked(branch)
+
+        nimbusBranchesStore.waitUntilIdle()
+
+        verify {
+            experiments.optInWithBranch(experimentId, branch.slug)
+        }
+
+        assertEquals(branch.slug, nimbusBranchesStore.state.selectedBranch)
+    }
+}
diff --git a/app/src/test/java/org/mozilla/fenix/nimbus/NimbusBranchesStoreTest.kt b/app/src/test/java/org/mozilla/fenix/nimbus/NimbusBranchesStoreTest.kt
new file mode 100644
index 000000000..f47fe8e2e
--- /dev/null
+++ b/app/src/test/java/org/mozilla/fenix/nimbus/NimbusBranchesStoreTest.kt
@@ -0,0 +1,52 @@
+/* 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/. */
+
+package org.mozilla.fenix.nimbus
+
+import io.mockk.mockk
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Test
+import org.mozilla.experiments.nimbus.Branch
+
+class NimbusBranchesStoreTest {
+
+    private lateinit var nimbusBranchesState: NimbusBranchesState
+    private lateinit var nimbusBranchesStore: NimbusBranchesStore
+
+    @Before
+    fun setup() {
+        nimbusBranchesState = NimbusBranchesState(branches = emptyList())
+        nimbusBranchesStore = NimbusBranchesStore(nimbusBranchesState)
+    }
+
+    @Test
+    fun `GIVEN a new branch and selected branch WHEN UpdateBranches action is dispatched THEN state is updated`() = runBlocking {
+        assertTrue(nimbusBranchesStore.state.isLoading)
+
+        val branches: List<Branch> = listOf(mockk(), mockk())
+        val selectedBranch = "control"
+
+        nimbusBranchesStore.dispatch(NimbusBranchesAction.UpdateBranches(branches, selectedBranch))
+            .join()
+
+        assertEquals(branches, nimbusBranchesStore.state.branches)
+        assertEquals(selectedBranch, nimbusBranchesStore.state.selectedBranch)
+        assertFalse(nimbusBranchesStore.state.isLoading)
+    }
+
+    @Test
+    fun `GIVEN a new selected branch WHEN UpdateSelectedBranch action is dispatched THEN selectedBranch state is updated`() = runBlocking {
+        assertEquals("", nimbusBranchesStore.state.selectedBranch)
+
+        val selectedBranch = "control"
+
+        nimbusBranchesStore.dispatch(NimbusBranchesAction.UpdateSelectedBranch(selectedBranch)).join()
+
+        assertEquals(selectedBranch, nimbusBranchesStore.state.selectedBranch)
+    }
+}
diff --git a/app/src/test/java/org/mozilla/fenix/settings/creditcards/CreditCardEditorStateTest.kt b/app/src/test/java/org/mozilla/fenix/settings/creditcards/CreditCardEditorStateTest.kt
index 7e5e4b68b..acda1e412 100644
--- a/app/src/test/java/org/mozilla/fenix/settings/creditcards/CreditCardEditorStateTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/settings/creditcards/CreditCardEditorStateTest.kt
@@ -4,7 +4,13 @@
 
 package org.mozilla.fenix.settings.creditcards
 
+import io.mockk.every
+import io.mockk.mockk
 import mozilla.components.concept.storage.CreditCard
+import mozilla.components.concept.storage.CreditCardNumber
+import mozilla.components.service.sync.autofill.AutofillCreditCardsAddressesStorage
+import mozilla.components.service.sync.autofill.AutofillCrypto
+import mozilla.components.support.utils.CreditCardNetworkType
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
@@ -14,13 +20,15 @@ import java.util.Calendar
 
 class CreditCardEditorStateTest {
 
+    private val cardNumber = "4111111111111110"
     private val creditCard = CreditCard(
         guid = "id",
         billingName = "Banana Apple",
-        cardNumber = "4111111111111110",
+        encryptedCardNumber = CreditCardNumber.Encrypted(cardNumber),
+        cardNumberLast4 = "1110",
         expiryMonth = 5,
         expiryYear = 2030,
-        cardType = "amex",
+        cardType = CreditCardNetworkType.AMEX.cardName,
         timeCreated = 1L,
         timeLastUsed = 1L,
         timeLastModified = 1L,
@@ -29,14 +37,20 @@ class CreditCardEditorStateTest {
 
     @Test
     fun testToCreditCardEditorState() {
-        val state = creditCard.toCreditCardEditorState()
+        val storage: AutofillCreditCardsAddressesStorage = mockk(relaxed = true)
+        val crypto: AutofillCrypto = mockk(relaxed = true)
+
+        every { storage.getCreditCardCrypto() } returns crypto
+        every { crypto.decrypt(any(), any()) } returns CreditCardNumber.Plaintext(cardNumber)
+
+        val state = creditCard.toCreditCardEditorState(storage)
         val startYear = creditCard.expiryYear.toInt()
         val endYear = startYear + NUMBER_OF_YEARS_TO_SHOW
 
         with(state) {
             assertEquals(creditCard.guid, guid)
             assertEquals(creditCard.billingName, billingName)
-            assertEquals(creditCard.cardNumber, cardNumber)
+            assertEquals(creditCard.encryptedCardNumber.number, cardNumber)
             assertEquals(creditCard.expiryMonth.toInt(), expiryMonth)
             assertEquals(Pair(startYear, endYear), expiryYears)
             assertTrue(isEditing)
diff --git a/app/src/test/java/org/mozilla/fenix/settings/creditcards/CreditCardEditorViewTest.kt b/app/src/test/java/org/mozilla/fenix/settings/creditcards/CreditCardEditorViewTest.kt
index 9e97a96f7..8ad70ad58 100644
--- a/app/src/test/java/org/mozilla/fenix/settings/creditcards/CreditCardEditorViewTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/settings/creditcards/CreditCardEditorViewTest.kt
@@ -6,20 +6,28 @@ package org.mozilla.fenix.settings.creditcards
 
 import android.view.LayoutInflater
 import android.view.View
+import io.mockk.every
 import io.mockk.mockk
+import io.mockk.spyk
 import io.mockk.verify
 import kotlinx.android.synthetic.main.fragment_credit_card_editor.view.*
 import mozilla.components.concept.storage.CreditCard
+import mozilla.components.concept.storage.CreditCardNumber
+import mozilla.components.concept.storage.NewCreditCardFields
 import mozilla.components.concept.storage.UpdatableCreditCardFields
+import mozilla.components.service.sync.autofill.AutofillCreditCardsAddressesStorage
+import mozilla.components.service.sync.autofill.AutofillCrypto
 import mozilla.components.support.test.robolectric.testContext
+import mozilla.components.support.utils.CreditCardNetworkType
 import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mozilla.fenix.R
 import org.mozilla.fenix.ext.toEditable
 import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
-import org.mozilla.fenix.settings.creditcards.CreditCardEditorFragment.Companion.CARD_TYPE_PLACEHOLDER
 import org.mozilla.fenix.settings.creditcards.CreditCardEditorFragment.Companion.NUMBER_OF_YEARS_TO_SHOW
 import org.mozilla.fenix.settings.creditcards.interactor.CreditCardEditorInteractor
 import org.mozilla.fenix.settings.creditcards.view.CreditCardEditorView
@@ -31,14 +39,18 @@ class CreditCardEditorViewTest {
     private lateinit var view: View
     private lateinit var interactor: CreditCardEditorInteractor
     private lateinit var creditCardEditorView: CreditCardEditorView
+    private lateinit var storage: AutofillCreditCardsAddressesStorage
+    private lateinit var crypto: AutofillCrypto
 
+    private val cardNumber = "4111111111111111"
     private val creditCard = CreditCard(
         guid = "id",
         billingName = "Banana Apple",
-        cardNumber = "4111111111111110",
+        encryptedCardNumber = CreditCardNumber.Encrypted(cardNumber),
+        cardNumberLast4 = "1111",
         expiryMonth = 5,
         expiryYear = 2030,
-        cardType = "amex",
+        cardType = CreditCardNetworkType.VISA.cardName,
         timeCreated = 1L,
         timeLastUsed = 1L,
         timeLastModified = 1L,
@@ -49,8 +61,13 @@ class CreditCardEditorViewTest {
     fun setup() {
         view = LayoutInflater.from(testContext).inflate(R.layout.fragment_credit_card_editor, null)
         interactor = mockk(relaxed = true)
+        storage = mockk(relaxed = true)
+        crypto = mockk(relaxed = true)
 
-        creditCardEditorView = CreditCardEditorView(view, interactor)
+        every { storage.getCreditCardCrypto() } returns crypto
+        every { crypto.decrypt(any(), any()) } returns CreditCardNumber.Plaintext(cardNumber)
+
+        creditCardEditorView = spyk(CreditCardEditorView(view, interactor))
     }
 
     @Test
@@ -81,9 +98,9 @@ class CreditCardEditorViewTest {
 
     @Test
     fun `GIVEN a credit card THEN credit card form inputs are displaying the provided credit card information`() {
-        creditCardEditorView.bind(creditCard.toCreditCardEditorState())
+        creditCardEditorView.bind(creditCard.toCreditCardEditorState(storage))
 
-        assertEquals(creditCard.cardNumber, view.card_number_input.text.toString())
+        assertEquals(cardNumber, view.card_number_input.text.toString())
         assertEquals(creditCard.billingName, view.name_on_card_input.text.toString())
 
         with(view.expiry_month_drop_down) {
@@ -102,7 +119,7 @@ class CreditCardEditorViewTest {
 
     @Test
     fun `GIVEN a credit card WHEN the delete card button is clicked THEN interactor is called`() {
-        creditCardEditorView.bind(creditCard.toCreditCardEditorState())
+        creditCardEditorView.bind(creditCard.toCreditCardEditorState(storage))
 
         assertEquals(View.VISIBLE, view.delete_button.visibility)
 
@@ -121,13 +138,13 @@ class CreditCardEditorViewTest {
     }
 
     @Test
-    fun `GIVEN the credit input are filled WHEN the save button is clicked THEN interactor is called`() {
+    fun `GIVEN invalid credit card number WHEN the save button is clicked THEN interactor is not called`() {
         creditCardEditorView.bind(getInitialCreditCardEditorState())
 
         val calendar = Calendar.getInstance()
 
         val billingName = "Banana Apple"
-        val cardNumber = "4111111111111110"
+        val cardNumber = "2221000000000000"
         val expiryMonth = 5
         val expiryYear = calendar.get(Calendar.YEAR)
 
@@ -137,22 +154,66 @@ class CreditCardEditorViewTest {
 
         view.save_button.performClick()
 
+        verify {
+            creditCardEditorView.validateCreditCard()
+        }
+
+        assertFalse(creditCardEditorView.validateCreditCard())
+
+        verify(exactly = 0) {
+            interactor.onSaveCreditCard(
+                NewCreditCardFields(
+                    billingName = billingName,
+                    plaintextCardNumber = CreditCardNumber.Plaintext(cardNumber),
+                    cardNumberLast4 = "0000",
+                    expiryMonth = expiryMonth.toLong(),
+                    expiryYear = expiryYear.toLong(),
+                    cardType = CreditCardNetworkType.MASTERCARD.cardName
+                )
+            )
+        }
+    }
+
+    @Test
+    fun `GIVEN valid credit card number WHEN the save button is clicked THEN interactor is called`() {
+        creditCardEditorView.bind(getInitialCreditCardEditorState())
+
+        val calendar = Calendar.getInstance()
+
+        val billingName = "Banana Apple"
+        val cardNumber = "2720994326581252"
+        val expiryMonth = 5
+        val expiryYear = calendar.get(Calendar.YEAR)
+
+        view.card_number_input.text = cardNumber.toEditable()
+        view.name_on_card_input.text = billingName.toEditable()
+        view.expiry_month_drop_down.setSelection(expiryMonth - 1)
+
+        view.save_button.performClick()
+
+        verify {
+            creditCardEditorView.validateCreditCard()
+        }
+
+        assertTrue(creditCardEditorView.validateCreditCard())
+
         verify {
             interactor.onSaveCreditCard(
-                UpdatableCreditCardFields(
+                NewCreditCardFields(
                     billingName = billingName,
-                    cardNumber = cardNumber,
+                    plaintextCardNumber = CreditCardNumber.Plaintext(cardNumber),
+                    cardNumberLast4 = "1252",
                     expiryMonth = expiryMonth.toLong(),
                     expiryYear = expiryYear.toLong(),
-                    cardType = CARD_TYPE_PLACEHOLDER
+                    cardType = CreditCardNetworkType.MASTERCARD.cardName
                 )
             )
         }
     }
 
     @Test
-    fun `GIVEN a credit card WHEN the save button is clicked THEN interactor is called`() {
-        creditCardEditorView.bind(creditCard.toCreditCardEditorState())
+    fun `GIVEN a valid credit card WHEN the save button is clicked THEN interactor is called`() {
+        creditCardEditorView.bind(creditCard.toCreditCardEditorState(storage))
 
         view.save_button.performClick()
 
@@ -161,10 +222,11 @@ class CreditCardEditorViewTest {
                 guid = creditCard.guid,
                 creditCardFields = UpdatableCreditCardFields(
                     billingName = creditCard.billingName,
-                    cardNumber = creditCard.cardNumber,
+                    cardNumber = CreditCardNumber.Plaintext(cardNumber),
+                    cardNumberLast4 = creditCard.cardNumberLast4,
                     expiryMonth = creditCard.expiryMonth,
                     expiryYear = creditCard.expiryYear,
-                    cardType = CARD_TYPE_PLACEHOLDER
+                    cardType = creditCard.cardType
                 )
             )
         }
diff --git a/app/src/test/java/org/mozilla/fenix/settings/creditcards/CreditCardItemViewHolderTest.kt b/app/src/test/java/org/mozilla/fenix/settings/creditcards/CreditCardItemViewHolderTest.kt
index 81c6077ab..daf7ccc78 100644
--- a/app/src/test/java/org/mozilla/fenix/settings/creditcards/CreditCardItemViewHolderTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/settings/creditcards/CreditCardItemViewHolderTest.kt
@@ -10,7 +10,9 @@ import io.mockk.mockk
 import io.mockk.verify
 import kotlinx.android.synthetic.main.credit_card_list_item.view.*
 import mozilla.components.concept.storage.CreditCard
+import mozilla.components.concept.storage.CreditCardNumber
 import mozilla.components.support.test.robolectric.testContext
+import mozilla.components.support.utils.CreditCardNetworkType
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
@@ -28,10 +30,11 @@ class CreditCardItemViewHolderTest {
     private val creditCard = CreditCard(
         guid = "id",
         billingName = "Banana Apple",
-        cardNumber = "4111111111111110",
+        encryptedCardNumber = CreditCardNumber.Encrypted("4111111111111110"),
+        cardNumberLast4 = "1110",
         expiryMonth = 1,
         expiryYear = 2030,
-        cardType = "amex",
+        cardType = CreditCardNetworkType.AMEX.cardName,
         timeCreated = 1L,
         timeLastUsed = 1L,
         timeLastModified = 1L,
@@ -48,7 +51,7 @@ class CreditCardItemViewHolderTest {
     fun `GIVEN a new credit card item on bind THEN set the card number and expiry date text`() {
         CreditCardItemViewHolder(view, interactor).bind(creditCard)
 
-        assertEquals(creditCard.cardNumber, view.credit_card_number.text)
+        assertEquals(creditCard.obfuscatedCardNumber, view.credit_card_number.text)
         assertEquals("0${creditCard.expiryMonth}/${creditCard.expiryYear}", view.expiry_date.text)
     }
 
diff --git a/app/src/test/java/org/mozilla/fenix/settings/creditcards/CreditCardsAdapterTest.kt b/app/src/test/java/org/mozilla/fenix/settings/creditcards/CreditCardsAdapterTest.kt
index 001701e97..1f74564e0 100644
--- a/app/src/test/java/org/mozilla/fenix/settings/creditcards/CreditCardsAdapterTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/settings/creditcards/CreditCardsAdapterTest.kt
@@ -5,6 +5,8 @@
 package org.mozilla.fenix.settings.creditcards
 
 import mozilla.components.concept.storage.CreditCard
+import mozilla.components.concept.storage.CreditCardNumber
+import mozilla.components.support.utils.CreditCardNetworkType
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
 import org.junit.Test
@@ -17,10 +19,11 @@ class CreditCardsAdapterTest {
         val creditCard1 = CreditCard(
             guid = "id",
             billingName = "Banana Apple",
-            cardNumber = "4111111111111110",
+            encryptedCardNumber = CreditCardNumber.Encrypted("4111111111111110"),
+            cardNumberLast4 = "1110",
             expiryMonth = 1,
             expiryYear = 2030,
-            cardType = "amex",
+            cardType = CreditCardNetworkType.AMEX.cardName,
             timeCreated = 1L,
             timeLastUsed = 1L,
             timeLastModified = 1L,
@@ -29,10 +32,11 @@ class CreditCardsAdapterTest {
         val creditCard2 = CreditCard(
             guid = "id",
             billingName = "Banana Apple",
-            cardNumber = "4111111111111110",
+            encryptedCardNumber = CreditCardNumber.Encrypted("4111111111111110"),
+            cardNumberLast4 = "1110",
             expiryMonth = 1,
             expiryYear = 2030,
-            cardType = "amex",
+            cardType = CreditCardNetworkType.AMEX.cardName,
             timeCreated = 1L,
             timeLastUsed = 1L,
             timeLastModified = 1L,
@@ -49,10 +53,11 @@ class CreditCardsAdapterTest {
         val creditCard3 = CreditCard(
             guid = "id3",
             billingName = "Banana Apple",
-            cardNumber = "4111111111111110",
+            encryptedCardNumber = CreditCardNumber.Encrypted("4111111111111110"),
+            cardNumberLast4 = "1110",
             expiryMonth = 1,
             expiryYear = 2030,
-            cardType = "amex",
+            cardType = CreditCardNetworkType.AMEX.cardName,
             timeCreated = 1L,
             timeLastUsed = 1L,
             timeLastModified = 1L,
diff --git a/app/src/test/java/org/mozilla/fenix/settings/creditcards/CreditCardsSettingFragmentTest.kt b/app/src/test/java/org/mozilla/fenix/settings/creditcards/CreditCardsSettingFragmentTest.kt
new file mode 100644
index 000000000..8be67d95b
--- /dev/null
+++ b/app/src/test/java/org/mozilla/fenix/settings/creditcards/CreditCardsSettingFragmentTest.kt
@@ -0,0 +1,97 @@
+/* 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/. */
+
+package org.mozilla.fenix.settings.creditcards
+
+import androidx.fragment.app.FragmentActivity
+import androidx.navigation.NavController
+import androidx.preference.Preference
+import io.mockk.mockk
+import io.mockk.verify
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.TestCoroutineDispatcher
+import mozilla.components.concept.storage.CreditCard
+import mozilla.components.support.test.robolectric.testContext
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertNull
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mozilla.fenix.R
+import org.mozilla.fenix.ext.getPreferenceKey
+import org.mozilla.fenix.ext.navigateBlockingForAsyncNavGraph
+import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
+import org.robolectric.Robolectric
+
+@ExperimentalCoroutinesApi
+@RunWith(FenixRobolectricTestRunner::class)
+class CreditCardsSettingFragmentTest {
+
+    private val testDispatcher = TestCoroutineDispatcher()
+    private lateinit var creditCardsSettingFragment: CreditCardsSettingFragment
+    private val navController: NavController = mockk(relaxed = true)
+
+    @Before
+    fun setUp() {
+        creditCardsSettingFragment = CreditCardsSettingFragment()
+
+        val activity = Robolectric.buildActivity(FragmentActivity::class.java).create().get()
+
+        activity.supportFragmentManager.beginTransaction()
+            .add(creditCardsSettingFragment, "CreditCardsSettingFragmentTest")
+            .commitNow()
+        testDispatcher.advanceUntilIdle()
+    }
+
+    @Test
+    fun `GIVEN the list of credit cards is not empty, WHEN fragment is displayed THEN the manage credit cards pref is 'Manage saved cards'`() {
+        val preferenceTitle =
+            testContext.getString(R.string.preferences_credit_cards_manage_saved_cards)
+        val manageCardsPreference = creditCardsSettingFragment.findPreference<Preference>(
+            creditCardsSettingFragment.getPreferenceKey(R.string.pref_key_credit_cards_manage_cards)
+        )
+
+        val creditCards: List<CreditCard> = listOf(mockk(), mockk())
+
+        val creditCardsState = CreditCardsListState(creditCards = creditCards)
+        val creditCardsStore = CreditCardsFragmentStore(creditCardsState)
+
+        creditCardsSettingFragment.updateCardManagementPreference(
+            creditCardsStore.state.creditCards.isNotEmpty(),
+            navController
+        )
+
+        assertNull(manageCardsPreference?.icon)
+        assertEquals(preferenceTitle, manageCardsPreference?.title)
+    }
+
+    @Test
+    fun `GIVEN the list of credit cards is empty, WHEN fragment is displayed THEN the manage credit cards pref is 'Add card'`() {
+        val preferenceTitle =
+            testContext.getString(R.string.preferences_credit_cards_add_credit_card)
+        val manageCardsPreference = creditCardsSettingFragment.findPreference<Preference>(
+            creditCardsSettingFragment.getPreferenceKey(R.string.pref_key_credit_cards_manage_cards)
+        )
+
+        val directions =
+            CreditCardsSettingFragmentDirections
+                .actionCreditCardsSettingFragmentToCreditCardEditorFragment()
+
+        val creditCardsState = CreditCardsListState(creditCards = emptyList())
+        val creditCardsStore = CreditCardsFragmentStore(creditCardsState)
+
+        creditCardsSettingFragment.updateCardManagementPreference(
+            creditCardsStore.state.creditCards.isNotEmpty(),
+            navController
+        )
+
+        assertNotNull(manageCardsPreference?.icon)
+        assertEquals(preferenceTitle, manageCardsPreference?.title)
+
+        manageCardsPreference?.performClick()
+
+        verify { navController.navigateBlockingForAsyncNavGraph(directions) }
+    }
+}
diff --git a/app/src/test/java/org/mozilla/fenix/settings/creditcards/DefaultCreditCardEditorControllerTest.kt b/app/src/test/java/org/mozilla/fenix/settings/creditcards/DefaultCreditCardEditorControllerTest.kt
index 3b32f1609..664e6a818 100644
--- a/app/src/test/java/org/mozilla/fenix/settings/creditcards/DefaultCreditCardEditorControllerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/settings/creditcards/DefaultCreditCardEditorControllerTest.kt
@@ -13,17 +13,25 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.TestCoroutineDispatcher
 import kotlinx.coroutines.test.TestCoroutineScope
 import kotlinx.coroutines.test.runBlockingTest
-import mozilla.components.concept.storage.CreditCard
+import mozilla.components.concept.storage.CreditCardNumber
+import mozilla.components.concept.storage.NewCreditCardFields
 import mozilla.components.concept.storage.UpdatableCreditCardFields
 import mozilla.components.service.sync.autofill.AutofillCreditCardsAddressesStorage
+import mozilla.components.support.test.robolectric.testContext
 import mozilla.components.support.test.rule.MainCoroutineRule
+import mozilla.components.support.utils.CreditCardNetworkType
 import org.junit.After
+import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
+import org.junit.runner.RunWith
+import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
 import org.mozilla.fenix.settings.creditcards.controller.DefaultCreditCardEditorController
+import org.mozilla.fenix.utils.Settings
 
 @ExperimentalCoroutinesApi
+@RunWith(FenixRobolectricTestRunner::class)
 class DefaultCreditCardEditorControllerTest {
 
     private val storage: AutofillCreditCardsAddressesStorage = mockk(relaxed = true)
@@ -33,17 +41,20 @@ class DefaultCreditCardEditorControllerTest {
     private val testDispatcher = TestCoroutineDispatcher()
 
     private lateinit var controller: DefaultCreditCardEditorController
+    private lateinit var settings: Settings
 
     @get:Rule
     val coroutinesTestRule = MainCoroutineRule(testDispatcher)
 
     @Before
     fun setup() {
+        settings = Settings(testContext)
         controller = spyk(
             DefaultCreditCardEditorController(
                 storage = storage,
                 lifecycleScope = testCoroutineScope,
                 navController = navController,
+                settings = settings,
                 ioDispatcher = testDispatcher
             )
         )
@@ -66,39 +77,37 @@ class DefaultCreditCardEditorControllerTest {
 
     @Test
     fun handleDeleteCreditCard() = testCoroutineScope.runBlockingTest {
-        val creditCard = CreditCard(
-            guid = "id",
-            billingName = "Banana Apple",
-            cardNumber = "4111111111111110",
-            expiryMonth = 1,
-            expiryYear = 2030,
-            cardType = "amex",
-            timeCreated = 1L,
-            timeLastUsed = 1L,
-            timeLastModified = 1L,
-            timesUsed = 1L
-        )
+        assertEquals(0, settings.creditCardsDeletedCount)
 
-        controller.handleDeleteCreditCard(creditCard.guid)
+        val creditCardId = "id"
+
+        controller.handleDeleteCreditCard(creditCardId)
+
+        assertEquals(1, settings.creditCardsDeletedCount)
 
         coVerify {
-            storage.deleteCreditCard(creditCard.guid)
+            storage.deleteCreditCard(creditCardId)
             navController.popBackStack()
         }
     }
 
     @Test
     fun handleSaveCreditCard() = testCoroutineScope.runBlockingTest {
-        val creditCardFields = UpdatableCreditCardFields(
+        assertEquals(0, settings.creditCardsSavedCount)
+
+        val creditCardFields = NewCreditCardFields(
             billingName = "Banana Apple",
-            cardNumber = "4111111111111112",
+            plaintextCardNumber = CreditCardNumber.Plaintext("4111111111111112"),
+            cardNumberLast4 = "1112",
             expiryMonth = 1,
             expiryYear = 2030,
-            cardType = "discover"
+            cardType = CreditCardNetworkType.DISCOVER.cardName
         )
 
         controller.handleSaveCreditCard(creditCardFields)
 
+        assertEquals(1, settings.creditCardsSavedCount)
+
         coVerify {
             storage.addCreditCard(creditCardFields)
             navController.popBackStack()
@@ -107,30 +116,20 @@ class DefaultCreditCardEditorControllerTest {
 
     @Test
     fun handleUpdateCreditCard() = testCoroutineScope.runBlockingTest {
-        val creditCard = CreditCard(
-            guid = "id",
-            billingName = "Banana Apple",
-            cardNumber = "4111111111111110",
-            expiryMonth = 1,
-            expiryYear = 2030,
-            cardType = "amex",
-            timeCreated = 1L,
-            timeLastUsed = 1L,
-            timeLastModified = 1L,
-            timesUsed = 1L
-        )
+        val creditCardId = "id"
         val creditCardFields = UpdatableCreditCardFields(
             billingName = "Banana Apple",
-            cardNumber = "4111111111111112",
+            cardNumber = CreditCardNumber.Plaintext("4111111111111112"),
+            cardNumberLast4 = "1112",
             expiryMonth = 1,
             expiryYear = 2034,
-            cardType = "discover"
+            cardType = CreditCardNetworkType.DISCOVER.cardName
         )
 
-        controller.handleUpdateCreditCard(creditCard.guid, creditCardFields)
+        controller.handleUpdateCreditCard(creditCardId, creditCardFields)
 
         coVerify {
-            storage.updateCreditCard(creditCard.guid, creditCardFields)
+            storage.updateCreditCard(creditCardId, creditCardFields)
             navController.popBackStack()
         }
     }
diff --git a/app/src/test/java/org/mozilla/fenix/settings/creditcards/DefaultCreditCardEditorInteractorTest.kt b/app/src/test/java/org/mozilla/fenix/settings/creditcards/DefaultCreditCardEditorInteractorTest.kt
index e987988ce..31d7fa5d9 100644
--- a/app/src/test/java/org/mozilla/fenix/settings/creditcards/DefaultCreditCardEditorInteractorTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/settings/creditcards/DefaultCreditCardEditorInteractorTest.kt
@@ -7,7 +7,10 @@ package org.mozilla.fenix.settings.creditcards
 import io.mockk.mockk
 import io.mockk.verify
 import mozilla.components.concept.storage.CreditCard
+import mozilla.components.concept.storage.CreditCardNumber
+import mozilla.components.concept.storage.NewCreditCardFields
 import mozilla.components.concept.storage.UpdatableCreditCardFields
+import mozilla.components.support.utils.CreditCardNetworkType
 import org.junit.Before
 import org.junit.Test
 import org.mozilla.fenix.settings.creditcards.controller.CreditCardEditorController
@@ -35,10 +38,11 @@ class DefaultCreditCardEditorInteractorTest {
         val creditCard = CreditCard(
             guid = "id",
             billingName = "Banana Apple",
-            cardNumber = "4111111111111110",
+            encryptedCardNumber = CreditCardNumber.Encrypted("4111111111111110"),
+            cardNumberLast4 = "1110",
             expiryMonth = 1,
             expiryYear = 2030,
-            cardType = "amex",
+            cardType = CreditCardNetworkType.AMEX.cardName,
             timeCreated = 1L,
             timeLastUsed = 1L,
             timeLastModified = 1L,
@@ -50,12 +54,13 @@ class DefaultCreditCardEditorInteractorTest {
 
     @Test
     fun onSaveButtonClicked() {
-        val creditCardFields = UpdatableCreditCardFields(
+        val creditCardFields = NewCreditCardFields(
             billingName = "Banana Apple",
-            cardNumber = "4111111111111112",
+            plaintextCardNumber = CreditCardNumber.Plaintext("4111111111111112"),
+            cardNumberLast4 = "1112",
             expiryMonth = 1,
             expiryYear = 2030,
-            cardType = "discover"
+            cardType = CreditCardNetworkType.DISCOVER.cardName
         )
         interactor.onSaveCreditCard(creditCardFields)
         verify { controller.handleSaveCreditCard(creditCardFields) }
@@ -66,10 +71,11 @@ class DefaultCreditCardEditorInteractorTest {
         val guid = "id"
         val creditCardFields = UpdatableCreditCardFields(
             billingName = "Banana Apple",
-            cardNumber = "4111111111111112",
+            cardNumber = CreditCardNumber.Encrypted("4111111111111112"),
+            cardNumberLast4 = "1112",
             expiryMonth = 1,
             expiryYear = 2034,
-            cardType = "discover"
+            cardType = CreditCardNetworkType.DISCOVER.cardName
         )
         interactor.onUpdateCreditCard(guid, creditCardFields)
         verify { controller.handleUpdateCreditCard(guid, creditCardFields) }
diff --git a/app/src/test/java/org/mozilla/fenix/settings/creditcards/DefaultCreditCardsManagementControllerTest.kt b/app/src/test/java/org/mozilla/fenix/settings/creditcards/DefaultCreditCardsManagementControllerTest.kt
index e261741d1..8d5139c3a 100644
--- a/app/src/test/java/org/mozilla/fenix/settings/creditcards/DefaultCreditCardsManagementControllerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/settings/creditcards/DefaultCreditCardsManagementControllerTest.kt
@@ -9,6 +9,8 @@ import io.mockk.mockk
 import io.mockk.spyk
 import io.mockk.verify
 import mozilla.components.concept.storage.CreditCard
+import mozilla.components.concept.storage.CreditCardNumber
+import mozilla.components.support.utils.CreditCardNetworkType
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -38,10 +40,11 @@ class DefaultCreditCardsManagementControllerTest {
         val creditCard = CreditCard(
             guid = "id",
             billingName = "Banana Apple",
-            cardNumber = "4111111111111110",
             expiryMonth = 1,
+            encryptedCardNumber = CreditCardNumber.Encrypted("4111111111111110"),
+            cardNumberLast4 = "1110",
             expiryYear = 2030,
-            cardType = "amex",
+            cardType = CreditCardNetworkType.AMEX.cardName,
             timeCreated = 1L,
             timeLastUsed = 1L,
             timeLastModified = 1L,
@@ -59,4 +62,15 @@ class DefaultCreditCardsManagementControllerTest {
             )
         }
     }
+
+    @Test
+    fun handleAddCreditCardClicked() {
+        controller.handleAddCreditCardClicked()
+
+        verify {
+            navController.navigate(
+                CreditCardsManagementFragmentDirections.actionCreditCardsManagementFragmentToCreditCardEditorFragment()
+            )
+        }
+    }
 }
diff --git a/app/src/test/java/org/mozilla/fenix/settings/creditcards/DefaultCreditCardsManagementInteractorTest.kt b/app/src/test/java/org/mozilla/fenix/settings/creditcards/DefaultCreditCardsManagementInteractorTest.kt
index c6883f7f0..3dfeedf17 100644
--- a/app/src/test/java/org/mozilla/fenix/settings/creditcards/DefaultCreditCardsManagementInteractorTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/settings/creditcards/DefaultCreditCardsManagementInteractorTest.kt
@@ -29,4 +29,10 @@ class DefaultCreditCardsManagementInteractorTest {
         interactor.onSelectCreditCard(creditCard)
         verify { controller.handleCreditCardClicked(creditCard) }
     }
+
+    @Test
+    fun onClickAddCreditCard() {
+        interactor.onAddCreditCardClick()
+        verify { controller.handleAddCreditCardClicked() }
+    }
 }
diff --git a/app/src/test/java/org/mozilla/fenix/settings/creditcards/StringTest.kt b/app/src/test/java/org/mozilla/fenix/settings/creditcards/StringTest.kt
new file mode 100644
index 000000000..e8f2b8289
--- /dev/null
+++ b/app/src/test/java/org/mozilla/fenix/settings/creditcards/StringTest.kt
@@ -0,0 +1,110 @@
+/* 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/. */
+
+package org.mozilla.fenix.settings.creditcards
+
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
+
+@RunWith(FenixRobolectricTestRunner::class)
+class StringTest {
+
+    @Test
+    fun `toCreditCardNumber returns a string with only digits `() {
+        assertEquals("123456789", "1 234 5678 9".toCreditCardNumber())
+        assertEquals("123456789", "1.23.4+5678/9".toCreditCardNumber())
+        assertEquals("123456789", ",12r34t5678&9".toCreditCardNumber())
+        assertEquals("123456789", " 1 234 5678 9 ".toCreditCardNumber())
+        assertEquals("123456789", " abc 1 234  abc 5678 9".toCreditCardNumber())
+        assertEquals("123456789", "1-234-5678-9".toCreditCardNumber())
+    }
+
+    @Test
+    fun `last4Digits returns a string with only last 4 digits `() {
+        assertEquals("8431", "371449635398431".last4Digits())
+        assertEquals("2345", "12345".last4Digits())
+        assertEquals("1234", "1234".last4Digits())
+        assertEquals("123", "123".last4Digits())
+        assertEquals("1", "1".last4Digits())
+        assertEquals("", "".last4Digits())
+    }
+
+    @Test
+    fun `validateCreditCardNumber returns true for valid credit card numbers `() {
+        val americanExpressCard = "371449635398431"
+        val dinnersClubCard = "30569309025904"
+        val discoverCard = "6011111111111117"
+        val jcbCard = "3530111333300000"
+        val masterCardCard = "5555555555554444"
+        val visaCard = "4111111111111111"
+
+        assertTrue(americanExpressCard.validateCreditCardNumber())
+        assertTrue(dinnersClubCard.validateCreditCardNumber())
+        assertTrue(discoverCard.validateCreditCardNumber())
+        assertTrue(jcbCard.validateCreditCardNumber())
+        assertTrue(masterCardCard.validateCreditCardNumber())
+        assertTrue(visaCard.validateCreditCardNumber())
+    }
+
+    @Test
+    fun `validateCreditCardNumber returns false got invalid credit card numbers `() {
+        val shortCardNumber = "12345678901"
+        val longCardNumber = "12345678901234567890"
+
+        val americanExpressCardInvalid = "371449635398432"
+        val dinnersClubCardInvalid = "30569309025905"
+        val discoverCardInvalid = "6011111111111118"
+        val jcbCardInvalid = "3530111333300001"
+        val masterCardCardInvalid = "5555555555554445"
+        val visaCardInvalid = "4111111111111112"
+        val voyagerCardInvalid = "869941728035896"
+
+        assertFalse(shortCardNumber.validateCreditCardNumber())
+        assertFalse(longCardNumber.validateCreditCardNumber())
+
+        assertFalse(americanExpressCardInvalid.validateCreditCardNumber())
+        assertFalse(dinnersClubCardInvalid.validateCreditCardNumber())
+        assertFalse(discoverCardInvalid.validateCreditCardNumber())
+        assertFalse(jcbCardInvalid.validateCreditCardNumber())
+        assertFalse(masterCardCardInvalid.validateCreditCardNumber())
+        assertFalse(visaCardInvalid.validateCreditCardNumber())
+        assertFalse(voyagerCardInvalid.validateCreditCardNumber())
+    }
+
+    @Test
+    fun `luhnAlgorithmValidation returns false for invalid identification numbers `() {
+        // "4242424242424242" is a valid identification number
+        assertFalse(luhnAlgorithmValidation("4242424242424240"))
+        assertFalse(luhnAlgorithmValidation("4242424242424241"))
+        assertFalse(luhnAlgorithmValidation("4242424242424243"))
+        assertFalse(luhnAlgorithmValidation("4242424242424244"))
+        assertFalse(luhnAlgorithmValidation("4242424242424245"))
+        assertFalse(luhnAlgorithmValidation("4242424242424246"))
+        assertFalse(luhnAlgorithmValidation("4242424242424247"))
+        assertFalse(luhnAlgorithmValidation("4242424242424248"))
+        assertFalse(luhnAlgorithmValidation("4242424242424249"))
+        assertFalse(luhnAlgorithmValidation("1"))
+        assertFalse(luhnAlgorithmValidation("12"))
+        assertFalse(luhnAlgorithmValidation("123"))
+    }
+
+    @Test
+    fun `luhnAlgorithmValidation returns true for valid identification numbers `() {
+        assertTrue(luhnAlgorithmValidation("0"))
+        assertTrue(luhnAlgorithmValidation("00"))
+        assertTrue(luhnAlgorithmValidation("18"))
+        assertTrue(luhnAlgorithmValidation("0000000000000000"))
+        assertTrue(luhnAlgorithmValidation("4242424242424242"))
+        assertTrue(luhnAlgorithmValidation("42424242424242426"))
+        assertTrue(luhnAlgorithmValidation("424242424242424267"))
+        assertTrue(luhnAlgorithmValidation("4242424242424242675"))
+        assertTrue(luhnAlgorithmValidation("000000018"))
+        assertTrue(luhnAlgorithmValidation("99999999999999999999"))
+        assertTrue(luhnAlgorithmValidation("1234567812345670"))
+    }
+}
diff --git a/app/src/test/java/org/mozilla/fenix/settings/logins/LoginsSyncPreferenceViewTest.kt b/app/src/test/java/org/mozilla/fenix/settings/logins/SyncPreferenceViewTest.kt
similarity index 52%
rename from app/src/test/java/org/mozilla/fenix/settings/logins/LoginsSyncPreferenceViewTest.kt
rename to app/src/test/java/org/mozilla/fenix/settings/logins/SyncPreferenceViewTest.kt
index c98544174..643d29890 100644
--- a/app/src/test/java/org/mozilla/fenix/settings/logins/LoginsSyncPreferenceViewTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/settings/logins/SyncPreferenceViewTest.kt
@@ -19,22 +19,26 @@ import mozilla.components.concept.sync.AccountObserver
 import mozilla.components.service.fxa.SyncEngine
 import mozilla.components.service.fxa.manager.FxaAccountManager
 import mozilla.components.service.fxa.manager.SyncEnginesStorage
+import mozilla.components.support.test.any
 import org.junit.After
+import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
 import org.mozilla.fenix.R
+import org.mozilla.fenix.settings.SyncPreference
 import org.mozilla.fenix.settings.SyncPreferenceView
 import org.mozilla.fenix.settings.logins.fragment.SavedLoginsAuthFragmentDirections
 
-class LoginsSyncPreferenceViewTest {
+class SyncPreferenceViewTest {
 
-    @MockK private lateinit var syncLoginsPreference: Preference
+    @MockK private lateinit var syncPreference: SyncPreference
     @MockK private lateinit var lifecycleOwner: LifecycleOwner
     @MockK private lateinit var accountManager: FxaAccountManager
     @MockK(relaxed = true) private lateinit var navController: NavController
     private lateinit var accountObserver: CapturingSlot<AccountObserver>
-    private lateinit var clickListener: CapturingSlot<Preference.OnPreferenceClickListener>
+    private lateinit var preferenceChangeListener: CapturingSlot<Preference.OnPreferenceChangeListener>
+    private lateinit var widgetVisibilitySlot: CapturingSlot<Boolean>
 
     @Before
     fun setup() {
@@ -42,17 +46,29 @@ class LoginsSyncPreferenceViewTest {
         mockkConstructor(SyncEnginesStorage::class)
 
         accountObserver = slot()
-        clickListener = slot()
+        preferenceChangeListener = slot()
+        widgetVisibilitySlot = slot()
+
         val context = mockk<Context> {
-            every { getString(R.string.preferences_passwords_sync_logins_reconnect) } returns "Reconnect"
-            every { getString(R.string.preferences_passwords_sync_logins_sign_in) } returns "Sign in to Sync"
-            every { getString(R.string.preferences_passwords_sync_logins_on) } returns "On"
-            every { getString(R.string.preferences_passwords_sync_logins_off) } returns "Off"
+            every { getString(R.string.pref_key_credit_cards_sync_cards_across_devices) } returns "pref_key_credit_cards_sync_cards_across_devices"
+            every { getString(R.string.preferences_credit_cards_sync_cards_across_devices) } returns "Sync cards across devices"
+            every { getString(R.string.preferences_credit_cards_sync_cards) } returns "Sync cards"
+
+            every { getString(R.string.pref_key_sync_logins) } returns "pref_key_sync_logins"
+            every { getString(R.string.preferences_passwords_sync_logins) } returns "Sync logins"
+            every { getString(R.string.preferences_passwords_sync_logins_across_devices) } returns "Sync logins across devices"
         }
 
-        every { syncLoginsPreference.summary = any() } just Runs
-        every { syncLoginsPreference.onPreferenceClickListener = capture(clickListener) } just Runs
-        every { syncLoginsPreference.context } returns context
+        syncPreference = mockk {
+            every { isSwitchWidgetVisible = any() } just Runs
+            every { key } returns "pref_key_sync_logins"
+            every { isChecked = any() } just Runs
+            every { title = any() } just Runs
+        }
+
+        every { syncPreference.title = any() } just Runs
+        every { syncPreference.onPreferenceChangeListener = capture(preferenceChangeListener) } just Runs
+        every { syncPreference.context } returns context
         every { accountManager.register(capture(accountObserver), owner = lifecycleOwner) } just Runs
         every { anyConstructed<SyncEnginesStorage>().getStatus() } returns emptyMap()
     }
@@ -66,11 +82,12 @@ class LoginsSyncPreferenceViewTest {
     fun `needs reauth ui on init`() {
         every { accountManager.authenticatedAccount() } returns mockk()
         every { accountManager.accountNeedsReauth() } returns true
-        createView()
 
-        verify { syncLoginsPreference.summary = "Reconnect" }
-        assertTrue(clickListener.captured.onPreferenceClick(syncLoginsPreference))
+        createView()
 
+        verify { syncPreference.isSwitchWidgetVisible = false }
+        verify { syncPreference.title = notLoggedInTitle }
+        assertFalse(preferenceChangeListener.captured.onPreferenceChange(syncPreference, any()))
         verify {
             navController.navigate(
                 SavedLoginsAuthFragmentDirections.actionGlobalAccountProblemFragment()
@@ -82,20 +99,29 @@ class LoginsSyncPreferenceViewTest {
     fun `needs reauth ui on init even if null account`() {
         every { accountManager.authenticatedAccount() } returns null
         every { accountManager.accountNeedsReauth() } returns true
+
         createView()
 
-        verify { syncLoginsPreference.summary = "Reconnect" }
+        verify { syncPreference.isSwitchWidgetVisible = false }
+        verify { syncPreference.title = notLoggedInTitle }
+        assertFalse(preferenceChangeListener.captured.onPreferenceChange(syncPreference, any()))
+        verify {
+            navController.navigate(
+                SavedLoginsAuthFragmentDirections.actionGlobalAccountProblemFragment()
+            )
+        }
     }
 
     @Test
     fun `needs login if account does not exist`() {
         every { accountManager.authenticatedAccount() } returns null
         every { accountManager.accountNeedsReauth() } returns false
-        createView()
 
-        verify { syncLoginsPreference.summary = "Sign in to Sync" }
-        assertTrue(clickListener.captured.onPreferenceClick(syncLoginsPreference))
+        createView()
 
+        verify { syncPreference.isSwitchWidgetVisible = false }
+        verify { syncPreference.title = notLoggedInTitle }
+        assertFalse(preferenceChangeListener.captured.onPreferenceChange(syncPreference, any()))
         verify {
             navController.navigate(
                 SavedLoginsAuthFragmentDirections.actionSavedLoginsAuthFragmentToTurnOnSyncFragment()
@@ -104,59 +130,64 @@ class LoginsSyncPreferenceViewTest {
     }
 
     @Test
-    fun `show status for existing account`() {
+    fun `GIVEN LoginScreen and syncLogins true WHEN updateSyncPreferenceStatus THEN setStatus false`() {
         every { accountManager.authenticatedAccount() } returns mockk()
         every { accountManager.accountNeedsReauth() } returns false
-        createView()
+        every { anyConstructed<SyncEnginesStorage>().getStatus() } returns mapOf(
+            SyncEngine.Passwords to true
+        )
+        every { anyConstructed<SyncEnginesStorage>().setStatus(any(), any()) } just Runs
+        every { syncPreference.setSwitchCheckedState(any()) } just Runs
 
-        verify { syncLoginsPreference.summary = "Off" }
-        assertTrue(clickListener.captured.onPreferenceClick(syncLoginsPreference))
+        createView()
 
-        verify {
-            navController.navigate(
-                SavedLoginsAuthFragmentDirections.actionGlobalAccountSettingsFragment()
-            )
-        }
+        verify { syncPreference.isSwitchWidgetVisible = true }
+        verify { syncPreference.isChecked = true }
+        verify { syncPreference.title = loggedInTitle }
+        assertTrue(preferenceChangeListener.captured.onPreferenceChange(syncPreference, false))
+        verify { anyConstructed<SyncEnginesStorage>().setStatus(any(), false) }
     }
 
     @Test
-    fun `show status for existing account with passwords`() {
-        every { anyConstructed<SyncEnginesStorage>().getStatus() } returns mapOf(
-            SyncEngine.Passwords to true
-        )
+    fun `GIVEN LoginScreen and syncLogins false WHEN updateSyncPreferenceStatus THEN setStatus true`() {
         every { accountManager.authenticatedAccount() } returns mockk()
         every { accountManager.accountNeedsReauth() } returns false
-        createView()
+        every { anyConstructed<SyncEnginesStorage>().getStatus() } returns mapOf(
+            SyncEngine.Passwords to false
+        )
+        every { anyConstructed<SyncEnginesStorage>().setStatus(any(), any()) } just Runs
+        every { syncPreference.setSwitchCheckedState(any()) } just Runs
 
-        verify { syncLoginsPreference.summary = "On" }
-        assertTrue(clickListener.captured.onPreferenceClick(syncLoginsPreference))
+        createView()
 
-        verify {
-            navController.navigate(
-                SavedLoginsAuthFragmentDirections.actionGlobalAccountSettingsFragment()
-            )
-        }
+        verify { syncPreference.isSwitchWidgetVisible = true }
+        verify { syncPreference.isChecked = false }
+        verify { syncPreference.title = loggedInTitle }
+        assertTrue(preferenceChangeListener.captured.onPreferenceChange(syncPreference, true))
+        verify { anyConstructed<SyncEnginesStorage>().setStatus(any(), true) }
     }
 
     private fun createView() = SyncPreferenceView(
-        syncPreference = syncLoginsPreference,
+        syncPreference = syncPreference,
         lifecycleOwner = lifecycleOwner,
         accountManager = accountManager,
         syncEngine = SyncEngine.Passwords,
+        loggedOffTitle = notLoggedInTitle,
+        loggedInTitle = loggedInTitle,
         onSignInToSyncClicked = {
             val directions =
                 SavedLoginsAuthFragmentDirections.actionSavedLoginsAuthFragmentToTurnOnSyncFragment()
             navController.navigate(directions)
         },
-        onSyncStatusClicked = {
-            val directions =
-                SavedLoginsAuthFragmentDirections.actionGlobalAccountSettingsFragment()
-            navController.navigate(directions)
-        },
         onReconnectClicked = {
             val directions =
                 SavedLoginsAuthFragmentDirections.actionGlobalAccountProblemFragment()
             navController.navigate(directions)
         }
     )
+
+    companion object {
+        const val notLoggedInTitle: String = "Sync logins across devices"
+        const val loggedInTitle: String = "Sync logins"
+    }
 }
diff --git a/app/src/test/java/org/mozilla/fenix/settings/search/SearchEngineFragmentTest.kt b/app/src/test/java/org/mozilla/fenix/settings/search/SearchEngineFragmentTest.kt
new file mode 100644
index 000000000..5710d2fab
--- /dev/null
+++ b/app/src/test/java/org/mozilla/fenix/settings/search/SearchEngineFragmentTest.kt
@@ -0,0 +1,102 @@
+/* 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/. */
+
+package org.mozilla.fenix.settings.search
+
+import android.content.SharedPreferences
+import androidx.preference.CheckBoxPreference
+import androidx.preference.SwitchPreference
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.mockkObject
+import io.mockk.spyk
+import io.mockk.unmockkObject
+import io.mockk.verify
+import mozilla.components.support.test.robolectric.testContext
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mozilla.fenix.HomeActivity
+import org.mozilla.fenix.R
+import org.mozilla.fenix.ext.settings
+import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
+import org.mozilla.gecko.search.SearchWidgetProvider
+
+@RunWith(FenixRobolectricTestRunner::class)
+class SearchEngineFragmentTest {
+    @Test
+    fun `GIVEN pref_key_show_voice_search setting WHEN it is modified THEN the value is persisted and widgets updated`() {
+        try {
+            mockkObject(SearchWidgetProvider.Companion)
+
+            val preferences: SharedPreferences = mockk()
+            val preferencesEditor: SharedPreferences.Editor = mockk(relaxed = true)
+            every { testContext.settings().preferences } returns preferences
+            every { preferences.edit() } returns preferencesEditor
+            val fragment = spyk(SearchEngineFragment()) {
+                every { context } returns testContext
+                every { isAdded } returns true
+                every { activity } returns mockk<HomeActivity>(relaxed = true)
+            }
+            val voiceSearchPreferenceKey = testContext.getString(R.string.pref_key_show_voice_search)
+            val voiceSearchPreference = spyk(SwitchPreference(testContext)) {
+                every { key } returns voiceSearchPreferenceKey
+            }
+            // The type needed for "fragment.findPreference" / "fragment.requirePreference" is erased at compile time.
+            // Hence we need individual mocks, specific for each preference's type.
+            every {
+                fragment.findPreference<SwitchPreference>(testContext.getString(R.string.pref_key_show_search_suggestions))
+            } returns mockk(relaxed = true) {
+                every { context } returns testContext
+            }
+            every {
+                fragment.findPreference<SwitchPreference>(testContext.getString(R.string.pref_key_enable_autocomplete_urls))
+            } returns mockk(relaxed = true) {
+                every { context } returns testContext
+            }
+            every {
+                fragment.findPreference<CheckBoxPreference>(testContext.getString(R.string.pref_key_show_search_suggestions_in_private))
+            } returns mockk(relaxed = true) {
+                every { context } returns testContext
+            }
+            every {
+                fragment.findPreference<SwitchPreference>(testContext.getString(R.string.pref_key_show_search_engine_shortcuts))
+            } returns mockk(relaxed = true) {
+                every { context } returns testContext
+            }
+            every {
+                fragment.findPreference<SwitchPreference>(testContext.getString(R.string.pref_key_search_browsing_history))
+            } returns mockk(relaxed = true) {
+                every { context } returns testContext
+            }
+            every {
+                fragment.findPreference<SwitchPreference>(testContext.getString(R.string.pref_key_search_bookmarks))
+            } returns mockk(relaxed = true) {
+                every { context } returns testContext
+            }
+            every {
+                fragment.findPreference<SwitchPreference>(testContext.getString(R.string.pref_key_search_synced_tabs))
+            } returns mockk(relaxed = true) {
+                every { context } returns testContext
+            }
+            every {
+                fragment.findPreference<SwitchPreference>(testContext.getString(R.string.pref_key_show_clipboard_suggestions))
+            } returns mockk(relaxed = true) {
+                every { context } returns testContext
+            }
+            // This preference is the sole purpose of this test
+            every {
+                fragment.findPreference<SwitchPreference>(voiceSearchPreferenceKey)
+            } returns voiceSearchPreference
+
+            // Trigger the preferences setup.
+            fragment.onResume()
+            voiceSearchPreference.callChangeListener(true)
+
+            verify { preferencesEditor.putBoolean(voiceSearchPreferenceKey, true) }
+            verify { SearchWidgetProvider.updateAllWidgets(testContext) }
+        } finally {
+            unmockkObject(SearchWidgetProvider.Companion)
+        }
+    }
+}
diff --git a/app/src/test/java/org/mozilla/fenix/sync/SyncedTabsViewHolderTest.kt b/app/src/test/java/org/mozilla/fenix/sync/SyncedTabsViewHolderTest.kt
index 3f8b06fd2..a69ba5d4f 100644
--- a/app/src/test/java/org/mozilla/fenix/sync/SyncedTabsViewHolderTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/sync/SyncedTabsViewHolderTest.kt
@@ -101,7 +101,7 @@ class SyncedTabsViewHolderTest {
 
         verify { deviceViewGroupName.text = "Charcoal" }
         verify {
-            deviceViewGroupName.setCompoundDrawablesWithIntrinsicBounds(
+            deviceViewGroupName.setCompoundDrawablesRelativeWithIntrinsicBounds(
                 R.drawable.mozac_ic_device_desktop, 0, 0, 0
             )
         }
@@ -117,7 +117,7 @@ class SyncedTabsViewHolderTest {
 
         verify { deviceViewGroupName.text = "Emerald" }
         verify {
-            deviceViewGroupName.setCompoundDrawablesWithIntrinsicBounds(
+            deviceViewGroupName.setCompoundDrawablesRelativeWithIntrinsicBounds(
                 R.drawable.mozac_ic_device_mobile, 0, 0, 0
             )
         }
diff --git a/app/src/test/java/org/mozilla/fenix/tabstray/AccessibleNewTabButtonBindingTest.kt b/app/src/test/java/org/mozilla/fenix/tabstray/AccessibleNewTabButtonBindingTest.kt
new file mode 100644
index 000000000..b6431aa5a
--- /dev/null
+++ b/app/src/test/java/org/mozilla/fenix/tabstray/AccessibleNewTabButtonBindingTest.kt
@@ -0,0 +1,138 @@
+/* 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/. */
+
+package org.mozilla.fenix.tabstray
+
+import android.view.View
+import android.widget.ImageButton
+import androidx.appcompat.content.res.AppCompatResources
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.mockkStatic
+import io.mockk.verify
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.TestCoroutineDispatcher
+import mozilla.components.support.test.libstate.ext.waitUntilIdle
+import mozilla.components.support.test.rule.MainCoroutineRule
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.mozilla.fenix.R
+import org.mozilla.fenix.tabstray.browser.BrowserTrayInteractor
+import org.mozilla.fenix.utils.Settings
+
+class AccessibleNewTabButtonBindingTest {
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    @get:Rule
+    val coroutinesTestRule = MainCoroutineRule(TestCoroutineDispatcher())
+
+    private val settings: Settings = mockk(relaxed = true)
+    private val newTabButton: ImageButton = mockk(relaxed = true)
+    private val browserTrayInteractor: BrowserTrayInteractor = mockk(relaxed = true)
+
+    @Before
+    fun setup() {
+        mockkStatic(AppCompatResources::class)
+        every { AppCompatResources.getDrawable(any(), any()) } returns mockk(relaxed = true)
+    }
+
+    @Test
+    fun `WHEN tab selected page is normal tab THEN new tab button is visible`() {
+        val tabsTrayStore = TabsTrayStore(TabsTrayState(selectedPage = Page.NormalTabs))
+        val newTabButtonBinding = AccessibleNewTabButtonBinding(
+            tabsTrayStore, settings, newTabButton, browserTrayInteractor
+        )
+        every { settings.accessibilityServicesEnabled } returns true
+
+        newTabButtonBinding.start()
+
+        verify(exactly = 1) { newTabButton.visibility = View.VISIBLE }
+    }
+
+    @Test
+    fun `WHEN tab selected page is private tab THEN new tab button is visible`() {
+        val tabsTrayStore = TabsTrayStore(TabsTrayState(selectedPage = Page.PrivateTabs))
+        val newTabButtonBinding = AccessibleNewTabButtonBinding(
+            tabsTrayStore, settings, newTabButton, browserTrayInteractor
+        )
+        every { settings.accessibilityServicesEnabled } returns true
+
+        newTabButtonBinding.start()
+
+        verify(exactly = 1) { newTabButton.visibility = View.VISIBLE }
+    }
+
+    @Test
+    fun `WHEN tab selected page is sync tab THEN new tab button is visible`() {
+        val tabsTrayStore = TabsTrayStore(TabsTrayState(selectedPage = Page.SyncedTabs))
+        val newTabButtonBinding = AccessibleNewTabButtonBinding(
+            tabsTrayStore, settings, newTabButton, browserTrayInteractor
+        )
+        every { settings.accessibilityServicesEnabled } returns true
+
+        newTabButtonBinding.start()
+
+        verify(exactly = 1) { newTabButton.visibility = View.VISIBLE }
+    }
+
+    @Test
+    fun `WHEN accessibility is disabled THEN new tab button is not visible`() {
+        var tabsTrayStore = TabsTrayStore(TabsTrayState(selectedPage = Page.NormalTabs))
+        var newTabButtonBinding = AccessibleNewTabButtonBinding(
+            tabsTrayStore, settings, newTabButton, browserTrayInteractor
+        )
+        every { settings.accessibilityServicesEnabled } returns false
+
+        newTabButtonBinding.start()
+
+        verify(exactly = 1) { newTabButton.visibility = View.GONE }
+
+        tabsTrayStore = TabsTrayStore(TabsTrayState(selectedPage = Page.PrivateTabs))
+        newTabButtonBinding = AccessibleNewTabButtonBinding(
+            tabsTrayStore, settings, newTabButton, browserTrayInteractor
+        )
+
+        newTabButtonBinding.start()
+
+        verify(exactly = 2) { newTabButton.visibility = View.GONE }
+
+        tabsTrayStore = TabsTrayStore(TabsTrayState(selectedPage = Page.SyncedTabs))
+        newTabButtonBinding = AccessibleNewTabButtonBinding(
+            tabsTrayStore, settings, newTabButton, browserTrayInteractor
+        )
+
+        newTabButtonBinding.start()
+
+        verify(exactly = 3) { newTabButton.visibility = View.GONE }
+    }
+
+    @Test
+    fun `WHEN selected page is updated THEN button is updated`() {
+        val tabsTrayStore = TabsTrayStore(TabsTrayState(selectedPage = Page.NormalTabs))
+        val newTabButtonBinding = AccessibleNewTabButtonBinding(
+            tabsTrayStore, settings, newTabButton, browserTrayInteractor
+        )
+        every { settings.accessibilityServicesEnabled } returns true
+
+        newTabButtonBinding.start()
+
+        verify(exactly = 1) { newTabButton.setImageResource(R.drawable.ic_new) }
+
+        tabsTrayStore.dispatch(TabsTrayAction.PageSelected(Page.positionToPage(Page.PrivateTabs.ordinal)))
+        tabsTrayStore.waitUntilIdle()
+
+        verify(exactly = 2) { newTabButton.setImageResource(R.drawable.ic_new) }
+
+        tabsTrayStore.dispatch(TabsTrayAction.PageSelected(Page.positionToPage(Page.SyncedTabs.ordinal)))
+        tabsTrayStore.waitUntilIdle()
+
+        verify(exactly = 1) { newTabButton.setImageResource(R.drawable.ic_fab_sync) }
+
+        tabsTrayStore.dispatch(TabsTrayAction.SyncNow)
+        tabsTrayStore.waitUntilIdle()
+
+        verify(exactly = 1) { newTabButton.visibility = View.GONE }
+    }
+}
diff --git a/app/src/test/java/org/mozilla/fenix/tabstray/DefaultTabsTrayControllerTest.kt b/app/src/test/java/org/mozilla/fenix/tabstray/DefaultTabsTrayControllerTest.kt
new file mode 100644
index 000000000..7f61b5b0f
--- /dev/null
+++ b/app/src/test/java/org/mozilla/fenix/tabstray/DefaultTabsTrayControllerTest.kt
@@ -0,0 +1,420 @@
+/* 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/. */
+
+package org.mozilla.fenix.tabstray
+
+import androidx.navigation.NavController
+import androidx.navigation.NavDirections
+import io.mockk.MockKAnnotations
+import io.mockk.every
+import io.mockk.impl.annotations.MockK
+import io.mockk.mockk
+import io.mockk.mockkStatic
+import io.mockk.spyk
+import io.mockk.unmockkStatic
+import io.mockk.verify
+import io.mockk.verifyOrder
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import mozilla.components.browser.state.selector.findTab
+import mozilla.components.browser.state.selector.getNormalOrPrivateTabs
+import mozilla.components.browser.state.state.TabSessionState
+import mozilla.components.browser.state.store.BrowserStore
+import mozilla.components.concept.base.profiler.Profiler
+import mozilla.components.concept.tabstray.Tab
+import mozilla.components.feature.tabs.TabsUseCases
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mozilla.fenix.R
+import org.mozilla.fenix.browser.browsingmode.BrowsingModeManager
+import org.mozilla.fenix.components.metrics.Event
+import org.mozilla.fenix.components.metrics.MetricController
+import org.mozilla.fenix.ext.navigateBlockingForAsyncNavGraph
+import org.mozilla.fenix.helpers.DisableNavGraphProviderAssertionRule
+import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
+import org.mozilla.fenix.home.HomeFragment
+import org.mozilla.fenix.tabtray.TabTrayDialogFragmentDirections
+
+@RunWith(FenixRobolectricTestRunner::class)
+class DefaultTabsTrayControllerTest {
+    @MockK(relaxed = true)
+    private lateinit var trayStore: TabsTrayStore
+
+    @MockK(relaxed = true)
+    private lateinit var browserStore: BrowserStore
+
+    @MockK(relaxed = true)
+    private lateinit var browsingModeManager: BrowsingModeManager
+
+    @MockK(relaxed = true)
+    private lateinit var navController: NavController
+
+    @MockK(relaxed = true)
+    private lateinit var navigateToHomeAndDeleteSession: (String) -> Unit
+
+    @MockK(relaxed = true)
+    private lateinit var profiler: Profiler
+
+    @MockK(relaxed = true)
+    private lateinit var navigationInteractor: NavigationInteractor
+
+    @MockK(relaxed = true)
+    private lateinit var metrics: MetricController
+
+    @MockK(relaxed = true)
+    private lateinit var tabsUseCases: TabsUseCases
+
+    @MockK(relaxed = true)
+    private lateinit var selectTabPosition: (Int, Boolean) -> Unit
+
+    @MockK(relaxed = true)
+    private lateinit var dismissTray: () -> Unit
+
+    @MockK(relaxed = true)
+    private lateinit var showUndoSnackbarForTab: (Boolean) -> Unit
+
+    private lateinit var controller: DefaultTabsTrayController
+
+    @get:Rule
+    val disableNavGraphProviderAssertionRule = DisableNavGraphProviderAssertionRule()
+
+    @Before
+    fun setup() {
+        MockKAnnotations.init(this)
+        controller = DefaultTabsTrayController(
+            trayStore,
+            browserStore,
+            browsingModeManager,
+            navController,
+            navigateToHomeAndDeleteSession,
+            profiler,
+            navigationInteractor,
+            metrics,
+            tabsUseCases,
+            selectTabPosition,
+            dismissTray,
+            showUndoSnackbarForTab
+        )
+    }
+
+    @Test
+    fun `GIVEN private mode WHEN handleOpeningNewTab is called THEN a profile marker is added for the operations executed`() {
+        profiler = spyk(profiler) {
+            every { getProfilerTime() } returns Double.MAX_VALUE
+        }
+        controller = DefaultTabsTrayController(
+            trayStore,
+            browserStore,
+            browsingModeManager,
+            navController,
+            navigateToHomeAndDeleteSession,
+            profiler,
+            navigationInteractor,
+            metrics,
+            tabsUseCases,
+            selectTabPosition,
+            dismissTray,
+            showUndoSnackbarForTab
+        )
+
+        controller.handleOpeningNewTab(true)
+
+        verifyOrder {
+            profiler.getProfilerTime()
+            navController.navigateBlockingForAsyncNavGraph(
+                TabTrayDialogFragmentDirections.actionGlobalHome(focusOnAddressBar = true)
+            )
+            navigationInteractor.onTabTrayDismissed()
+            profiler.addMarker(
+                "DefaultTabTrayController.onNewTabTapped",
+                Double.MAX_VALUE
+            )
+        }
+    }
+
+    @Test
+    fun `GIVEN normal mode WHEN handleOpeningNewTab is called THEN a profile marker is added for the operations executed`() {
+        profiler = spyk(profiler) {
+            every { getProfilerTime() } returns Double.MAX_VALUE
+        }
+        controller = DefaultTabsTrayController(
+            trayStore,
+            browserStore,
+            browsingModeManager,
+            navController,
+            navigateToHomeAndDeleteSession,
+            profiler,
+            navigationInteractor,
+            metrics,
+            tabsUseCases,
+            selectTabPosition,
+            dismissTray,
+            showUndoSnackbarForTab
+        )
+
+        controller.handleOpeningNewTab(false)
+
+        verifyOrder {
+            profiler.getProfilerTime()
+            navController.navigateBlockingForAsyncNavGraph(
+                TabTrayDialogFragmentDirections.actionGlobalHome(focusOnAddressBar = true)
+            )
+            navigationInteractor.onTabTrayDismissed()
+            profiler.addMarker(
+                "DefaultTabTrayController.onNewTabTapped",
+                Double.MAX_VALUE
+            )
+        }
+    }
+
+    @Test
+    fun `GIVEN private mode WHEN handleOpeningNewTab is called THEN Event#NewPrivateTabTapped is added to telemetry`() {
+        controller.handleOpeningNewTab(true)
+
+        verify { metrics.track(Event.NewPrivateTabTapped) }
+    }
+
+    @Test
+    fun `GIVEN private mode WHEN handleOpeningNewTab is called THEN Event#NewTabTapped is added to telemetry`() {
+        controller.handleOpeningNewTab(false)
+
+        verify { metrics.track(Event.NewTabTapped) }
+    }
+
+    @Test
+    fun `WHEN handleTrayScrollingToPosition is called with smoothScroll=true THEN it scrolls to that position with smoothScroll`() {
+        controller.handleTrayScrollingToPosition(3, true)
+
+        verify { selectTabPosition(3, true) }
+    }
+
+    @Test
+    fun `WHEN handleTrayScrollingToPosition is called with smoothScroll=true THEN it emits an action for the tray page of that tab position`() {
+        controller.handleTrayScrollingToPosition(33, true)
+
+        verify { trayStore.dispatch(TabsTrayAction.PageSelected(Page.positionToPage(33))) }
+    }
+
+    @Test
+    fun `WHEN handleTrayScrollingToPosition is called with smoothScroll=false THEN it scrolls to that position without smoothScroll`() {
+        controller.handleTrayScrollingToPosition(4, false)
+
+        verify { selectTabPosition(4, false) }
+    }
+
+    @Test
+    fun `WHEN handleTrayScrollingToPosition is called with smoothScroll=false THEN it emits an action for the tray page of that tab position`() {
+        controller.handleTrayScrollingToPosition(44, true)
+
+        verify { trayStore.dispatch(TabsTrayAction.PageSelected(Page.positionToPage(44))) }
+    }
+
+    @Test
+    fun `GIVEN already on browserFragment WHEN handleNavigateToBrowser is called THEN the tray is dismissed`() {
+        every { navController.currentDestination?.id } returns R.id.browserFragment
+
+        controller.handleNavigateToBrowser()
+
+        verify { dismissTray() }
+        verify(exactly = 0) { navController.popBackStack() }
+        verify(exactly = 0) { navController.popBackStack(any(), any()) }
+        verify(exactly = 0) { navController.navigateBlockingForAsyncNavGraph(any<Int>()) }
+        verify(exactly = 0) { navController.navigateBlockingForAsyncNavGraph(any<NavDirections>()) }
+        verify(exactly = 0) { navController.navigateBlockingForAsyncNavGraph(any(), any()) }
+    }
+
+    @Test
+    fun `GIVEN not already on browserFragment WHEN handleNavigateToBrowser is called THEN the tray is dismissed and popBackStack is executed`() {
+        every { navController.currentDestination?.id } returns R.id.browserFragment + 1
+        every { navController.popBackStack(R.id.browserFragment, false) } returns true
+
+        controller.handleNavigateToBrowser()
+
+        verify { dismissTray() }
+        verify { navController.popBackStack(R.id.browserFragment, false) }
+        verify(exactly = 0) { navController.navigateBlockingForAsyncNavGraph(any<Int>()) }
+        verify(exactly = 0) { navController.navigateBlockingForAsyncNavGraph(any<NavDirections>()) }
+        verify(exactly = 0) { navController.navigateBlockingForAsyncNavGraph(any(), any()) }
+    }
+
+    @Test
+    fun `GIVEN not already on browserFragment WHEN handleNavigateToBrowser is called and popBackStack fails THEN it navigates to browserFragment`() {
+        every { navController.currentDestination?.id } returns R.id.browserFragment + 1
+        every { navController.popBackStack(R.id.browserFragment, false) } returns false
+
+        controller.handleNavigateToBrowser()
+
+        verify { dismissTray() }
+        verify { navController.popBackStack(R.id.browserFragment, false) }
+        verify { navController.navigateBlockingForAsyncNavGraph(R.id.browserFragment) }
+    }
+
+    @Test
+    fun `GIVEN not already on browserFragment WHEN handleNavigateToBrowser is called and popBackStack succeeds THEN the method finishes`() {
+        every { navController.popBackStack(R.id.browserFragment, false) } returns true
+
+        controller.handleNavigateToBrowser()
+
+        verify { dismissTray() }
+        verify(exactly = 1) { navController.popBackStack(R.id.browserFragment, false) }
+        verify(exactly = 0) { navController.navigateBlockingForAsyncNavGraph(R.id.browserFragment) }
+    }
+
+    @Test
+    fun `GIVEN more tabs opened WHEN handleTabDeletion is called THEN that tab is removed and an undo snackbar is shown`() {
+        val tab: TabSessionState = mockk {
+            every { content } returns mockk()
+            every { content.private } returns true
+        }
+        every { browserStore.state } returns mockk()
+        try {
+            mockkStatic("mozilla.components.browser.state.selector.SelectorsKt")
+            every { browserStore.state.findTab(any()) } returns tab
+            every { browserStore.state.getNormalOrPrivateTabs(any()) } returns listOf(tab, mockk())
+
+            controller.handleTabDeletion("22")
+
+            verify { tabsUseCases.removeTab("22") }
+            verify { showUndoSnackbarForTab(true) }
+        } finally {
+            unmockkStatic("mozilla.components.browser.state.selector.SelectorsKt")
+        }
+    }
+
+    @Test
+    fun `GIVEN only one tab opened WHEN handleTabDeletion is called THEN that it navigates to home where the tab will be removed`() {
+        controller = spyk(controller)
+        val tab: TabSessionState = mockk {
+            every { content } returns mockk()
+            every { content.private } returns true
+        }
+        every { browserStore.state } returns mockk()
+        try {
+            mockkStatic("mozilla.components.browser.state.selector.SelectorsKt")
+            every { browserStore.state.findTab(any()) } returns tab
+            every { browserStore.state.getNormalOrPrivateTabs(any()) } returns listOf(tab)
+
+            controller.handleTabDeletion("33")
+
+            verify { controller.dismissTabsTrayAndNavigateHome("33") }
+            verify(exactly = 0) { tabsUseCases.removeTab(any()) }
+            verify(exactly = 0) { showUndoSnackbarForTab(any()) }
+        } finally {
+            unmockkStatic("mozilla.components.browser.state.selector.SelectorsKt")
+        }
+    }
+
+    @ExperimentalCoroutinesApi
+    @Test
+    fun `WHEN handleMultipleTabsDeletion is called to close all private tabs THEN that it navigates to home where that tabs will be removed and shows undo snackbar`() {
+        controller = spyk(controller)
+        val privateTab: Tab = mockk {
+            every { private } returns true
+        }
+        every { browserStore.state } returns mockk()
+        try {
+            mockkStatic("mozilla.components.browser.state.selector.SelectorsKt")
+            every { browserStore.state.getNormalOrPrivateTabs(any()) } returns listOf(mockk(), mockk())
+
+            controller.handleMultipleTabsDeletion(listOf(privateTab, mockk()))
+
+            verify { controller.dismissTabsTrayAndNavigateHome(HomeFragment.ALL_PRIVATE_TABS) }
+            verify { showUndoSnackbarForTab(true) }
+            verify(exactly = 0) { tabsUseCases.removeTabs(any()) }
+        } finally {
+            unmockkStatic("mozilla.components.browser.state.selector.SelectorsKt")
+        }
+    }
+
+    @ExperimentalCoroutinesApi
+    @Test
+    fun `WHEN handleMultipleTabsDeletion is called to close all normal tabs THEN that it navigates to home where that tabs will be removed and shows undo snackbar`() {
+        controller = spyk(controller)
+        val normalTab: Tab = mockk {
+            every { private } returns false
+        }
+        every { browserStore.state } returns mockk()
+        try {
+            mockkStatic("mozilla.components.browser.state.selector.SelectorsKt")
+            every { browserStore.state.getNormalOrPrivateTabs(any()) } returns listOf(mockk(), mockk())
+
+            controller.handleMultipleTabsDeletion(listOf(normalTab, normalTab))
+
+            verify { controller.dismissTabsTrayAndNavigateHome(HomeFragment.ALL_NORMAL_TABS) }
+            verify { showUndoSnackbarForTab(false) }
+            verify(exactly = 0) { tabsUseCases.removeTabs(any()) }
+        } finally {
+            unmockkStatic("mozilla.components.browser.state.selector.SelectorsKt")
+        }
+    }
+
+    @ExperimentalCoroutinesApi
+    @Test
+    fun `WHEN handleMultipleTabsDeletion is called to close some private tabs THEN that it uses tabsUseCases#removeTabs and shows an undo snackbar`() {
+        controller = spyk(controller)
+        val privateTab: Tab = mockk {
+            every { private } returns true
+            every { id } returns "42"
+        }
+        every { browserStore.state } returns mockk()
+        try {
+            mockkStatic("mozilla.components.browser.state.selector.SelectorsKt")
+            every { browserStore.state.getNormalOrPrivateTabs(any()) } returns listOf(mockk(), mockk())
+
+            controller.handleMultipleTabsDeletion(listOf(privateTab))
+
+            verify { tabsUseCases.removeTabs(listOf("42")) }
+            verify { showUndoSnackbarForTab(true) }
+            verify(exactly = 0) { controller.dismissTabsTrayAndNavigateHome(any()) }
+        } finally {
+            unmockkStatic("mozilla.components.browser.state.selector.SelectorsKt")
+        }
+    }
+
+    @ExperimentalCoroutinesApi
+    @Test
+    fun `WHEN handleMultipleTabsDeletion is called to close some normal tabs THEN that it uses tabsUseCases#removeTabs and shows an undo snackbar`() {
+        controller = spyk(controller)
+        val privateTab: Tab = mockk {
+            every { private } returns false
+            every { id } returns "24"
+        }
+        every { browserStore.state } returns mockk()
+        try {
+            mockkStatic("mozilla.components.browser.state.selector.SelectorsKt")
+            every { browserStore.state.getNormalOrPrivateTabs(any()) } returns listOf(mockk(), mockk())
+
+            controller.handleMultipleTabsDeletion(listOf(privateTab))
+
+            verify { tabsUseCases.removeTabs(listOf("24")) }
+            verify { showUndoSnackbarForTab(false) }
+            verify(exactly = 0) { controller.dismissTabsTrayAndNavigateHome(any()) }
+        } finally {
+            unmockkStatic("mozilla.components.browser.state.selector.SelectorsKt")
+        }
+    }
+
+    @Test
+    fun `GIVEN private mode selected WHEN sendNewTabEvent is called THEN NewPrivateTabTapped is tracked in telemetry`() {
+        controller.sendNewTabEvent(true)
+
+        verify { metrics.track(Event.NewPrivateTabTapped) }
+    }
+
+    @Test
+    fun `GIVEN normal mode selected WHEN sendNewTabEvent is called THEN NewTabTapped is tracked in telemetry`() {
+        controller.sendNewTabEvent(false)
+
+        verify { metrics.track(Event.NewTabTapped) }
+    }
+
+    @Test
+    fun `WHEN dismissTabsTrayAndNavigateHome is called with a spefic tab id THEN tray is dismissed and navigates home is opened to delete that tab`() {
+        controller.dismissTabsTrayAndNavigateHome("randomId")
+
+        verify { dismissTray() }
+        verify { navigateToHomeAndDeleteSession("randomId") }
+    }
+}
diff --git a/app/src/test/java/org/mozilla/fenix/tabstray/DefaultTabsTrayInteractorTest.kt b/app/src/test/java/org/mozilla/fenix/tabstray/DefaultTabsTrayInteractorTest.kt
new file mode 100644
index 000000000..55b84c759
--- /dev/null
+++ b/app/src/test/java/org/mozilla/fenix/tabstray/DefaultTabsTrayInteractorTest.kt
@@ -0,0 +1,45 @@
+/* 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/. */
+
+package org.mozilla.fenix.tabstray
+
+import io.mockk.mockk
+import io.mockk.verifySequence
+import org.junit.Test
+import mozilla.components.concept.tabstray.Tab
+
+class DefaultTabsTrayInteractorTest {
+    val controller: TabsTrayController = mockk(relaxed = true)
+    val trayInteractor = DefaultTabsTrayInteractor(controller)
+
+    @Test
+    fun `GIVEN user selecting a new tray page WHEN onTrayPositionSelected is called THEN the Interactor delegates the controller`() {
+        trayInteractor.onTrayPositionSelected(14, true)
+
+        verifySequence { controller.handleTrayScrollingToPosition(14, true) }
+    }
+
+    @Test
+    fun `GIVEN user selecting a new browser tab WHEN onBrowserTabSelected is called THEN the Interactor delegates the controller`() {
+        trayInteractor.onBrowserTabSelected()
+
+        verifySequence { controller.handleNavigateToBrowser() }
+    }
+
+    @Test
+    fun `GIVEN user deleted one browser tab page WHEN onDeleteTab is called THEN the Interactor delegates the controller`() {
+        trayInteractor.onDeleteTab("testTabId")
+
+        verifySequence { controller.handleTabDeletion("testTabId") }
+    }
+
+    @Test
+    fun `GIVEN user deleted multiple browser tabs WHEN onDeleteTabs is called THEN the Interactor delegates the controller`() {
+        val tabsToDelete = listOf<Tab>(mockk(), mockk())
+
+        trayInteractor.onDeleteTabs(tabsToDelete)
+
+        verifySequence { controller.handleMultipleTabsDeletion(tabsToDelete) }
+    }
+}
diff --git a/app/src/test/java/org/mozilla/fenix/tabstray/FloatingActionButtonBindingTest.kt b/app/src/test/java/org/mozilla/fenix/tabstray/FloatingActionButtonBindingTest.kt
new file mode 100644
index 000000000..61533ded8
--- /dev/null
+++ b/app/src/test/java/org/mozilla/fenix/tabstray/FloatingActionButtonBindingTest.kt
@@ -0,0 +1,168 @@
+/* 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/. */
+
+package org.mozilla.fenix.tabstray
+
+import androidx.appcompat.content.res.AppCompatResources
+import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.mockkStatic
+import io.mockk.verify
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.TestCoroutineDispatcher
+import mozilla.components.support.test.libstate.ext.waitUntilIdle
+import mozilla.components.support.test.rule.MainCoroutineRule
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.mozilla.fenix.R
+import org.mozilla.fenix.tabstray.browser.BrowserTrayInteractor
+import org.mozilla.fenix.utils.Settings
+
+class FloatingActionButtonBindingTest {
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    @get:Rule
+    val coroutinesTestRule = MainCoroutineRule(TestCoroutineDispatcher())
+
+    private val settings: Settings = mockk(relaxed = true)
+    private val actionButton: ExtendedFloatingActionButton = mockk(relaxed = true)
+    private val browserTrayInteractor: BrowserTrayInteractor = mockk(relaxed = true)
+
+    @Before
+    fun setup() {
+        mockkStatic(AppCompatResources::class)
+        every { AppCompatResources.getDrawable(any(), any()) } returns mockk(relaxed = true)
+    }
+
+    @Test
+    fun `WHEN tab selected page is normal tab THEN shrink and show is called`() {
+        val tabsTrayStore = TabsTrayStore(TabsTrayState(selectedPage = Page.NormalTabs))
+        val fabBinding = FloatingActionButtonBinding(
+            tabsTrayStore, settings, actionButton, browserTrayInteractor
+        )
+        every { settings.accessibilityServicesEnabled } returns false
+
+        fabBinding.start()
+
+        verify(exactly = 1) { actionButton.shrink() }
+        verify(exactly = 1) { actionButton.show() }
+        verify(exactly = 0) { actionButton.extend() }
+        verify(exactly = 0) { actionButton.hide() }
+    }
+
+    @Test
+    fun `WHEN tab selected page is private tab THEN extend and show is called`() {
+        val tabsTrayStore = TabsTrayStore(TabsTrayState(selectedPage = Page.PrivateTabs))
+        val fabBinding = FloatingActionButtonBinding(
+            tabsTrayStore, settings, actionButton, browserTrayInteractor
+        )
+        every { settings.accessibilityServicesEnabled } returns false
+
+        fabBinding.start()
+
+        verify(exactly = 1) { actionButton.extend() }
+        verify(exactly = 1) { actionButton.show() }
+        verify(exactly = 0) { actionButton.shrink() }
+        verify(exactly = 0) { actionButton.hide() }
+    }
+
+    @Test
+    fun `WHEN tab selected page is sync tab THEN extend and show is called`() {
+        val tabsTrayStore = TabsTrayStore(TabsTrayState(selectedPage = Page.SyncedTabs))
+        val fabBinding = FloatingActionButtonBinding(
+            tabsTrayStore, settings, actionButton, browserTrayInteractor
+        )
+        every { settings.accessibilityServicesEnabled } returns false
+
+        fabBinding.start()
+
+        verify(exactly = 1) { actionButton.extend() }
+        verify(exactly = 1) { actionButton.show() }
+        verify(exactly = 0) { actionButton.shrink() }
+        verify(exactly = 0) { actionButton.hide() }
+    }
+
+    @Test
+    fun `WHEN accessibility is enabled THEN show is not called`() {
+        var tabsTrayStore = TabsTrayStore(TabsTrayState(selectedPage = Page.NormalTabs))
+        var fabBinding = FloatingActionButtonBinding(
+            tabsTrayStore, settings, actionButton, browserTrayInteractor
+        )
+        every { settings.accessibilityServicesEnabled } returns true
+
+        fabBinding.start()
+
+        verify(exactly = 0) { actionButton.show() }
+        verify(exactly = 1) { actionButton.hide() }
+
+        tabsTrayStore = TabsTrayStore(TabsTrayState(selectedPage = Page.PrivateTabs))
+        fabBinding = FloatingActionButtonBinding(
+            tabsTrayStore, settings, actionButton, browserTrayInteractor
+        )
+
+        fabBinding.start()
+
+        verify(exactly = 0) { actionButton.show() }
+        verify(exactly = 2) { actionButton.hide() }
+
+        tabsTrayStore = TabsTrayStore(TabsTrayState(selectedPage = Page.SyncedTabs))
+        fabBinding = FloatingActionButtonBinding(
+            tabsTrayStore, settings, actionButton, browserTrayInteractor
+        )
+
+        fabBinding.start()
+
+        verify(exactly = 0) { actionButton.show() }
+        verify(exactly = 3) { actionButton.hide() }
+    }
+
+    @Test
+    fun `WHEN selected page is updated THEN button is updated`() {
+        val tabsTrayStore = TabsTrayStore(TabsTrayState(selectedPage = Page.NormalTabs))
+        val fabBinding = FloatingActionButtonBinding(
+            tabsTrayStore, settings, actionButton, browserTrayInteractor
+        )
+        every { settings.accessibilityServicesEnabled } returns false
+
+        fabBinding.start()
+
+        verify(exactly = 1) { actionButton.shrink() }
+        verify(exactly = 1) { actionButton.show() }
+        verify(exactly = 0) { actionButton.extend() }
+        verify(exactly = 0) { actionButton.hide() }
+        verify(exactly = 1) { actionButton.setIconResource(R.drawable.ic_new) }
+
+        tabsTrayStore.dispatch(TabsTrayAction.PageSelected(Page.positionToPage(Page.PrivateTabs.ordinal)))
+        tabsTrayStore.waitUntilIdle()
+
+        verify(exactly = 1) { actionButton.shrink() }
+        verify(exactly = 2) { actionButton.show() }
+        verify(exactly = 1) { actionButton.extend() }
+        verify(exactly = 0) { actionButton.hide() }
+        verify(exactly = 1) { actionButton.setText(R.string.tab_drawer_fab_content) }
+        verify(exactly = 2) { actionButton.setIconResource(R.drawable.ic_new) }
+
+        tabsTrayStore.dispatch(TabsTrayAction.PageSelected(Page.positionToPage(Page.SyncedTabs.ordinal)))
+        tabsTrayStore.waitUntilIdle()
+
+        verify(exactly = 1) { actionButton.shrink() }
+        verify(exactly = 3) { actionButton.show() }
+        verify(exactly = 2) { actionButton.extend() }
+        verify(exactly = 0) { actionButton.hide() }
+        verify(exactly = 1) { actionButton.setText(R.string.tab_drawer_fab_sync) }
+        verify(exactly = 1) { actionButton.setIconResource(R.drawable.ic_fab_sync) }
+
+        tabsTrayStore.dispatch(TabsTrayAction.SyncNow)
+        tabsTrayStore.waitUntilIdle()
+
+        verify(exactly = 1) { actionButton.shrink() }
+        verify(exactly = 4) { actionButton.show() }
+        verify(exactly = 3) { actionButton.extend() }
+        verify(exactly = 0) { actionButton.hide() }
+        verify(exactly = 1) { actionButton.setText(R.string.sync_syncing_in_progress) }
+        verify(exactly = 2) { actionButton.setIconResource(R.drawable.ic_fab_sync) }
+    }
+}
diff --git a/app/src/test/java/org/mozilla/fenix/tabstray/NavigationInteractorTest.kt b/app/src/test/java/org/mozilla/fenix/tabstray/NavigationInteractorTest.kt
index d3cd41333..6c1d214ef 100644
--- a/app/src/test/java/org/mozilla/fenix/tabstray/NavigationInteractorTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/tabstray/NavigationInteractorTest.kt
@@ -15,6 +15,7 @@ import io.mockk.mockkStatic
 import io.mockk.unmockkStatic
 import io.mockk.verifyOrder
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.TestCoroutineDispatcher
 import kotlinx.coroutines.test.runBlockingTest
 import mozilla.components.browser.state.state.BrowserState
 import mozilla.components.browser.state.state.TabSessionState
@@ -24,6 +25,7 @@ import mozilla.components.browser.storage.sync.TabEntry
 import mozilla.components.browser.storage.sync.Tab as SyncTab
 import mozilla.components.concept.tabstray.Tab
 import mozilla.components.service.fxa.manager.FxaAccountManager
+import mozilla.components.support.test.rule.MainCoroutineRule
 import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Rule
@@ -39,6 +41,7 @@ import org.mozilla.fenix.components.metrics.Event
 import org.mozilla.fenix.components.metrics.MetricController
 import org.mozilla.fenix.tabstray.browser.createTab as createTrayTab
 
+@ExperimentalCoroutinesApi
 class NavigationInteractorTest {
     private lateinit var store: BrowserStore
     private lateinit var tabsTrayStore: TabsTrayStore
@@ -54,9 +57,14 @@ class NavigationInteractorTest {
     private val accountManager: FxaAccountManager = mockk(relaxed = true)
     private val activity: HomeActivity = mockk(relaxed = true)
 
+    private val testDispatcher = TestCoroutineDispatcher()
+
     @get:Rule
     val disableNavGraphProviderAssertionRule = DisableNavGraphProviderAssertionRule()
 
+    @get:Rule
+    val coroutinesTestRule = MainCoroutineRule(testDispatcher)
+
     @Before
     fun setup() {
         store = BrowserStore(initialState = BrowserState(tabs = listOf(testTab)))
@@ -72,7 +80,8 @@ class NavigationInteractorTest {
             bookmarksUseCase,
             tabsTrayStore,
             collectionStorage,
-            accountManager
+            accountManager,
+            testDispatcher
         )
     }
 
@@ -158,7 +167,12 @@ class NavigationInteractorTest {
     @Test
     fun `onTabTrayDismissed calls dismissTabTray on DefaultNavigationInteractor`() {
         navigationInteractor.onTabTrayDismissed()
-        verify(exactly = 1) { dismissTabTray() }
+
+        // We care about the order here; anything after `dismissTabTray` is not guaranteed.
+        verifyOrder {
+            metrics.track(Event.TabsTrayClosed)
+            dismissTabTray()
+        }
     }
 
     @Test
@@ -220,7 +234,6 @@ class NavigationInteractorTest {
         unmockkStatic("org.mozilla.fenix.collections.CollectionsDialogKt")
     }
 
-    @OptIn(ExperimentalCoroutinesApi::class)
     @Test
     fun `onBookmarkTabs calls navigation on DefaultNavigationInteractor`() = runBlockingTest {
         navigationInteractor = DefaultNavigationInteractor(
@@ -234,7 +247,8 @@ class NavigationInteractorTest {
             bookmarksUseCase,
             tabsTrayStore,
             collectionStorage,
-            accountManager
+            accountManager,
+            coroutineContext
         )
         navigationInteractor.onSaveToBookmarks(listOf(createTrayTab()))
         coVerify(exactly = 1) { bookmarksUseCase.addBookmark(any(), any(), any()) }
diff --git a/app/src/test/java/org/mozilla/fenix/tabstray/TabLayoutObserverTest.kt b/app/src/test/java/org/mozilla/fenix/tabstray/TabLayoutObserverTest.kt
index e9c2f2922..115c8e2f3 100644
--- a/app/src/test/java/org/mozilla/fenix/tabstray/TabLayoutObserverTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/tabstray/TabLayoutObserverTest.kt
@@ -37,7 +37,7 @@ class TabLayoutObserverTest {
 
         store.waitUntilIdle()
 
-        verify { interactor.setCurrentTrayPosition(1, false) }
+        verify { interactor.onTrayPositionSelected(1, false) }
         verify { metrics.track(Event.TabsTrayPrivateModeTapped) }
 
         every { tab.position } returns 0
@@ -46,7 +46,7 @@ class TabLayoutObserverTest {
 
         store.waitUntilIdle()
 
-        verify { interactor.setCurrentTrayPosition(0, true) }
+        verify { interactor.onTrayPositionSelected(0, true) }
         verify { metrics.track(Event.TabsTrayNormalModeTapped) }
 
         every { tab.position } returns 2
@@ -55,7 +55,7 @@ class TabLayoutObserverTest {
 
         store.waitUntilIdle()
 
-        verify { interactor.setCurrentTrayPosition(2, true) }
+        verify { interactor.onTrayPositionSelected(2, true) }
         verify { metrics.track(Event.TabsTraySyncedModeTapped) }
     }
 
@@ -67,12 +67,12 @@ class TabLayoutObserverTest {
 
         observer.onTabSelected(tab)
 
-        verify { interactor.setCurrentTrayPosition(1, false) }
+        verify { interactor.onTrayPositionSelected(1, false) }
         verify { metrics.track(Event.TabsTrayPrivateModeTapped) }
 
         observer.onTabSelected(tab)
 
-        verify { interactor.setCurrentTrayPosition(1, true) }
+        verify { interactor.onTrayPositionSelected(1, true) }
         verify { metrics.track(Event.TabsTrayPrivateModeTapped) }
     }
 }
diff --git a/app/src/test/java/org/mozilla/fenix/tabstray/TabsTrayFragmentTest.kt b/app/src/test/java/org/mozilla/fenix/tabstray/TabsTrayFragmentTest.kt
new file mode 100644
index 000000000..bbdb915bd
--- /dev/null
+++ b/app/src/test/java/org/mozilla/fenix/tabstray/TabsTrayFragmentTest.kt
@@ -0,0 +1,347 @@
+/* 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/. */
+
+package org.mozilla.fenix.tabstray
+
+import android.content.Context
+import android.view.View
+import android.widget.Button
+import android.widget.ImageButton
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.lifecycle.LifecycleCoroutineScope
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.lifecycleScope
+import androidx.navigation.NavController
+import androidx.navigation.fragment.findNavController
+import androidx.viewpager2.widget.ViewPager2
+import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+import com.google.android.material.tabs.TabLayout
+import io.mockk.Runs
+import io.mockk.every
+import io.mockk.just
+import io.mockk.mockk
+import io.mockk.mockkStatic
+import io.mockk.slot
+import io.mockk.spyk
+import io.mockk.unmockkStatic
+import io.mockk.verify
+import kotlinx.android.synthetic.main.component_tabstray2.*
+import kotlinx.android.synthetic.main.component_tabstray2.view.*
+import kotlinx.android.synthetic.main.component_tabstray_fab.*
+import kotlinx.android.synthetic.main.fragment_tab_tray_dialog.*
+import kotlinx.coroutines.CoroutineScope
+import mozilla.components.browser.menu.BrowserMenu
+import mozilla.components.browser.state.store.BrowserStore
+import mozilla.components.support.test.robolectric.testContext
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertSame
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mozilla.fenix.NavGraphDirections
+import org.mozilla.fenix.R
+import org.mozilla.fenix.components.metrics.Event
+import org.mozilla.fenix.components.metrics.MetricController
+import org.mozilla.fenix.ext.components
+import org.mozilla.fenix.ext.navigateBlockingForAsyncNavGraph
+import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
+import org.mozilla.fenix.home.HomeScreenViewModel
+import org.mozilla.fenix.tabstray.browser.BrowserTrayInteractor
+import org.mozilla.fenix.tabstray.ext.showWithTheme
+import org.mozilla.fenix.utils.allowUndo
+
+@RunWith(FenixRobolectricTestRunner::class)
+class TabsTrayFragmentTest {
+    private lateinit var context: Context
+    private lateinit var view: View
+    private lateinit var fragment: TabsTrayFragment
+
+    @Before
+    fun setup() {
+        context = mockk(relaxed = true)
+        view = mockk(relaxed = true)
+
+        fragment = spyk(TabsTrayFragment())
+        every { fragment.context } returns context
+        every { fragment.view } returns view
+    }
+
+    @Test
+    fun `WHEN showUndoSnackbarForTab is called for a private tab with new tab button visible THEN an appropriate snackbar is shown`() {
+        try {
+            mockkStatic("org.mozilla.fenix.utils.UndoKt")
+            mockkStatic("androidx.lifecycle.LifecycleOwnerKt")
+            val lifecycleScope: LifecycleCoroutineScope = mockk(relaxed = true)
+            every { any<LifecycleOwner>().lifecycleScope } returns lifecycleScope
+            val newTabButton: ExtendedFloatingActionButton = mockk {
+                every { visibility } returns View.VISIBLE
+            }
+            every { fragment.new_tab_button } returns newTabButton
+            every { fragment.context } returns testContext // needed for getString()
+            every { any<CoroutineScope>().allowUndo(any(), any(), any(), any(), any(), any(), any(), any()) } just Runs
+
+            fragment.showUndoSnackbarForTab(true)
+
+            verify { lifecycleScope.allowUndo(
+                fragment.view!!,
+                testContext.getString(R.string.snackbar_private_tab_closed),
+                testContext.getString(R.string.snackbar_deleted_undo),
+                any(),
+                any(),
+                newTabButton,
+                TabsTrayFragment.ELEVATION,
+                false
+            ) }
+        } finally {
+            unmockkStatic("org.mozilla.fenix.utils.UndoKt")
+            unmockkStatic("androidx.lifecycle.LifecycleOwnerKt")
+        }
+    }
+
+    @Test
+    fun `WHEN showUndoSnackbarForTab is called for a private tab with new tab button not visible THEN an appropriate snackbar is shown`() {
+        try {
+            mockkStatic("org.mozilla.fenix.utils.UndoKt")
+            mockkStatic("androidx.lifecycle.LifecycleOwnerKt")
+            val lifecycleScope: LifecycleCoroutineScope = mockk(relaxed = true)
+            every { any<LifecycleOwner>().lifecycleScope } returns lifecycleScope
+            val newTabButton: ExtendedFloatingActionButton = mockk {
+                every { visibility } returns View.GONE
+            }
+            every { fragment.new_tab_button } returns newTabButton
+            every { fragment.context } returns testContext // needed for getString()
+            every { any<CoroutineScope>().allowUndo(any(), any(), any(), any(), any(), any(), any(), any()) } just Runs
+
+            fragment.showUndoSnackbarForTab(true)
+
+            verify { lifecycleScope.allowUndo(
+                fragment.view!!,
+                testContext.getString(R.string.snackbar_private_tab_closed),
+                testContext.getString(R.string.snackbar_deleted_undo),
+                any(),
+                any(),
+                null,
+                TabsTrayFragment.ELEVATION,
+                false
+            ) }
+        } finally {
+            unmockkStatic("org.mozilla.fenix.utils.UndoKt")
+            unmockkStatic("androidx.lifecycle.LifecycleOwnerKt")
+        }
+    }
+
+    @Test
+    fun `WHEN showUndoSnackbarForTab is called for a normal tab with new tab button visible THEN an appropriate snackbar is shown`() {
+        try {
+            mockkStatic("org.mozilla.fenix.utils.UndoKt")
+            mockkStatic("androidx.lifecycle.LifecycleOwnerKt")
+            val lifecycleScope: LifecycleCoroutineScope = mockk(relaxed = true)
+            every { any<LifecycleOwner>().lifecycleScope } returns lifecycleScope
+            val newTabButton: ExtendedFloatingActionButton = mockk {
+                every { visibility } returns View.VISIBLE
+            }
+            every { fragment.new_tab_button } returns newTabButton
+            every { fragment.context } returns testContext // needed for getString()
+            every { any<CoroutineScope>().allowUndo(any(), any(), any(), any(), any(), any(), any(), any()) } just Runs
+
+            fragment.showUndoSnackbarForTab(false)
+
+            verify { lifecycleScope.allowUndo(
+                fragment.view!!,
+                testContext.getString(R.string.snackbar_tab_closed),
+                testContext.getString(R.string.snackbar_deleted_undo),
+                any(),
+                any(),
+                newTabButton,
+                TabsTrayFragment.ELEVATION,
+                false
+            ) }
+        } finally {
+            unmockkStatic("org.mozilla.fenix.utils.UndoKt")
+            unmockkStatic("androidx.lifecycle.LifecycleOwnerKt")
+        }
+    }
+
+    @Test
+    fun `WHEN showUndoSnackbarForTab is called for a normal tab with new tab button not visible THEN an appropriate snackbar is shown`() {
+        try {
+            mockkStatic("org.mozilla.fenix.utils.UndoKt")
+            mockkStatic("androidx.lifecycle.LifecycleOwnerKt")
+            val lifecycleScope: LifecycleCoroutineScope = mockk(relaxed = true)
+            every { any<LifecycleOwner>().lifecycleScope } returns lifecycleScope
+            val newTabButton: ExtendedFloatingActionButton = mockk {
+                every { visibility } returns View.GONE
+            }
+            every { fragment.new_tab_button } returns newTabButton
+            every { fragment.context } returns testContext // needed for getString()
+            every { any<CoroutineScope>().allowUndo(any(), any(), any(), any(), any(), any(), any(), any()) } just Runs
+
+            fragment.showUndoSnackbarForTab(false)
+
+            verify { lifecycleScope.allowUndo(
+                fragment.view!!,
+                testContext.getString(R.string.snackbar_tab_closed),
+                testContext.getString(R.string.snackbar_deleted_undo),
+                any(),
+                any(),
+                null,
+                TabsTrayFragment.ELEVATION,
+                false
+            ) }
+        } finally {
+            unmockkStatic("org.mozilla.fenix.utils.UndoKt")
+            unmockkStatic("androidx.lifecycle.LifecycleOwnerKt")
+        }
+    }
+
+    @Test
+    fun `WHEN setupPager is called THEN it sets the tray adapter and disables user initiated scrolling`() {
+        val tray: ViewPager2 = mockk(relaxed = true)
+        val store: TabsTrayStore = mockk()
+        val trayInteractor: TabsTrayInteractor = mockk()
+        val browserInteractor: BrowserTrayInteractor = mockk()
+        val navigationInteractor: NavigationInteractor = mockk()
+        val browserStore: BrowserStore = mockk()
+        every { fragment.tabsTray } returns tray
+        every { context.components.core.store } returns browserStore
+        val adapterSlot = slot<TrayPagerAdapter>()
+
+        fragment.setupPager(
+            context, store, trayInteractor, browserInteractor, navigationInteractor
+        )
+
+        verify { tray.adapter = capture(adapterSlot) }
+        assertSame(context, adapterSlot.captured.context)
+        assertSame(store, adapterSlot.captured.store)
+        assertSame(trayInteractor, adapterSlot.captured.interactor)
+        assertSame(browserInteractor, adapterSlot.captured.browserInteractor)
+        assertSame(navigationInteractor, adapterSlot.captured.navInteractor)
+        assertSame(browserStore, adapterSlot.captured.browserStore)
+        verify { tray.isUserInputEnabled = false }
+    }
+
+    @Test
+    fun `WHEN setupMenu is called THEN it sets a 3 dot menu click listener to open the tray menu`() {
+        try {
+            mockkStatic("org.mozilla.fenix.tabstray.ext.BrowserMenuKt")
+            val navigationInteractor: NavigationInteractor = mockk()
+            val threeDotMenu = ImageButton(testContext)
+            every { view.tab_tray_overflow } returns threeDotMenu
+            val metrics: MetricController = mockk(relaxed = true)
+            every { context.components.analytics.metrics } returns metrics
+            every { context.components.core.store } returns mockk()
+            every { fragment.tabsTrayStore } returns mockk()
+            every { fragment.tab_layout } returns mockk<TabLayout>()
+            val menu: BrowserMenu = mockk {
+                every { showWithTheme(any()) } just Runs
+            }
+            val menuBuilder: MenuIntegration = mockk(relaxed = true) {
+                every { build() } returns menu
+            }
+            every { fragment.getTrayMenu(any(), any(), any(), any(), any()) } returns menuBuilder
+
+            fragment.setupMenu(view, navigationInteractor)
+            threeDotMenu.performClick()
+
+            verify { metrics.track(Event.TabsTrayMenuOpened) }
+            verify { menuBuilder.build() }
+            verify { menu.showWithTheme(threeDotMenu) }
+        } finally {
+            unmockkStatic("org.mozilla.fenix.tabstray.ext.BrowserMenuKt")
+        }
+    }
+
+    @Test
+    fun `WHEN getTrayMenu is called THEN it returns a MenuIntegration initialized with the passed in parameters`() {
+        val browserStore: BrowserStore = mockk()
+        val tabsTrayStore: TabsTrayStore = mockk()
+        val tabLayout: TabLayout = mockk()
+        val navigationInteractor: NavigationInteractor = mockk()
+
+        val result = fragment.getTrayMenu(context, browserStore, tabsTrayStore, tabLayout, navigationInteractor)
+
+        assertSame(context, result.context)
+        assertSame(browserStore, result.browserStore)
+        assertSame(tabsTrayStore, result.tabsTrayStore)
+        assertSame(tabLayout, result.tabLayout)
+        assertSame(navigationInteractor, result.navigationInteractor)
+    }
+
+    @Test
+    fun `WHEN setupBackgroundDismissalListener is called THEN it sets a click listener for tray's tabLayout and handle`() {
+        var clickCount = 0
+        val callback: (View) -> Unit = { clickCount++ }
+        val tabLayout = CoordinatorLayout(testContext)
+        val handle = Button(testContext)
+        every { fragment.tabLayout } returns tabLayout
+        every { fragment.handle } returns handle
+
+        fragment.setupBackgroundDismissalListener(callback)
+
+        tabLayout.performClick()
+        assertEquals(1, clickCount)
+        handle.performClick()
+        assertEquals(2, clickCount)
+    }
+
+    @Test
+    fun `WHEN dismissTabsTrayAndNavigateHome is called with a sessionId THEN it navigates to home to delete that sessions and dismisses the tray`() {
+        every { fragment.navigateToHomeAndDeleteSession(any()) } just Runs
+        every { fragment.dismissTabsTray() } just Runs
+
+        fragment.dismissTabsTrayAndNavigateHome("test")
+
+        verify { fragment.navigateToHomeAndDeleteSession("test") }
+        verify { fragment.dismissTabsTray() }
+    }
+
+    @Test
+    fun `WHEN navigateToHomeAndDeleteSession is called with a sessionId THEN it navigates to home and transmits there the sessionId`() {
+        try {
+            mockkStatic("androidx.fragment.app.FragmentViewModelLazyKt")
+            mockkStatic("androidx.navigation.fragment.FragmentKt")
+            mockkStatic("org.mozilla.fenix.ext.NavControllerKt")
+            val viewModel: HomeScreenViewModel = mockk(relaxed = true)
+            every { fragment.homeViewModel } returns viewModel
+            val navController: NavController = mockk(relaxed = true)
+            every { fragment.findNavController() } returns navController
+
+            fragment.navigateToHomeAndDeleteSession("test")
+
+            verify { viewModel.sessionToDelete = "test" }
+            verify { navController.navigateBlockingForAsyncNavGraph(NavGraphDirections.actionGlobalHome()) }
+        } finally {
+            unmockkStatic("org.mozilla.fenix.ext.NavControllerKt")
+            unmockkStatic("androidx.navigation.fragment.FragmentKt")
+            unmockkStatic("androidx.fragment.app.FragmentViewModelLazyKt")
+        }
+    }
+
+    @Test
+    fun `WHEN selectTabPosition is called with a position and smooth scroll indication THEN it scrolls to that tab and selects it`() {
+        val tabsTray: ViewPager2 = mockk(relaxed = true)
+        val tab: TabLayout.Tab = mockk(relaxed = true)
+        val tabLayout: TabLayout = mockk {
+            every { getTabAt(any()) } returns tab
+        }
+        every { fragment.tab_layout } returns tabLayout
+        every { fragment.tabsTray } returns tabsTray
+
+        fragment.selectTabPosition(2, true)
+
+        verify { tabsTray.setCurrentItem(2, true) }
+        verify { tab.select() }
+    }
+
+    @Test
+    fun `WHEN dismissTabsTray is called THEN it dismisses the tray`() {
+        every { fragment.dismissAllowingStateLoss() } just Runs
+        val metrics: MetricController = mockk(relaxed = true)
+        every { context.components.analytics.metrics } returns metrics
+
+        fragment.dismissTabsTray()
+
+        verify { fragment.dismissAllowingStateLoss() }
+    }
+}
diff --git a/app/src/test/java/org/mozilla/fenix/tabstray/TabsTrayViewHolderTest.kt b/app/src/test/java/org/mozilla/fenix/tabstray/browser/AbstractBrowserTabViewHolderTest.kt
similarity index 91%
rename from app/src/test/java/org/mozilla/fenix/tabstray/TabsTrayViewHolderTest.kt
rename to app/src/test/java/org/mozilla/fenix/tabstray/browser/AbstractBrowserTabViewHolderTest.kt
index 4c9468af7..3adc60601 100644
--- a/app/src/test/java/org/mozilla/fenix/tabstray/TabsTrayViewHolderTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/tabstray/browser/AbstractBrowserTabViewHolderTest.kt
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.mozilla.fenix.tabstray
+package org.mozilla.fenix.tabstray.browser
 
 import android.view.LayoutInflater
 import android.view.View
@@ -19,11 +19,10 @@ import org.mozilla.fenix.R
 import org.mozilla.fenix.components.metrics.MetricController
 import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
 import org.mozilla.fenix.selection.SelectionHolder
-import org.mozilla.fenix.tabstray.browser.BrowserTrayInteractor
-import org.mozilla.fenix.tabstray.browser.createTab
+import org.mozilla.fenix.tabstray.TabsTrayStore
 
 @RunWith(FenixRobolectricTestRunner::class)
-class TabsTrayViewHolderTest {
+class AbstractBrowserTabViewHolderTest {
     val store = TabsTrayStore()
     val browserStore = BrowserStore()
     val interactor = mockk<BrowserTrayInteractor>(relaxed = true)
@@ -79,7 +78,7 @@ class TabsTrayViewHolderTest {
         store: BrowserStore,
         metrics: MetricController,
         override val browserTrayInteractor: BrowserTrayInteractor
-    ) : TabsTrayViewHolder(itemView, imageLoader, trayStore, selectionHolder, store, metrics) {
+    ) : AbstractBrowserTabViewHolder(itemView, imageLoader, trayStore, selectionHolder, store, metrics) {
         override val thumbnailSize: Int
             get() = 30
 
diff --git a/app/src/test/java/org/mozilla/fenix/tabstray/browser/BrowserTabsAdapterTest.kt b/app/src/test/java/org/mozilla/fenix/tabstray/browser/BrowserTabsAdapterTest.kt
index 9e9cf6832..04d5b8d65 100644
--- a/app/src/test/java/org/mozilla/fenix/tabstray/browser/BrowserTabsAdapterTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/tabstray/browser/BrowserTabsAdapterTest.kt
@@ -17,7 +17,6 @@ import org.junit.runner.RunWith
 import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
 import org.mozilla.fenix.selection.SelectionHolder
 import org.mozilla.fenix.tabstray.TabsTrayStore
-import org.mozilla.fenix.tabstray.TabsTrayViewHolder
 
 @RunWith(FenixRobolectricTestRunner::class)
 class BrowserTabsAdapterTest {
@@ -29,7 +28,7 @@ class BrowserTabsAdapterTest {
     @Test
     fun `WHEN bind with payloads is called THEN update the holder`() {
         val adapter = BrowserTabsAdapter(context, interactor, store)
-        val holder = mockk<TabsTrayViewHolder>(relaxed = true)
+        val holder = mockk<AbstractBrowserTabViewHolder>(relaxed = true)
 
         adapter.updateTabs(Tabs(
             list = listOf(
@@ -50,7 +49,7 @@ class BrowserTabsAdapterTest {
     @Test
     fun `WHEN the selection holder is set THEN update the selected tab`() {
         val adapter = BrowserTabsAdapter(context, interactor, store)
-        val holder = mockk<TabsTrayViewHolder>(relaxed = true)
+        val holder = mockk<AbstractBrowserTabViewHolder>(relaxed = true)
         val tab = createTab("tab1")
 
         every { holder.tab }.answers { tab }
diff --git a/app/src/test/java/org/mozilla/fenix/tabstray/browser/BaseBrowserTrayListTest.kt b/app/src/test/java/org/mozilla/fenix/tabstray/browser/BrowserTrayListTest.kt
similarity index 75%
rename from app/src/test/java/org/mozilla/fenix/tabstray/browser/BaseBrowserTrayListTest.kt
rename to app/src/test/java/org/mozilla/fenix/tabstray/browser/BrowserTrayListTest.kt
index fe9f19402..b3422ee58 100644
--- a/app/src/test/java/org/mozilla/fenix/tabstray/browser/BaseBrowserTrayListTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/tabstray/browser/BrowserTrayListTest.kt
@@ -4,7 +4,6 @@
 
 package org.mozilla.fenix.tabstray.browser
 
-import android.content.Context
 import io.mockk.mockk
 import io.mockk.verify
 import mozilla.components.support.test.robolectric.testContext
@@ -14,11 +13,11 @@ import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
 import org.mozilla.fenix.tabstray.TabsTrayStore
 
 @RunWith(FenixRobolectricTestRunner::class)
-class BaseBrowserTrayListTest {
+class BrowserTrayListTest {
 
     @Test
     fun `WHEN recyclerview detaches from window THEN notify adapter`() {
-        val trayList = TestBaseBrowserTrayList(testContext)
+        val trayList = BrowserTrayList(testContext)
         val adapter = mockk<BrowserTabsAdapter>(relaxed = true)
 
         trayList.adapter = adapter
@@ -28,8 +27,4 @@ class BaseBrowserTrayListTest {
 
         verify { adapter.onDetachedFromRecyclerView(trayList) }
     }
-
-    class TestBaseBrowserTrayList(context: Context) : BaseBrowserTrayList(context) {
-        override val configuration = Configuration(BrowserTabType.PRIVATE)
-    }
 }
diff --git a/app/src/test/java/org/mozilla/fenix/tabstray/browser/SelectionMenuIntegrationTest.kt b/app/src/test/java/org/mozilla/fenix/tabstray/browser/SelectionMenuIntegrationTest.kt
index 24a2635df..d426a3375 100644
--- a/app/src/test/java/org/mozilla/fenix/tabstray/browser/SelectionMenuIntegrationTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/tabstray/browser/SelectionMenuIntegrationTest.kt
@@ -6,32 +6,45 @@ package org.mozilla.fenix.tabstray.browser
 
 import io.mockk.mockk
 import io.mockk.verify
+import mozilla.components.support.test.libstate.ext.waitUntilIdle
+import mozilla.components.support.test.middleware.CaptureActionsMiddleware
 import org.junit.Test
 import org.mozilla.fenix.tabstray.NavigationInteractor
+import org.mozilla.fenix.tabstray.TabsTrayAction
 import org.mozilla.fenix.tabstray.TabsTrayInteractor
+import org.mozilla.fenix.tabstray.TabsTrayState
 import org.mozilla.fenix.tabstray.TabsTrayStore
 
 class SelectionMenuIntegrationTest {
 
     private val navInteractor = mockk<NavigationInteractor>(relaxed = true)
     private val trayInteractor = mockk<TabsTrayInteractor>(relaxed = true)
-    private val store = TabsTrayStore()
+    private val capture = CaptureActionsMiddleware<TabsTrayState, TabsTrayAction>()
+    private val store = TabsTrayStore(middlewares = listOf(capture))
 
     @Test
-    fun `WHEN bookmark item is clicked THEN invoke interactor`() {
+    fun `WHEN bookmark item is clicked THEN invoke interactor and close tray`() {
         val menu = SelectionMenuIntegration(mockk(), store, navInteractor, trayInteractor)
 
         menu.handleMenuClicked(SelectionMenu.Item.BookmarkTabs)
 
+        store.waitUntilIdle()
+
         verify { navInteractor.onSaveToBookmarks(store.state.mode.selectedTabs) }
+
+        capture.findLastAction(TabsTrayAction.ExitSelectMode::class)
     }
 
     @Test
-    fun `WHEN delete tabs item is clicked THEN invoke interactor`() {
+    fun `WHEN delete tabs item is clicked THEN invoke interactor and close tray`() {
         val menu = SelectionMenuIntegration(mockk(), store, navInteractor, trayInteractor)
 
         menu.handleMenuClicked(SelectionMenu.Item.DeleteTabs)
 
+        store.waitUntilIdle()
+
         verify { trayInteractor.onDeleteTabs(store.state.mode.selectedTabs) }
+
+        capture.findLastAction(TabsTrayAction.ExitSelectMode::class)
     }
 }
diff --git a/app/src/test/java/org/mozilla/fenix/tabstray/browser/TabsTouchHelperTest.kt b/app/src/test/java/org/mozilla/fenix/tabstray/browser/TabsTouchHelperTest.kt
index 9cab8e53f..9d9289eb3 100644
--- a/app/src/test/java/org/mozilla/fenix/tabstray/browser/TabsTouchHelperTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/tabstray/browser/TabsTouchHelperTest.kt
@@ -15,7 +15,7 @@ import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
-import org.mozilla.fenix.tabstray.viewholders.SyncedTabViewHolder
+import org.mozilla.fenix.tabstray.viewholders.SyncedTabsPageViewHolder
 
 @RunWith(FenixRobolectricTestRunner::class)
 class TabsTouchHelperTest {
@@ -24,7 +24,7 @@ class TabsTouchHelperTest {
     fun `movement flags remain unchanged if onSwipeToDelete is true`() {
         val recyclerView = RecyclerView(testContext)
         val layout = FrameLayout(testContext)
-        val viewHolder = SyncedTabViewHolder(layout, mockk())
+        val viewHolder = SyncedTabsPageViewHolder(layout, mockk())
         val callback = TouchCallback(mockk(), { true }, mockk())
 
         assertEquals(0, callback.getDragDirs(recyclerView, viewHolder))
@@ -43,7 +43,7 @@ class TabsTouchHelperTest {
     fun `movement flags remain unchanged if onSwipeToDelete is false`() {
         val recyclerView = RecyclerView(testContext)
         val layout = FrameLayout(testContext)
-        val viewHolder = SyncedTabViewHolder(layout, mockk())
+        val viewHolder = SyncedTabsPageViewHolder(layout, mockk())
         val callback = TouchCallback(mockk(), { false }, mockk())
 
         assertEquals(0, callback.getDragDirs(recyclerView, viewHolder))
diff --git a/app/src/test/java/org/mozilla/fenix/tabstray/ext/TabSessionStateKtTest.kt b/app/src/test/java/org/mozilla/fenix/tabstray/ext/TabSessionStateKtTest.kt
index 410c4eac7..d8efb4e56 100644
--- a/app/src/test/java/org/mozilla/fenix/tabstray/ext/TabSessionStateKtTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/tabstray/ext/TabSessionStateKtTest.kt
@@ -11,9 +11,8 @@ import mozilla.components.browser.state.state.TabSessionState
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
 import org.junit.Test
-import org.mozilla.fenix.tabstray.browser.BaseBrowserTrayList.BrowserTabType.NORMAL
-import org.mozilla.fenix.tabstray.browser.BaseBrowserTrayList.BrowserTabType.PRIVATE
-import org.mozilla.fenix.tabstray.browser.BaseBrowserTrayList.Configuration
+import org.mozilla.fenix.tabstray.browser.BrowserTrayList.BrowserTabType.NORMAL
+import org.mozilla.fenix.tabstray.browser.BrowserTrayList.BrowserTabType.PRIVATE
 
 class TabSessionStateKtTest {
 
@@ -21,7 +20,7 @@ class TabSessionStateKtTest {
     fun `WHEN configuration is private THEN return true`() {
         val contentState = mockk<ContentState>()
         val state = TabSessionState(content = contentState)
-        val config = Configuration(PRIVATE)
+        val config = PRIVATE
 
         every { contentState.private } returns true
 
@@ -32,7 +31,7 @@ class TabSessionStateKtTest {
     fun `WHEN configuration is normal THEN return false`() {
         val contentState = mockk<ContentState>()
         val state = TabSessionState(content = contentState)
-        val config = Configuration(NORMAL)
+        val config = NORMAL
 
         every { contentState.private } returns false
 
@@ -43,13 +42,13 @@ class TabSessionStateKtTest {
     fun `WHEN configuration does not match THEN return false`() {
         val contentState = mockk<ContentState>()
         val state = TabSessionState(content = contentState)
-        val config = Configuration(NORMAL)
+        val config = NORMAL
 
         every { contentState.private } returns true
 
         assertFalse(state.filterFromConfig(config))
 
-        val config2 = Configuration(PRIVATE)
+        val config2 = PRIVATE
 
         every { contentState.private } returns false
 
diff --git a/app/src/test/java/org/mozilla/fenix/tabstray/viewholders/BaseBrowserTabViewHolderTest.kt b/app/src/test/java/org/mozilla/fenix/tabstray/viewholders/AbstractBrowserPageViewHolderTest.kt
similarity index 85%
rename from app/src/test/java/org/mozilla/fenix/tabstray/viewholders/BaseBrowserTabViewHolderTest.kt
rename to app/src/test/java/org/mozilla/fenix/tabstray/viewholders/AbstractBrowserPageViewHolderTest.kt
index 9e1c31af1..6598682ce 100644
--- a/app/src/test/java/org/mozilla/fenix/tabstray/viewholders/BaseBrowserTabViewHolderTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/tabstray/viewholders/AbstractBrowserPageViewHolderTest.kt
@@ -19,13 +19,13 @@ import org.mozilla.fenix.R
 import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
 import org.mozilla.fenix.tabstray.TabsTrayInteractor
 import org.mozilla.fenix.tabstray.TabsTrayStore
-import org.mozilla.fenix.tabstray.browser.BaseBrowserTrayList
+import org.mozilla.fenix.tabstray.browser.BrowserTrayList
 import org.mozilla.fenix.tabstray.browser.BrowserTabsAdapter
 import org.mozilla.fenix.tabstray.browser.BrowserTrayInteractor
 import org.mozilla.fenix.tabstray.browser.createTab
 
 @RunWith(FenixRobolectricTestRunner::class)
-class BaseBrowserTabViewHolderTest {
+class AbstractBrowserPageViewHolderTest {
     val store: TabsTrayStore = TabsTrayStore()
     val interactor = mockk<TabsTrayInteractor>(relaxed = true)
     val browserTrayInteractor = mockk<BrowserTrayInteractor>(relaxed = true)
@@ -35,8 +35,8 @@ class BaseBrowserTabViewHolderTest {
     fun `WHEN tabs inserted THEN show tray`() {
         val itemView =
             LayoutInflater.from(testContext).inflate(R.layout.normal_browser_tray_list, null)
-        val viewHolder = NormalBrowserTabViewHolder(itemView, store, interactor, 5)
-        val trayList: BaseBrowserTrayList = itemView.findViewById(R.id.tray_list_item)
+        val viewHolder = NormalBrowserPageViewHolder(itemView, store, interactor, 5)
+        val trayList: BrowserTrayList = itemView.findViewById(R.id.tray_list_item)
         val emptyList: TextView = itemView.findViewById(R.id.tab_tray_empty_view)
 
         viewHolder.bind(adapter, LinearLayoutManager(testContext))
@@ -59,8 +59,8 @@ class BaseBrowserTabViewHolderTest {
     fun `WHEN no tabs THEN show empty view`() {
         val itemView =
             LayoutInflater.from(testContext).inflate(R.layout.normal_browser_tray_list, null)
-        val viewHolder = NormalBrowserTabViewHolder(itemView, store, interactor, 5)
-        val trayList: BaseBrowserTrayList = itemView.findViewById(R.id.tray_list_item)
+        val viewHolder = NormalBrowserPageViewHolder(itemView, store, interactor, 5)
+        val trayList: BrowserTrayList = itemView.findViewById(R.id.tray_list_item)
         val emptyList: TextView = itemView.findViewById(R.id.tab_tray_empty_view)
 
         viewHolder.bind(adapter, LinearLayoutManager(testContext))
diff --git a/app/src/test/java/org/mozilla/fenix/utils/SettingsTest.kt b/app/src/test/java/org/mozilla/fenix/utils/SettingsTest.kt
index 7c68f0e14..34804070f 100644
--- a/app/src/test/java/org/mozilla/fenix/utils/SettingsTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/utils/SettingsTest.kt
@@ -183,13 +183,13 @@ class SettingsTest {
     fun showLoginsDialogWarning() {
         // When just created
         // Then
-        assertEquals(0, settings.loginsSecureWarningCount.value)
+        assertEquals(0, settings.secureWarningCount.value)
 
         // When
-        settings.incrementShowLoginsSecureWarningCount()
+        settings.incrementSecureWarningCount()
 
         // Then
-        assertEquals(1, settings.loginsSecureWarningCount.value)
+        assertEquals(1, settings.secureWarningCount.value)
     }
 
     @Test
@@ -199,7 +199,7 @@ class SettingsTest {
         assertTrue(settings.shouldShowSecurityPinWarning)
 
         // When
-        settings.incrementShowLoginsSecureWarningCount()
+        settings.incrementSecureWarningCount()
 
         // Then
         assertFalse(settings.shouldShowSecurityPinWarning)
@@ -671,4 +671,23 @@ class SettingsTest {
         assertEquals("testAmoUser", settings.overrideAmoUser)
         assertTrue(settings.amoCollectionOverrideConfigured())
     }
+
+    @Test
+    fun creditCardsSavedCount() {
+        // When just created
+        // Then
+        assertEquals(0, settings.creditCardsSavedCount)
+
+        // When
+        settings.creditCardsSavedCount += 1
+
+        // Then
+        assertEquals(1, settings.creditCardsSavedCount)
+
+        // When
+        settings.creditCardsSavedCount += 1
+
+        // Then
+        assertEquals(2, settings.creditCardsSavedCount)
+    }
 }
diff --git a/app/src/test/java/org/mozilla/fenix/widget/SearchWidgetProviderTest.kt b/app/src/test/java/org/mozilla/fenix/widget/SearchWidgetProviderTest.kt
index 34ff21d76..6244dc55c 100644
--- a/app/src/test/java/org/mozilla/fenix/widget/SearchWidgetProviderTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/widget/SearchWidgetProviderTest.kt
@@ -4,16 +4,29 @@
 
 package org.mozilla.fenix.widget
 
+import android.appwidget.AppWidgetManager
+import android.content.ComponentName
 import android.content.Context
+import android.content.Intent
+import io.mockk.Runs
 import io.mockk.every
+import io.mockk.just
 import io.mockk.mockk
+import io.mockk.mockkStatic
+import io.mockk.slot
+import io.mockk.unmockkStatic
+import io.mockk.verify
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
 import org.junit.Test
+import org.junit.runner.RunWith
 import org.mozilla.fenix.R
+import org.mozilla.fenix.ext.settings
+import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
 import org.mozilla.gecko.search.SearchWidgetProvider
 import org.mozilla.gecko.search.SearchWidgetProviderSize
 
+@RunWith(FenixRobolectricTestRunner::class)
 class SearchWidgetProviderTest {
 
     @Test
@@ -115,4 +128,62 @@ class SearchWidgetProviderTest {
         assertNull(SearchWidgetProvider.getText(SearchWidgetProviderSize.EXTRA_SMALL_V1, context))
         assertNull(SearchWidgetProvider.getText(SearchWidgetProviderSize.EXTRA_SMALL_V2, context))
     }
+
+    @Test
+    fun `GIVEN voice search is disabled WHEN createVoiceSearchIntent is called THEN it returns null`() {
+        val widgetProvider = SearchWidgetProvider()
+        val context: Context = mockk {
+            every { settings().shouldShowVoiceSearch } returns false
+        }
+
+        val result = widgetProvider.createVoiceSearchIntent(context)
+
+        assertNull(result)
+    }
+
+    @Test
+    fun `GIVEN widgets set on screen shown WHEN updateAllWidgets is called THEN it sends a broadcast to update all widgets`() {
+        try {
+            mockkStatic(AppWidgetManager::class)
+            val widgetManager: AppWidgetManager = mockk()
+            every { AppWidgetManager.getInstance(any()) } returns widgetManager
+            val componentNameCaptor = slot<ComponentName>()
+            val widgetsToUpdate = intArrayOf(1, 2)
+            every { widgetManager.getAppWidgetIds(capture(componentNameCaptor)) } returns widgetsToUpdate
+            val context: Context = mockk(relaxed = true)
+            val intentCaptor = slot<Intent>()
+            every { context.sendBroadcast(capture(intentCaptor)) } just Runs
+
+            SearchWidgetProvider.updateAllWidgets(context)
+
+            verify { context.sendBroadcast(any()) }
+            assertEquals(SearchWidgetProvider::class.java.name, componentNameCaptor.captured.className)
+            assertEquals(SearchWidgetProvider::class.java.name, intentCaptor.captured.component!!.className)
+            assertEquals(AppWidgetManager.ACTION_APPWIDGET_UPDATE, intentCaptor.captured.action)
+            assertEquals(widgetsToUpdate, intentCaptor.captured.extras!!.get(AppWidgetManager.EXTRA_APPWIDGET_IDS))
+        } finally {
+            unmockkStatic(AppWidgetManager::class)
+        }
+    }
+
+    @Test
+    fun `GIVEN no widgets set shown WHEN updateAllWidgets is called THEN it does not try to update widgets`() {
+        try {
+            mockkStatic(AppWidgetManager::class)
+            val widgetManager: AppWidgetManager = mockk()
+            every { AppWidgetManager.getInstance(any()) } returns widgetManager
+            val componentNameCaptor = slot<ComponentName>()
+            val widgetsToUpdate = intArrayOf()
+            every { widgetManager.getAppWidgetIds(capture(componentNameCaptor)) } returns widgetsToUpdate
+            val context: Context = mockk(relaxed = true)
+            val intentCaptor = slot<Intent>()
+            every { context.sendBroadcast(capture(intentCaptor)) } just Runs
+
+            SearchWidgetProvider.updateAllWidgets(context)
+
+            verify(exactly = 0) { context.sendBroadcast(any()) }
+        } finally {
+            unmockkStatic(AppWidgetManager::class)
+        }
+    }
 }
diff --git a/automation/taskcluster/update_android_components.sh b/automation/taskcluster/update_android_components.sh
index c16180564..33c64a95a 100755
--- a/automation/taskcluster/update_android_components.sh
+++ b/automation/taskcluster/update_android_components.sh
@@ -13,7 +13,7 @@ export REPO="fenix"
 git config --global user.email "$EMAIL"
 git config --global user.name "$GITHUB_USER"
 
-COMPONENT_TO_WATCH='browser-engine-gecko-nightly'
+COMPONENT_TO_WATCH='browser-engine-gecko'
 MAVEN_URL="https://nightly.maven.mozilla.org/maven2/org/mozilla/components/$COMPONENT_TO_WATCH"
 
 # Fetch latest version
diff --git a/build.gradle b/build.gradle
index b70268be5..ef36e1705 100644
--- a/build.gradle
+++ b/build.gradle
@@ -74,7 +74,7 @@ buildscript {
 }
 
 plugins {
-    id("io.gitlab.arturbosch.detekt").version("1.9.1")
+    id("io.gitlab.arturbosch.detekt").version("1.17.1")
 }
 
 allprojects {
@@ -132,35 +132,6 @@ allprojects {
                 }
             }
         }
-
-        if (project.hasProperty("jcenterRepo")) {
-            maven {
-                name "BintrayJCenter"
-                url project.property("jcenterRepo")
-            }
-        } else {
-            jcenter() {
-                content {
-                    ////////////////////////////////////////////////////////////////////////////////
-                    // JCenter is going away. Please do not add any new dependencies here.
-                    // https://jfrog.com/blog/into-the-sunset-bintray-jcenter-gocenter-and-chartcenter/
-                    ////////////////////////////////////////////////////////////////////////////////
-
-                    // Used by detekt
-                    // Issue for publishing to maven central: https://github.com/Kotlin/kotlinx.html/issues/173
-                    // Related detekt issue: https://github.com/detekt/detekt/issues/3461
-                    includeVersion("org.jetbrains.kotlinx", "kotlinx-html-jvm", "0.7.1")
-                    includeVersion("org.jetbrains.kotlinx", "kotlinx-html-common", "0.7.1")
-
-                    // Fastlane
-                    // Doesn't seem to be available on Maven Central yet, and I couldn't find an issue for it
-                    // https://github.com/fastlane/fastlane/issues/18174
-                    includeVersion("tools.fastlane", "screengrab", "2.0.0")
-                    // https://github.com/jraska/Falcon/issues/52
-                    includeVersion("com.jraska", "falcon", "2.1.1")
-                }
-            }
-        }
     }
 
     tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
@@ -178,7 +149,7 @@ tasks.register('clean', Delete) {
 
 detekt {
     // The version number is duplicated, please refer to plugins block for more details
-    version = "1.9.1"
+    version = "1.17.1"
     input = files("$projectDir/app/src")
     config = files("$projectDir/config/detekt.yml")
 
diff --git a/buildSrc/src/main/java/AndroidComponents.kt b/buildSrc/src/main/java/AndroidComponents.kt
index bc72d908c..dd17e42c3 100644
--- a/buildSrc/src/main/java/AndroidComponents.kt
+++ b/buildSrc/src/main/java/AndroidComponents.kt
@@ -3,5 +3,5 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 object AndroidComponents {
-    const val VERSION = "75.0.22"
+    const val VERSION = "90.0.13"
 }
diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt
index 236689878..52e6cc164 100644
--- a/buildSrc/src/main/java/Config.kt
+++ b/buildSrc/src/main/java/Config.kt
@@ -36,6 +36,14 @@ object Config {
         return if (project.hasProperty("versionName")) project.property("versionName") as String else ""
     }
 
+    @JvmStatic
+    fun nightlyVersionName(): String {
+        // Nightly versions use the Gecko/A-C major version and append "0.a1", e.g. with A-C 90.0.20210426143115
+        // the Nightly version will be 90.0a1
+        val majorVersion = AndroidComponents.VERSION.split(".")[0]
+        return "$majorVersion.0a1"
+    }
+
     @JvmStatic
     fun generateBuildDate(): String {
         val dateTime = LocalDateTime.now()
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index 524d7d1c6..10e683ab1 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -14,7 +14,7 @@ object Versions {
     const val sentry = "1.7.10"
     const val leakcanary = "2.4"
     const val osslicenses_plugin = "0.9.5"
-    const val detekt = "1.9.1"
+    const val detekt = "1.17.1"
     const val jna = "5.6.0"
 
     const val androidx_appcompat = "1.2.0"
@@ -75,12 +75,9 @@ object Deps {
     const val mozilla_concept_sync = "org.mozilla.components:concept-sync:${Versions.mozilla_android_components}"
 
     const val mozilla_browser_awesomebar = "org.mozilla.components:browser-awesomebar:${Versions.mozilla_android_components}"
-    const val mozilla_browser_engine_gecko_nightly = "org.mozilla.components:browser-engine-gecko-nightly:${Versions.mozilla_android_components}"
-    const val mozilla_browser_engine_gecko_beta = "org.mozilla.components:browser-engine-gecko-beta:${Versions.mozilla_android_components}"
-    const val mozilla_browser_engine_gecko_release = "org.mozilla.components:browser-engine-gecko:${Versions.mozilla_android_components}"
+    const val mozilla_browser_engine_gecko = "org.mozilla.components:browser-engine-gecko:${Versions.mozilla_android_components}"
     const val mozilla_browser_domains = "org.mozilla.components:browser-domains:${Versions.mozilla_android_components}"
     const val mozilla_browser_icons = "org.mozilla.components:browser-icons:${Versions.mozilla_android_components}"
-    const val mozilla_browser_search = "org.mozilla.components:browser-search:${Versions.mozilla_android_components}"
     const val mozilla_browser_session = "org.mozilla.components:browser-session:${Versions.mozilla_android_components}"
     const val mozilla_browser_session_storage = "org.mozilla.components:browser-session-storage:${Versions.mozilla_android_components}"
     const val mozilla_browser_state = "org.mozilla.components:browser-state:${Versions.mozilla_android_components}"
@@ -148,6 +145,7 @@ object Deps {
     const val mozilla_lib_crash = "org.mozilla.components:lib-crash:${Versions.mozilla_android_components}"
     const val mozilla_lib_push_firebase = "org.mozilla.components:lib-push-firebase:${Versions.mozilla_android_components}"
     const val mozilla_lib_dataprotect = "org.mozilla.components:lib-dataprotect:${Versions.mozilla_android_components}"
+    const val mozilla_lib_state = "org.mozilla.components:lib-state:${Versions.mozilla_android_components}"
 
     const val mozilla_lib_publicsuffixlist = "org.mozilla.components:lib-publicsuffixlist:${Versions.mozilla_android_components}"
 
@@ -250,8 +248,8 @@ object RepoMatching {
     /**
      * A matcher for com.google.android.* with one exception: the espresso-contrib dependency includes the
      * accessibility-test-framework dependency, which is not available in the google repo. As such, we must
-     * explicitly exclude it from this regex so it can be found on jcenter. Note that the transitive dependency
-     * com.google.guava is also not available on google's repo.
+     * explicitly exclude it from this regex so it can be found on Maven Central. Note that the transitive
+     * dependency com.google.guava is also not available on google's repo.
      */
     const val comGoogleAndroid = "com\\.google\\.android\\.(?!apps\\.common\\.testing\\.accessibility\\.framework).*"
 }
diff --git a/config/pre-push-recommended.sh b/config/pre-push-recommended.sh
index 9d140ce3d..aae279a29 100755
--- a/config/pre-push-recommended.sh
+++ b/config/pre-push-recommended.sh
@@ -14,24 +14,6 @@
 # Descriptions for each gradle task below can be found in the
 # output of `./gradlew tasks`.
 
-# Prevent push if generated glean docs are not committed.
-# A better implementation would make sure these doc updates
-# only came from this commit.
-./gradlew -q \
-        gleanGenerateMetricsDocsForDebug \
-        gleanGenerateMetricsSourceForDebug
-if git status --porcelain=v1 | grep -q "docs/metrics.md"; then
-  echo "
-FAIL pre-push hook: generated glean file, docs/metrics.md, has uncommitted changes.
-Please commit these files and try again.
-
-This check tries to prevent these generated files from being uncommitted on master.
-However, it may fail unintuitively if we're in that state. If this happens often
-and is disruptive to your workflow, please notify mcomella so we can improve this
-check." >&2
-  exit 1
-fi
-
 # Run core checks.
 ./gradlew -q \
         ktlint \
diff --git a/docs/metrics.md b/docs/metrics.md
index 704f337f4..ea4ebedb2 100644
--- a/docs/metrics.md
+++ b/docs/metrics.md
@@ -1,435 +1,5 @@
-<!-- AUTOGENERATED BY glean_parser.  DO NOT EDIT. -->
+# Metrics definitions have moved
 
-# Metrics
-
-This document enumerates the metrics collected by this project using the [Glean SDK](https://mozilla.github.io/glean/book/index.html).
-This project may depend on other projects which also collect metrics.
-This means you might have to go searching through the dependency tree to get a full picture of everything collected by this project.
-
-# Pings
-
-- [activation](#activation)
-- [events](#events)
-- [first-session](#first-session)
-- [metrics](#metrics)
-- [startup-timeline](#startup-timeline)
-
-## activation
-
-This ping is intended to provide a measure of the activation of mobile
-products. It's generated when Fenix starts, right after Glean is
-initialized. It doesn't include the client_id, since it might be reporting
-an hashed version of the Google Advertising ID.
-
-
-**Data reviews for this ping:**
-
-- <https://github.com/mozilla-mobile/fenix/pull/1707#issuecomment-486972209>
-
-**Bugs related to this ping:**
-
-- <https://bugzilla.mozilla.com/1538011/>
-- <https://bugzilla.mozilla.com/1501822/>
-
-All Glean pings contain built-in metrics in the [`ping_info`](https://mozilla.github.io/glean/book/user/pings/index.html#the-ping_info-section) and [`client_info`](https://mozilla.github.io/glean/book/user/pings/index.html#the-client_info-section) sections.
-
-In addition to those built-in metrics, the following metrics are added to the ping:
-
-| Name | Type | Description | Data reviews | Extras | Expiration | [Data Sensitivity](https://wiki.mozilla.org/Firefox/Data_Collection) |
-| --- | --- | --- | --- | --- | --- | --- |
-| activation.activation_id |[uuid](https://mozilla.github.io/glean/book/user/metrics/uuid.html) |An alternate identifier, not correlated with the client_id, generated once and only sent with the activation ping.  |[mozilla-mobile/fenix#1707](https://github.com/mozilla-mobile/fenix/pull/1707#issuecomment-486972209), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |4 |
-| activation.identifier |[string](https://mozilla.github.io/glean/book/user/metrics/string.html) |A hashed and salted version of the Google Advertising ID from the device. This will never be sent in a ping that also contains the client_id.  |[mozilla-mobile/fenix#1707](https://github.com/mozilla-mobile/fenix/pull/1707#issuecomment-486972209), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |4 |
-
-## events
-
-This is a built-in ping that is assembled out of the box by the Glean SDK.
-
-See the Glean SDK documentation for the [`events` ping](https://mozilla.github.io/glean/book/user/pings/events.html).
-
-All Glean pings contain built-in metrics in the [`ping_info`](https://mozilla.github.io/glean/book/user/pings/index.html#the-ping_info-section) and [`client_info`](https://mozilla.github.io/glean/book/user/pings/index.html#the-client_info-section) sections.
-
-In addition to those built-in metrics, the following metrics are added to the ping:
-
-| Name | Type | Description | Data reviews | Extras | Expiration | [Data Sensitivity](https://wiki.mozilla.org/Firefox/Data_Collection) |
-| --- | --- | --- | --- | --- | --- | --- |
-| about_page.privacy_notice_tapped |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user tapped on "Privacy notice" item from About page  |[mozilla-mobile/fenix#8047](https://github.com/mozilla-mobile/fenix/pull/8047), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |2 |
-| about_page.support_tapped |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user tapped on "Support" item from About page  |[mozilla-mobile/fenix#8047](https://github.com/mozilla-mobile/fenix/pull/8047), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |2 |
-| addons.open_addon_in_toolbar_menu |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user interacted with an installed add-on in the toolbar menu  |[mozilla-mobile/fenix#8318](https://github.com/mozilla-mobile/fenix/pull/8318), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)|<ul><li>addon_id: The id of the add-on that was interacted with in the toolbar menu </li></ul>|2021-07-01 |2 |
-| addons.open_addon_setting |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user opened an add-on's setting  |[mozilla-mobile/fenix#18504](https://github.com/mozilla-mobile/fenix/pull/18504)|<ul><li>addon_id: The id of the add-on that was interacted with </li></ul>|2022-08-01 |2 |
-| addons.open_addons_in_settings |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user accessed "Add-ons" from the Settings  |[mozilla-mobile/fenix#8318](https://github.com/mozilla-mobile/fenix/pull/8318), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |2 |
-| android_keystore_experiment.experiment_failure |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |Records an instance of an unexpected failure during the experiment  |[mozilla-mobile/fenix#18333](https://github.com/mozilla-mobile/fenix/pull/18333#pullrequestreview-612447395)|<ul><li>failure_exception: Exception class associated with an unexpected failure of this experiment, not caught by the other failure handlers. </li></ul>|2021-09-01 |1 |
-| android_keystore_experiment.get_failure |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |Unexpected failure when trying to read from secure prefs.  |[mozilla-mobile/fenix#18333](https://github.com/mozilla-mobile/fenix/pull/18333#pullrequestreview-612447395)|<ul><li>failure_exception: Exception class associated with an unexpected failure of this experiment. </li></ul>|2021-09-01 |1 |
-| android_keystore_experiment.get_result |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |Success when trying to read from secure prefs.  |[mozilla-mobile/fenix#18333](https://github.com/mozilla-mobile/fenix/pull/18333#pullrequestreview-612447395)|<ul><li>result: Result code identifying whether the read operation returned the expected value or not. </li></ul>|2021-09-01 |1 |
-| android_keystore_experiment.reset |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |An experiment failed, and was reset to run again in the future from a blank state.  |[mozilla-mobile/fenix#18333](https://github.com/mozilla-mobile/fenix/pull/18333#pullrequestreview-612447395)||2021-09-01 |1 |
-| android_keystore_experiment.write_failure |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |Unexpected failure when trying to write to secure prefs.  |[mozilla-mobile/fenix#18333](https://github.com/mozilla-mobile/fenix/pull/18333#pullrequestreview-612447395)|<ul><li>failure_exception: Exception class associated with an unexpected failure of this experiment. </li></ul>|2021-09-01 |1 |
-| android_keystore_experiment.write_success |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |Success in writing to secure prefs.  |[mozilla-mobile/fenix#18333](https://github.com/mozilla-mobile/fenix/pull/18333#pullrequestreview-612447395)||2021-09-01 |1 |
-| app_theme.dark_theme_selected |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user selected Dark Theme  |[mozilla-mobile/fenix#7968](https://github.com/mozilla-mobile/fenix/pull/7968), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)|<ul><li>source: The source from where dark theme was selected. The source can be 'SETTINGS' or 'ONBOARDING' </li></ul>|2021-07-01 |2 |
-| autoplay.setting_changed |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user changed their autoplay setting to either block_cellular, block_audio, or block_all.  |[mozilla-mobile/fenix#13041](https://github.com/mozilla-mobile/fenix/pull/13041#issuecomment-665777411)|<ul><li>autoplay_setting: The new setting for autoplay: block_cellular, block_audio, or block_all. </li></ul>|2021-08-01 |2 |
-| autoplay.visited_setting |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user visited the autoplay settings screen |[mozilla-mobile/fenix#13041](https://github.com/mozilla-mobile/fenix/pull/13041#issuecomment-665777411)||2021-08-01 |2 |
-| awesomebar.bookmark_suggestion_clicked |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |The bookmark suggestion in awesomebar was clicked.  |[mozilla-mobile/fenix#18090](https://github.com/mozilla-mobile/fenix/pull/18090)||2021-08-01 |2 |
-| awesomebar.clipboard_suggestion_clicked |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |The clipboard suggestion in awesomebar was clicked.  |[mozilla-mobile/fenix#18090](https://github.com/mozilla-mobile/fenix/pull/18090)||2021-08-01 |2 |
-| awesomebar.history_suggestion_clicked |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |The history suggestion in awesomebar was clicked.  |[mozilla-mobile/fenix#18090](https://github.com/mozilla-mobile/fenix/pull/18090)||2021-08-01 |2 |
-| awesomebar.opened_tab_suggestion_clicked |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |The opened tab suggestion in awesomebar was clicked.  |[mozilla-mobile/fenix#18090](https://github.com/mozilla-mobile/fenix/pull/18090)||2021-08-01 |2 |
-| awesomebar.search_action_clicked |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |The search action in awesomebar was clicked.  |[mozilla-mobile/fenix#18090](https://github.com/mozilla-mobile/fenix/pull/18090)||2021-08-01 |2 |
-| awesomebar.search_suggestion_clicked |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |The search suggestion in awesomebar was clicked.  |[mozilla-mobile/fenix#18090](https://github.com/mozilla-mobile/fenix/pull/18090)||2021-08-01 |2 |
-| banner_open_in_app.dismissed |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |User tapped 'dismiss' on Open in App banner.  |[mozilla-mobile/fenix#17049](https://github.com/mozilla-mobile/fenix/pull/17049)||2021-08-01 |2 |
-| banner_open_in_app.displayed |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |Open in App banner was shown.  |[mozilla-mobile/fenix#17049](https://github.com/mozilla-mobile/fenix/pull/17049)||2021-08-01 |2 |
-| banner_open_in_app.go_to_settings |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |User tapped 'go to settings' on Open in App banner.  |[mozilla-mobile/fenix#17049](https://github.com/mozilla-mobile/fenix/pull/17049)||2021-08-01 |2 |
-| bookmarks_management.copied |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user copied a bookmark.  |[mozilla-mobile/fenix#1708](https://github.com/mozilla-mobile/fenix/pull/1708), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |2 |
-| bookmarks_management.edited |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user edited the title and/or URL of an existing bookmark.  |[mozilla-mobile/fenix#1708](https://github.com/mozilla-mobile/fenix/pull/1708), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |2 |
-| bookmarks_management.folder_add |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user added a new bookmark folder.  |[mozilla-mobile/fenix#1708](https://github.com/mozilla-mobile/fenix/pull/1708), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |2 |
-| bookmarks_management.folder_remove |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user removed a bookmark folder.  |[mozilla-mobile/fenix#3724](https://github.com/mozilla-mobile/fenix/pull/3724), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |2 |
-| bookmarks_management.moved |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user moved an existing bookmark or folder to another folder.  |[mozilla-mobile/fenix#1708](https://github.com/mozilla-mobile/fenix/pull/1708), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |2 |
-| bookmarks_management.multi_removed |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user removed multiple bookmarks at once.  |[mozilla-mobile/fenix#1708](https://github.com/mozilla-mobile/fenix/pull/1708), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |2 |
-| bookmarks_management.open |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user opened a bookmark.  |[mozilla-mobile/fenix#18174](https://github.com/mozilla-mobile/fenix/pull/18174)||2022-08-01 |2 |
-| bookmarks_management.open_in_new_tab |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user opened a bookmark in a new tab.  |[mozilla-mobile/fenix#1708](https://github.com/mozilla-mobile/fenix/pull/1708), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |2 |
-| bookmarks_management.open_in_new_tabs |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user opened multiple bookmarks at once in new tabs.  |[mozilla-mobile/fenix#1708](https://github.com/mozilla-mobile/fenix/pull/1708), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |2 |
-| bookmarks_management.open_in_private_tab |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user opened a bookmark in a new private tab.  |[mozilla-mobile/fenix#1708](https://github.com/mozilla-mobile/fenix/pull/1708), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |2 |
-| bookmarks_management.open_in_private_tabs |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user opened multiple bookmarks at once in new private tabs.  |[mozilla-mobile/fenix#1708](https://github.com/mozilla-mobile/fenix/pull/1708), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |2 |
-| bookmarks_management.removed |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user removed a bookmark item.  |[mozilla-mobile/fenix#1708](https://github.com/mozilla-mobile/fenix/pull/1708), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |2 |
-| bookmarks_management.shared |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user shared a bookmark.  |[mozilla-mobile/fenix#1708](https://github.com/mozilla-mobile/fenix/pull/1708), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |2 |
-| collections.add_tab_button |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user tapped the "add tab" button in the three dot menu of collections  |[mozilla-mobile/fenix#4358](https://github.com/mozilla-mobile/fenix/pull/4358), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |2 |
-| collections.all_tabs_restored |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user tapped "open tabs" from collection menu  |[mozilla-mobile/fenix#3935](https://github.com/mozilla-mobile/fenix/pull/3935), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |1, 2 |
-| collections.long_press |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user long pressed on a tab, triggering the collection creation screen  |[mozilla-mobile/fenix#4358](https://github.com/mozilla-mobile/fenix/pull/4358), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |2 |
-| collections.removed |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user tapped delete collection from collection menu  |[mozilla-mobile/fenix#3935](https://github.com/mozilla-mobile/fenix/pull/3935), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |1, 2 |
-| collections.rename_button |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user pressed the "rename collection" button in the three dot menu  |[mozilla-mobile/fenix#4539](https://github.com/mozilla-mobile/fenix/pull/4539), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |2 |
-| collections.renamed |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user renamed a collection  |[mozilla-mobile/fenix#3935](https://github.com/mozilla-mobile/fenix/pull/3935), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |1, 2 |
-| collections.save_button |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user pressed the "save to collection" button on either the home or browser screen, triggering the collection creation screen to open (tab_select_opened)  |[mozilla-mobile/fenix#4358](https://github.com/mozilla-mobile/fenix/pull/4358), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)|<ul><li>from_screen: A string representing the screen from which the user pressed the save button. Currently one of: `browserMenu`, `homeMenu` or `home` </li></ul>|2021-07-01 |2 |
-| collections.saved |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user saved a list of tabs to a new collection  |[mozilla-mobile/fenix#3935](https://github.com/mozilla-mobile/fenix/pull/3935), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)|<ul><li>tabs_open: The number of tabs open in the current session</li><li>tabs_selected: The number of tabs added to the collection</li></ul>|2021-07-01 |1, 2 |
-| collections.shared |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user tapped share collection  |[mozilla-mobile/fenix#3935](https://github.com/mozilla-mobile/fenix/pull/3935), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |1, 2 |
-| collections.tab_removed |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user tapped remove tab from collection tab list  |[mozilla-mobile/fenix#3935](https://github.com/mozilla-mobile/fenix/pull/3935), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |1, 2 |
-| collections.tab_restored |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user restored a tab from collection tab list  |[mozilla-mobile/fenix#3935](https://github.com/mozilla-mobile/fenix/pull/3935), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |1, 2 |
-| collections.tab_select_opened |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user opened the select tabs screen (the first step of the collection creation flow)  |[mozilla-mobile/fenix#3935](https://github.com/mozilla-mobile/fenix/pull/3935), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |1, 2 |
-| collections.tabs_added |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user saved a list of tabs to an existing collection  |[mozilla-mobile/fenix#3935](https://github.com/mozilla-mobile/fenix/pull/3935), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)|<ul><li>tabs_open: The number of tabs open in the current session</li><li>tabs_selected: The number of tabs added to the collection</li></ul>|2021-07-01 |1, 2 |
-| context_menu.item_tapped |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user tapped an item in the browsers context menu  |[mozilla-mobile/fenix#1344](https://github.com/mozilla-mobile/fenix/pull/1344#issuecomment-479285010), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix/issues/16076](https://github.com/mozilla-mobile/fenix/issues/16076#issuecomment-726216734), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)|<ul><li>named: The name of the item that was tapped. Available items are:  ``` open_in_new_tab, open_in_private_tab, open_image_in_new_tab, save_image, share_link, copy_link, copy_image_location, share_image ``` </li></ul>|2021-07-01 |2 |
-| contextual_hint.tracking_protection.dismiss |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |The enhanced tracking protection contextual hint was dismissed by pressing the close button  |[mozilla-mobile/fenix#11923](https://github.com/mozilla-mobile/fenix/pull/11923), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |2 |
-| contextual_hint.tracking_protection.display |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |The enhanced tracking protection contextual hint was displayed.  |[mozilla-mobile/fenix#11923](https://github.com/mozilla-mobile/fenix/pull/11923), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |2 |
-| contextual_hint.tracking_protection.inside_tap |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |The user tapped inside of the etp contextual hint (which brings up the etp panel for this site).  |[mozilla-mobile/fenix#11923](https://github.com/mozilla-mobile/fenix/pull/11923), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |2 |
-| contextual_hint.tracking_protection.outside_tap |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |The user tapped outside of the etp contextual hint (which has no effect).  |[mozilla-mobile/fenix#11923](https://github.com/mozilla-mobile/fenix/pull/11923), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |2 |
-| contextual_menu.copy_tapped |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |The context menu's 'copy' option was used.  |[mozilla-mobile/fenix#16968](https://github.com/mozilla-mobile/fenix/pull/16968)||2021-06-01 |2 |
-| contextual_menu.search_tapped |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |The context menu's 'search' option was used.  |[mozilla-mobile/fenix#16968](https://github.com/mozilla-mobile/fenix/pull/16968)||2021-06-01 |2 |
-| contextual_menu.select_all_tapped |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |The context menu's 'select all' option was used.  |[mozilla-mobile/fenix#16968](https://github.com/mozilla-mobile/fenix/pull/16968)||2021-06-01 |2 |
-| contextual_menu.share_tapped |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |The context menu's 'share' option was used.  |[mozilla-mobile/fenix#16968](https://github.com/mozilla-mobile/fenix/pull/16968)||2021-06-01 |2 |
-| crash_reporter.closed |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |The crash reporter was closed  |[mozilla-mobile/fenix#1214](https://github.com/mozilla-mobile/fenix/pull/1214#issue-264756708), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)|<ul><li>crash_submitted: A boolean that tells us whether or not the user submitted a crash report </li></ul>|2021-07-01 |2 |
-| crash_reporter.opened |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |The crash reporter was displayed  |[mozilla-mobile/fenix#1214](https://github.com/mozilla-mobile/fenix/pull/1214#issue-264756708), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |2 |
-| custom_tab.action_button |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user pressed the action button provided by the launching app  |[mozilla-mobile/fenix#1697](https://github.com/mozilla-mobile/fenix/pull/1697), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |2 |
-| custom_tab.closed |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user closed the custom tab  |[mozilla-mobile/fenix#1697](https://github.com/mozilla-mobile/fenix/pull/1697), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |2 |
-| custom_tab.menu |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user opened the custom tabs menu  |[mozilla-mobile/fenix#1697](https://github.com/mozilla-mobile/fenix/pull/1697), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |2 |
-| download_notification.cancel |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user cancelled a download in the download notification  |[mozilla-mobile/fenix#6554](https://github.com/mozilla-mobile/fenix/pull/6554), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |2 |
-| download_notification.in_app_open |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user opened a downloaded file in the in-app notification link  |[mozilla-mobile/fenix#6554](https://github.com/mozilla-mobile/fenix/pull/6554), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |2 |
-| download_notification.in_app_try_again |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user tapped on try again when a download fails in the in-app notification link  |[mozilla-mobile/fenix#6554](https://github.com/mozilla-mobile/fenix/pull/6554), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |2 |
-| download_notification.open |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user opened a downloaded file in the download notification  |[mozilla-mobile/fenix#6554](https://github.com/mozilla-mobile/fenix/pull/6554), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |2 |
-| download_notification.pause |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user paused a download in the download notification  |[mozilla-mobile/fenix#6554](https://github.com/mozilla-mobile/fenix/pull/6554), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |2 |
-| download_notification.resume |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user resumed a download in the download notification  |[mozilla-mobile/fenix#6554](https://github.com/mozilla-mobile/fenix/pull/6554), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |2 |
-| download_notification.try_again |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user tapped on try again when a download fails in the download notification  |[mozilla-mobile/fenix#6554](https://github.com/mozilla-mobile/fenix/pull/6554), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |2 |
-| downloads_management.downloads_screen_opened |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A counter for the number of times users access the "Downloads" folder inside the app.  |[mozilla-mobile/fenix#16728](https://github.com/mozilla-mobile/fenix/pull/16728), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 | |
-| downloads_management.item_deleted |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A counter for how often a user deletes one / more downloads at a time.  |[mozilla-mobile/fenix#16728](https://github.com/mozilla-mobile/fenix/pull/16728), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 | |
-| downloads_management.item_opened |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A counter for how often a user tap to opens a download from inside the "Downloads" folder.  |[mozilla-mobile/fenix#16728](https://github.com/mozilla-mobile/fenix/pull/16728), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 | |
-| downloads_misc.download_added |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A counter for how many times something is downloaded in the app. |[mozilla-mobile/fenix#16730](https://github.com/mozilla-mobile/fenix/pull/16730), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 | |
-| engine_tab.foreground_metrics |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |Event collecting data about the state of tabs when the app comes back to the foreground.  |[mozilla-mobile/fenix#18747](https://github.com/mozilla-mobile/fenix/pull/18747#issuecomment-815731764)|<ul><li>background_active_tabs: Number of active tabs (with an engine session assigned) when the app went to the background. </li><li>background_crashed_tabs: Number of tabs marked as crashed when the app went to the background. </li><li>background_total_tabs: Number of total tabs when the app went to the background. </li><li>foreground_active_tabs: Number of active tabs (with an engine session assigned) when the app came back to the foreground. </li><li>foreground_crashed_tabs: Number of tabs marked as crashed when the app came back to the foreground. </li><li>foreground_total_tabs: Number of total tabs when the app came back to the foreground. </li><li>time_in_background: Time (in milliseconds) the app was in the background. </li></ul>|2021-12-31 |1 |
-| error_page.visited_error |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user encountered an error page  |[mozilla-mobile/fenix#2491](https://github.com/mozilla-mobile/fenix/pull/2491#issuecomment-492414486), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)|<ul><li>error_type: The error type of the error page encountered</li></ul>|2021-07-01 |2 |
-| events.app_opened |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user opened the app (from cold start, to the homescreen or browser)  |[mozilla-mobile/fenix#1067](https://github.com/mozilla-mobile/fenix/pull/1067#issuecomment-474598673), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)|<ul><li>source: The method used to open Fenix. Possible values are: `app_icon`, `custom_tab` or `link` </li></ul>|2021-07-01 |2 |
-| events.app_opened_all_startup |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |**This probe has a known flaw:** for COLD start up, it doesn't take into account if the process is already running when the app starts, possibly inflating results (e.g. a Service started the process 20min ago and only now is HomeActivity launching). See the `cold_*_app_to_first_frame` probes for a replacement. <br><br> A user opened the app to the HomeActivity. The HomeActivity encompasses the home screen, browser screen, settings screen, collections and other screens in the nav_graph. This differs from the app_opened probe because it measures all startups, not just cold startup. Note: There is a short gap between the time application goes into background and the time android reports the application going into the background. Note: This metric does not record souce when app opened from task switcher: open application -> press home button -> open recent tasks -> choose fenix. In this case will report [source = unknown, type = hot, has_saved_instance_state = false].  |[mozilla-mobile/fenix#12114](https://github.com/mozilla-mobile/fenix/pull/12114#pullrequestreview-445245341), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#13494](https://github.com/mozilla-mobile/fenix/pull/13494#pullrequestreview-474050499), [mozilla-mobile/fenix#15605](https://github.com/mozilla-mobile/fenix/pull/15605#issuecomment-702365594)|<ul><li>first_frame_pre_draw_nanos: the number of nanoseconds the application took to launch. This is the time difference between application launch(user pressing app_icon, launching a link) and until the first view is about to be drawn on the screen. If the time is not captured, this extra key will not be reported. </li><li>has_saved_instance_state: boolean value whether or not startup type has a savedInstance. using savedInstance, HomeActivity's previous state can be restored. This is an optional key since it is not applicable to all the cases. for example, when we are doing a hot start up, we cant have a savedInstanceState therefore we report only [APP_ICON, HOT] instead of [APP_ICON, HOT, false]. </li><li>source: The method used to open Fenix. Possible values are `app_icon`, `custom_tab`, `link` or `unknown`. unknown is for startup sources where we can't pinpoint the cause. One UNKNOWN case is the app switcher where we don't know what variables to check to ensure this startup wasn't caused by something else. </li><li>type: the startup type for opening fenix. the application and HomeActivity either needs to be created or started again. possible values are `cold`, `warm`, `hot` or `error`. Error is for impossible cases. Please file a bug if you see the error case. app created AND HomeActivity created = cold app started AND HomeActivity created = warm app started AND HomeActivity started = hot app created AND HomeActivity started = error Some applications such as gmail launches the default browser in the background. So when we eventually click a link, browser is already started in the background. This means that custom_tab will mostly report `warm` startup type. </li></ul>|2021-06-01 |2 |
-| events.app_received_intent |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |The system received an Intent for the HomeActivity. An intent is received an external entity wants to the app to display content. Intents can be received when the app is closed – at which point the app will be opened – or when the app is already opened – at which point the already open app will make changes such as loading a url. This can be used loosely as a heuristic for when the user requested to open the app. The HomeActivity encompasses the home screen and browser screen but may include other screens. This differs from the app_opened probe because it measures all startups, not just cold startup.  |[mozilla-mobile/fenix#11940/](https://github.com/mozilla-mobile/fenix/pull/11940/), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877)|<ul><li>source: The method used to open Fenix. Possible values are `app_icon`, `custom_tab`, `link` or `unknown` </li></ul>|2021-06-01 | |
-| events.browser_menu_action |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A browser menu item was tapped  |[mozilla-mobile/fenix#1214](https://github.com/mozilla-mobile/fenix/pull/1214#issue-264756708), [mozilla-mobile/fenix#5098](https://github.com/mozilla-mobile/fenix/pull/5098#issuecomment-529658996), [mozilla-mobile/fenix#6310](https://github.com/mozilla-mobile/fenix/pull/6310), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)|<ul><li>item: A string containing the name of the item the user tapped. These items include:    Settings, Help, Desktop Site toggle on/off, Find in Page,   New Tab, Private Tab, Share, Report Site Issue, Back/Forward button,   Reload Button, Quit, Reader Mode On, Reader Mode Off, Open In app,   Add To Top Sites, Add-ons Manager, Bookmarks, History </li></ul>|2021-07-01 |2 |
-| events.copy_url_tapped |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |An event that indicates that a user has selected copy option when long pressing on url bar.  |[mozilla-mobile/fenix#16915](https://github.com/mozilla-mobile/fenix/pull/16915)||2021-05-10 |2 |
-| events.default_browser_changed |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |Indicates the default browser was changed  |[mozilla-mobile/fenix#18895](https://github.com/mozilla-mobile/fenix/pull/18895)||2021-10-01 |2 |
-| events.entered_url |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user entered a url  |[mozilla-mobile/fenix#1067](https://github.com/mozilla-mobile/fenix/pull/1067#issuecomment-474598673), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)|<ul><li>autocomplete: A boolean that tells us whether the URL was autofilled by an Autocomplete suggestion </li></ul>|2021-07-01 |2 |
-| events.opened_link |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user opened a link with Fenix  |[mozilla-mobile/fenix#5975](https://github.com/mozilla-mobile/fenix/pull/5975), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)|<ul><li>mode: The mode the link was opened in. Either 'PRIVATE' or 'NORMAL'. N.B.: this probe may be incorrectly implemented: see https://github.com/mozilla-mobile/fenix/issues/14133 </li></ul>|2021-07-01 |2 |
-| events.performed_search |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user performed a search  |[mozilla-mobile/fenix#1067](https://github.com/mozilla-mobile/fenix/pull/1067#issuecomment-474598673), [mozilla-mobile/fenix#1677](https://github.com/mozilla-mobile/fenix/pull/1677), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)|<ul><li>source: A string that tells us how the user performed the search. Possible values are:  * default.action * default.suggestion * shortcut.action * shortcut.suggestion </li></ul>|2021-07-01 |2 |
-| events.preference_toggled |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user toggled a boolean preference in settings  |[mozilla-mobile/fenix#1896](https://github.com/mozilla-mobile/fenix/pull/1896), [mozilla-mobile/fenix#5704](https://github.com/mozilla-mobile/fenix/pull/5704), [mozilla-mobile/fenix#5886](https://github.com/mozilla-mobile/fenix/pull/5886), [mozilla-mobile/fenix#5975](https://github.com/mozilla-mobile/fenix/pull/5975), [mozilla-mobile/fenix#6352](https://github.com/mozilla-mobile/fenix/pull/6352), [mozilla-mobile/fenix#6601](https://github.com/mozilla-mobile/fenix/pull/6601), [mozilla-mobile/fenix#6746](https://github.com/mozilla-mobile/fenix/pull/6746), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877)|<ul><li>enabled: Whether or not the preference is *now* enabled</li><li>preference_key: The preference key for the boolean (true/false) preference the user toggled.  We currently track: show_search_suggestions, remote_debugging, telemetry, tracking_protection, search_bookmarks, search_browsing_history, show_clipboard_suggestions, show_search_shortcuts, open_links_in_a_private_tab (bug in implementation https://github.com/mozilla-mobile/fenix/issues/7384), pref_key_sync_logins, pref_key_sync_bookmarks, pref_key_sync_history, pref_key_show_voice_search, and pref_key_show_search_suggestions_in_private. </li></ul>|2021-06-01 |1, 2 |
-| events.recently_closed_tabs_opened |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |An event that indicates that the user has accessed recently closed tabs list.  |[mozilla-mobile/fenix#16739](https://github.com/mozilla-mobile/fenix/pull/16739)||2021-05-10 |2 |
-| events.search_bar_tapped |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user tapped the search bar  |[mozilla-mobile/fenix#1067](https://github.com/mozilla-mobile/fenix/pull/1067#issuecomment-474598673), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)|<ul><li>source: The view the user was on when they initiated the search (For example: `Home` or `Browser`) </li></ul>|2021-07-01 |2 |
-| events.synced_tab_opened |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |An event that indicates that a synced tab was opened.  |[mozilla-mobile/fenix#16727](https://github.com/mozilla-mobile/fenix/pull/16727)||2021-05-10 |2 |
-| events.tab_counter_menu_action |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A tab counter menu item was tapped |[mozilla-mobile/fenix#11533](https://github.com/mozilla-mobile/fenix/pull/11533), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)|<ul><li>item: A string containing the name of the item the user tapped. These items are:    New tab, New private tab, Close tab </li></ul>|2021-07-01 |2 |
-| events.toolbar_menu_visible |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |The browser menu was displayed from toolbar menu  |[mozilla-mobile/fenix#18895](https://github.com/mozilla-mobile/fenix/pull/18895)||2021-10-01 |2 |
-| events.whats_new_tapped |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user opened the "what's new" page button  |[mozilla-mobile/fenix#5090](https://github.com/mozilla-mobile/fenix/pull/5090), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |2 |
-| experiments_default_browser.toolbar_menu_clicked |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |Set default browser was clicked from toolbar menu  |[mozilla-mobile/fenix#18895](https://github.com/mozilla-mobile/fenix/pull/18895)||2021-10-01 |2 |
-| find_in_page.closed |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user closed the find in page UI  |[mozilla-mobile/fenix#1344](https://github.com/mozilla-mobile/fenix/pull/1344#issuecomment-479285010), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| find_in_page.opened |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user opened the find in page UI  |[mozilla-mobile/fenix#1344](https://github.com/mozilla-mobile/fenix/pull/1344#issuecomment-479285010), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| find_in_page.searched_page |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user searched the page  |[mozilla-mobile/fenix#1344](https://github.com/mozilla-mobile/fenix/pull/1344#issuecomment-479285010), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| history.opened |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user opened the history screen  |[mozilla-mobile/fenix#3940](https://github.com/mozilla-mobile/fenix/pull/3940), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| history.opened_item |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user opened a history item  |[mozilla-mobile/fenix#18261](https://github.com/mozilla-mobile/fenix/pull/18261)||2022-08-01 |2 |
-| history.opened_item_in_new_tab |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user opened a history item in a new tab  |[mozilla-mobile/fenix#18261](https://github.com/mozilla-mobile/fenix/pull/18261)||2022-08-01 |2 |
-| history.opened_item_in_private_tab |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user opened a history item in a private tab  |[mozilla-mobile/fenix#18261](https://github.com/mozilla-mobile/fenix/pull/18261)||2022-08-01 |2 |
-| history.opened_items_in_new_tabs |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user opened multiple history items in new tabs  |[Review 1](https://gith ub.com/mozilla-mobile/fenix/pull/18261)||2022-08-01 |2 |
-| history.opened_items_in_private_tabs |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user opened multiple history items in private tabs  |[mozilla-mobile/fenix#18261](https://github.com/mozilla-mobile/fenix/pull/18261)||2022-08-01 |2 |
-| history.removed |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user removed a history item  |[mozilla-mobile/fenix#3940](https://github.com/mozilla-mobile/fenix/pull/3940), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| history.removed_all |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user removed all history items  |[mozilla-mobile/fenix#3940](https://github.com/mozilla-mobile/fenix/pull/3940), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| history.shared |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user shared a history item  |[mozilla-mobile/fenix#3940](https://github.com/mozilla-mobile/fenix/pull/3940), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| home_menu.settings_item_clicked |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |The user clicked the settings option in home menu. |[mozilla-mobile/fenix#18987](https://github.com/mozilla-mobile/fenix/pull/18987)||2021-10-01 |2 |
-| home_screen.home_screen_displayed |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |The user clicked the settings option in home menu. |[mozilla-mobile/fenix#19025](https://github.com/mozilla-mobile/fenix/pull/19025)||2021-10-01 |2 |
-| login_dialog.cancelled |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |The login dialog prompt was cancelled  |[mozilla-mobile/fenix#13050](https://github.com/mozilla-mobile/fenix/pull/13050)||2021-08-01 |2 |
-| login_dialog.displayed |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |The login dialog prompt was displayed  |[mozilla-mobile/fenix#13050](https://github.com/mozilla-mobile/fenix/pull/13050)||2021-08-01 |2 |
-| login_dialog.never_save |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |The login dialog prompt "never save" button was pressed  |[mozilla-mobile/fenix#13050](https://github.com/mozilla-mobile/fenix/pull/13050)||2021-08-01 |2 |
-| login_dialog.saved |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |The login dialog prompt "save" button was pressed  |[mozilla-mobile/fenix#13050](https://github.com/mozilla-mobile/fenix/pull/13050)||2021-08-01 |2 |
-| logins.copy_login |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user copied a piece of a login in saved logins  |[mozilla-mobile/fenix#6352](https://github.com/mozilla-mobile/fenix/pull/6352), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| logins.delete_saved_login |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user confirms delete of a saved login  |[mozilla-mobile/fenix/issues/11208](https://github.com/mozilla-mobile/fenix/issues/11208), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| logins.open_individual_login |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user accessed an individual login in saved logins  |[mozilla-mobile/fenix#6352](https://github.com/mozilla-mobile/fenix/pull/6352), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| logins.open_login_editor |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user entered the edit screen for an individual saved login  |[mozilla-mobile/fenix/issues/11208](https://github.com/mozilla-mobile/fenix/issues/11208), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| logins.open_logins |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user accessed Logins in Settings  |[mozilla-mobile/fenix#6352](https://github.com/mozilla-mobile/fenix/pull/6352), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| logins.save_edited_login |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user saves changes made to an individual login  |[mozilla-mobile/fenix/issues/11208](https://github.com/mozilla-mobile/fenix/issues/11208), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| logins.save_logins_setting_changed |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user changed their setting for asking to save logins  |[mozilla-mobile/fenix#7767](https://github.com/mozilla-mobile/fenix/pull/7767), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)|<ul><li>setting: The new setting for saving logins the user selected. Either `ask_to_save` or `never_save` </li></ul>|2021-08-01 |2 |
-| logins.view_password_login |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user viewed a password in an individual saved login  |[mozilla-mobile/fenix#6352](https://github.com/mozilla-mobile/fenix/pull/6352), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| master_password.displayed |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |The master password migration dialog was displayed  |[mozilla-mobile/fenix#14468](https://github.com/mozilla-mobile/fenix/pull/14468#issuecomment-684114534), [mozilla-mobile/fenix#18071](https://github.com/mozilla-mobile/fenix/pull/18071)||2021-09-01 |2 |
-| master_password.migration |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |Logins were successfully migrated using a master password.  |[mozilla-mobile/fenix#14468](https://github.com/mozilla-mobile/fenix/pull/14468#issuecomment-684114534), [mozilla-mobile/fenix#18071](https://github.com/mozilla-mobile/fenix/pull/18071)||2021-09-01 |2 |
-| media_notification.pause |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user pressed the pause icon on the media notification  |[mozilla-mobile/fenix#5520](https://github.com/mozilla-mobile/fenix/pull/5520), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| media_notification.play |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user pressed the play icon on the media notification  |[mozilla-mobile/fenix#5520](https://github.com/mozilla-mobile/fenix/pull/5520), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| media_state.fullscreen |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |Video set to fullscreen.  |[mozilla-mobile/fenix#16833](https://github.com/mozilla-mobile/fenix/pull/16833)||2021-08-01 |2 |
-| media_state.pause |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |Media playback was paused.  |[mozilla-mobile/fenix#6463](https://github.com/mozilla-mobile/fenix/pull/6463), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| media_state.picture_in_picture |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |Video set to picture in picture mode.  |[mozilla-mobile/fenix#16833](https://github.com/mozilla-mobile/fenix/pull/16833)||2021-08-01 |2 |
-| media_state.play |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |Media started playing.  |[mozilla-mobile/fenix#6463](https://github.com/mozilla-mobile/fenix/pull/6463), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| media_state.stop |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |Media playback has ended.  |[mozilla-mobile/fenix#6463](https://github.com/mozilla-mobile/fenix/pull/6463), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| onboarding.finish |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |The user taps starts browsing and ends the onboarding experience. |[mozilla-mobile/fenix#11867](https://github.com/mozilla-mobile/fenix/pull/11867), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| onboarding.fxa_auto_signin |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |The onboarding automatic sign in card was tapped. |[mozilla-mobile/fenix#11867](https://github.com/mozilla-mobile/fenix/pull/11867), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| onboarding.fxa_manual_signin |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |The onboarding manual sign in card was tapped. |[mozilla-mobile/fenix#11867](https://github.com/mozilla-mobile/fenix/pull/11867), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| onboarding.pref_toggled_private_browsing |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |The private browsing preference was selected from the onboarding card. |[mozilla-mobile/fenix#11867](https://github.com/mozilla-mobile/fenix/pull/11867), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| onboarding.pref_toggled_theme_picker |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |The device theme was chosen using the theme picker onboarding card. |[mozilla-mobile/fenix#11867](https://github.com/mozilla-mobile/fenix/pull/11867), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)|<ul><li>theme: A string that indicates the theme LIGHT, DARK, or FOLLOW DEVICE. Default: FOLLOW DEVICE </li></ul>|2021-08-01 |2 |
-| onboarding.pref_toggled_toolbar_position |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |The toolbar position preference was chosen from the onboarding card. |[mozilla-mobile/fenix#11867](https://github.com/mozilla-mobile/fenix/pull/11867), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)|<ul><li>position: A string that indicates the position of the toolbar TOP or BOTTOM. Default: BOTTOM </li></ul>|2021-08-01 |2 |
-| onboarding.pref_toggled_tracking_prot |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |The tracking protection preference was chosen from the onboarding card. |[mozilla-mobile/fenix#11867](https://github.com/mozilla-mobile/fenix/pull/11867), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)|<ul><li>setting: A string that indicates the Tracking Protection policy STANDARD or STRICT. Default: Toggle ON, STANDARD </li></ul>|2021-08-01 |2 |
-| onboarding.privacy_notice |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |The onboarding privacy notice card was tapped. |[mozilla-mobile/fenix#11867](https://github.com/mozilla-mobile/fenix/pull/11867), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| pocket.pocket_top_site_clicked |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user clicked on the trending Pocket top site  |[mozilla-mobile/fenix#8098](https://github.com/mozilla-mobile/fenix/pull/8098), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| pocket.pocket_top_site_removed |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user removed the trending Pocket top site  |[mozilla-mobile/fenix#8098](https://github.com/mozilla-mobile/fenix/pull/8098), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| private_browsing_mode.notification_tapped |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user pressed the private browsing mode notification itself.  |[mozilla-mobile/fenix#4968](https://github.com/mozilla-mobile/fenix/pull/4968), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| private_browsing_mode.snackbar_undo |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user pressed the "undo" button in the snackbar that is shown when the garbage icon is tapped.  |[mozilla-mobile/fenix#4968](https://github.com/mozilla-mobile/fenix/pull/4968), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| private_browsing_shortcut.cfr_add_shortcut |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user pressed the "Add shortcut" button when the contextual feature recommender appeared.  |[mozilla-mobile/fenix#5194](https://github.com/mozilla-mobile/fenix/pull/5194), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| private_browsing_shortcut.cfr_cancel |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user pressed the "No thanks" button when the contextual feature recommender appeared.  |[mozilla-mobile/fenix#5194](https://github.com/mozilla-mobile/fenix/pull/5194), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| private_browsing_shortcut.create_shortcut |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user pressed the "Add private browsing shortcut" button in settings.  |[mozilla-mobile/fenix#5194](https://github.com/mozilla-mobile/fenix/pull/5194), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| private_browsing_shortcut.pinned_shortcut_priv |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user pressed the pinned private shortcut in Android home screen, opening up a new private search.  |[mozilla-mobile/fenix#5194](https://github.com/mozilla-mobile/fenix/pull/5194), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| private_browsing_shortcut.static_shortcut_priv |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user pressed the long-press shortcut "Open new private tab", opening up a new private search.  |[mozilla-mobile/fenix#5194](https://github.com/mozilla-mobile/fenix/pull/5194), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| private_browsing_shortcut.static_shortcut_tab |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user pressed the long-press shortcut "Open new tab", opening up a new search.  |[mozilla-mobile/fenix#5194](https://github.com/mozilla-mobile/fenix/pull/5194), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| progressive_web_app.background |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user puts the PWA into the background.  |[mozilla-mobile/fenix#11859](https://github.com/mozilla-mobile/fenix/pull/11859), [mozilla-mobile/fenix#18071](https://github.com/mozilla-mobile/fenix/pull/18071)|<ul><li>time_ms: The current time in ms when the PWA was backgrounded. </li></ul>|2021-09-01 |2 |
-| progressive_web_app.foreground |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user brings the PWA into the foreground.  |[mozilla-mobile/fenix#11859](https://github.com/mozilla-mobile/fenix/pull/11859), [mozilla-mobile/fenix#18071](https://github.com/mozilla-mobile/fenix/pull/18071)|<ul><li>time_ms: The current time in ms when the PWA was brought to the foreground. </li></ul>|2021-09-01 |2 |
-| progressive_web_app.homescreen_tap |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user taps on PWA homescreen icon  |[mozilla-mobile/fenix#11859](https://github.com/mozilla-mobile/fenix/pull/11859), [mozilla-mobile/fenix#18071](https://github.com/mozilla-mobile/fenix/pull/18071)||2021-09-01 |2 |
-| progressive_web_app.install_tap |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user installs a PWA. Could be a shortcut or added to homescreen.  |[mozilla-mobile/fenix#11859](https://github.com/mozilla-mobile/fenix/pull/11859), [mozilla-mobile/fenix#18071](https://github.com/mozilla-mobile/fenix/pull/18071)||2021-09-01 |2 |
-| reader_mode.appearance |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user tapped the appearance button  |[mozilla-mobile/fenix#3941](https://github.com/mozilla-mobile/fenix/pull/3941), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| reader_mode.available |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |Reader mode is available for the current page  |[mozilla-mobile/fenix#3941](https://github.com/mozilla-mobile/fenix/pull/3941), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| reader_mode.closed |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user closed reader mode  |[mozilla-mobile/fenix#4328](https://github.com/mozilla-mobile/fenix/pull/4328), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| reader_mode.opened |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user opened reader mode  |[mozilla-mobile/fenix#3941](https://github.com/mozilla-mobile/fenix/pull/3941), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| search_shortcuts.selected |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user selected a search shortcut engine to use  |[mozilla-mobile/fenix#1202](https://github.com/mozilla-mobile/fenix/pull/1202#issuecomment-476870449), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)|<ul><li>engine: The name of the built-in search engine the user selected as a string </li></ul>|2021-08-01 | |
-| search_suggestions.enable_in_private |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user enabled receiving search suggestions in private sessions  |[mozilla-mobile/fenix#6746](https://github.com/mozilla-mobile/fenix/pull/6746), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |1, 2 |
-| search_widget.new_tab_button |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user pressed anywhere from the Firefox logo until the start of the microphone icon, opening a new tab search screen.  |[mozilla-mobile/fenix#4714](https://github.com/mozilla-mobile/fenix/pull/4714), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| search_widget.voice_button |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user pressed the microphone icon, opening a new voice search screen.  |[mozilla-mobile/fenix#4714](https://github.com/mozilla-mobile/fenix/pull/4714), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| set_default_newtab_experiment.close_experiment_card_clicked |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |Close experiment card was clicked from new tab screen.  |[mozilla-mobile/fenix#18895](https://github.com/mozilla-mobile/fenix/pull/18895)||2021-10-01 |2 |
-| set_default_newtab_experiment.set_default_browser_clicked |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |Set default browser was clicked from new tab screen.  |[mozilla-mobile/fenix#18895](https://github.com/mozilla-mobile/fenix/pull/18895)||2021-10-01 |2 |
-| set_default_setting_experiment.set_default_browser_clicked |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |Set default browser was clicked from settings screen.  |[mozilla-mobile/fenix#19047](https://github.com/mozilla-mobile/fenix/pull/19047)||2021-10-01 |2 |
-| sync_account.opened |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user opened the sync account page  |[mozilla-mobile/fenix#2745](https://github.com/mozilla-mobile/fenix/pull/2745#issuecomment-494918532), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| sync_account.send_tab |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user sent the current tab to another FxA device  |[mozilla-mobile/fenix#5106](https://github.com/mozilla-mobile/fenix/pull/5106), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| sync_account.sign_in_to_send_tab |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user pressed the "sign in to send tab" button inside the share tab menu  |[mozilla-mobile/fenix#5106](https://github.com/mozilla-mobile/fenix/pull/5106), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| sync_account.sync_now |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user pressed the sync now button on the sync account page  |[mozilla-mobile/fenix#2745](https://github.com/mozilla-mobile/fenix/pull/2745#issuecomment-494918532), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| sync_auth.closed |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user closed the sync page  |[mozilla-mobile/fenix#2745](https://github.com/mozilla-mobile/fenix/pull/2745#issuecomment-494918532), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| sync_auth.opened |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user opened the sync authentication page  |[mozilla-mobile/fenix#2745](https://github.com/mozilla-mobile/fenix/pull/2745#issuecomment-494918532), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| sync_auth.other_external |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |User authenticated via FxA using an unknown mechanism. "Known" mechanisms are currently sign-in, sign-up and pairing  |[mozilla-mobile/fenix#4931](https://github.com/mozilla-mobile/fenix/pull/4931#issuecomment-529740300), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |1, 2 |
-| sync_auth.paired |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |User signed into FxA by pairing with a different Firefox browser, using a QR code  |[mozilla-mobile/fenix#4931](https://github.com/mozilla-mobile/fenix/pull/4931#issuecomment-529740300), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |1, 2 |
-| sync_auth.recovered |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |Account manager automatically recovered FxA authentication state without direct user involvement  |[mozilla-mobile/fenix#4931](https://github.com/mozilla-mobile/fenix/pull/4931#issuecomment-529740300), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |1, 2 |
-| sync_auth.scan_pairing |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user pressed the scan pairing button on the sync authentication page  |[mozilla-mobile/fenix#2745](https://github.com/mozilla-mobile/fenix/pull/2745#issuecomment-494918532), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| sync_auth.sign_in |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user pressed the sign in button on the sync authentication page and was successfully signed in to FxA  |[mozilla-mobile/fenix#2745](https://github.com/mozilla-mobile/fenix/pull/2745#issuecomment-494918532), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| sync_auth.sign_out |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user pressed the sign out button on the sync account page and was successfully signed out of FxA  |[mozilla-mobile/fenix#2745](https://github.com/mozilla-mobile/fenix/pull/2745#issuecomment-494918532), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| sync_auth.sign_up |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |User registered a new Firefox Account, and was signed into it  |[mozilla-mobile/fenix#4931](https://github.com/mozilla-mobile/fenix/pull/4931#issuecomment-529740300), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |1, 2 |
-| sync_auth.use_email |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user chose to use their email to sign in instead of scanning a QR code, counterpart to "scan_pairing"  |[mozilla-mobile/fenix#9835](https://github.com/mozilla-mobile/fenix/pull/9835#pullrequestreview-398641844), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| sync_auth.use_email_problem |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user chose to use their email to sign in after an account problem  |[mozilla-mobile/fenix#9835](https://github.com/mozilla-mobile/fenix/pull/9835#pullrequestreview-398641844), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| synced_tabs.synced_tabs_suggestion_clicked |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |The synced tab suggestion in awesomebar was clicked.  |[mozilla-mobile/fenix#18172](https://github.com/mozilla-mobile/fenix/pull/18172)||2021-08-01 |2 |
-| tab.media_pause |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user pressed the pause icon on a tab from the home screen  |[mozilla-mobile/fenix#5266](https://github.com/mozilla-mobile/fenix/pull/5266), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| tab.media_play |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user pressed the play icon on a tab from the home screen  |[mozilla-mobile/fenix#5266](https://github.com/mozilla-mobile/fenix/pull/5266), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| tabs.setting_opened |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |The tab settings were opened.  |[mozilla-mobile/fenix#15811](https://github.com/mozilla-mobile/fenix/pull/15811#issuecomment-706402952)||2021-08-01 |2 |
-| tabs_tray.cfr.dismiss |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user dismisses the tabs tray CFR.  |[mozilla-mobile/fenix#17442](https://github.com/mozilla-mobile/fenix/pull/17442), [mozilla-mobile/fenix/issues/16485](https://github.com/mozilla-mobile/fenix/issues/16485#issuecomment-759641324)||2021-08-01 |2 |
-| tabs_tray.cfr.go_to_settings |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user selects the CFR option to navigate to settings.  |[mozilla-mobile/fenix#17442](https://github.com/mozilla-mobile/fenix/pull/17442), [mozilla-mobile/fenix/issues/16485](https://github.com/mozilla-mobile/fenix/issues/16485#issuecomment-759641324)||2021-08-01 |2 |
-| tabs_tray.close_all_tabs |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user tapped the close all tabs button in the three dot menu within the tabs tray  |[mozilla-mobile/fenix#12036](https://github.com/mozilla-mobile/fenix/pull/12036), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| tabs_tray.closed |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user closed the tabs tray  |[mozilla-mobile/fenix#12036](https://github.com/mozilla-mobile/fenix/pull/12036), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| tabs_tray.closed_existing_tab |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user closed an existing tab  |[mozilla-mobile/fenix#12036](https://github.com/mozilla-mobile/fenix/pull/12036), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| tabs_tray.menu_opened |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user opened three three dot menu in the tabs tray  |[mozilla-mobile/fenix#12036](https://github.com/mozilla-mobile/fenix/pull/12036), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| tabs_tray.new_private_tab_tapped |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user opened a new private tab  |[mozilla-mobile/fenix#12036](https://github.com/mozilla-mobile/fenix/pull/12036), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| tabs_tray.new_tab_tapped |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user opened a new tab  |[mozilla-mobile/fenix#12036](https://github.com/mozilla-mobile/fenix/pull/12036), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| tabs_tray.normal_mode_tapped |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user switched to normal mode  |[mozilla-mobile/fenix#12036](https://github.com/mozilla-mobile/fenix/pull/12036), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| tabs_tray.opened |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user opened the tabs tray  |[mozilla-mobile/fenix#12036](https://github.com/mozilla-mobile/fenix/pull/12036), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| tabs_tray.opened_existing_tab |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user opened an existing tab  |[mozilla-mobile/fenix#12036](https://github.com/mozilla-mobile/fenix/pull/12036), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| tabs_tray.private_mode_tapped |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user switched to private mode  |[mozilla-mobile/fenix#12036](https://github.com/mozilla-mobile/fenix/pull/12036), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| tabs_tray.save_to_collection |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user tapped the save to collection button in the tabs tray  |[mozilla-mobile/fenix#12036](https://github.com/mozilla-mobile/fenix/pull/12036), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| tabs_tray.share_all_tabs |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user tapped the share all tabs button in the three dot menu within the tabs tray  |[mozilla-mobile/fenix#12036](https://github.com/mozilla-mobile/fenix/pull/12036), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| tabs_tray.synced_mode_tapped |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user switched to synced mode  |[mozilla-mobile/fenix#19004](https://github.com/mozilla-mobile/fenix/pull/19004)||2022-08-01 |2 |
-| tip.closed |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |The tip was closed  |[mozilla-mobile/fenix#9836](https://github.com/mozilla-mobile/fenix/pull/9836), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)|<ul><li>identifier: The identifier of the tip closed</li></ul>|2021-08-01 |2 |
-| tip.displayed |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |The tip was displayed  |[mozilla-mobile/fenix#9836](https://github.com/mozilla-mobile/fenix/pull/9836), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)|<ul><li>identifier: The identifier of the tip displayed</li></ul>|2021-08-01 |2 |
-| tip.pressed |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |The tip's button was pressed  |[mozilla-mobile/fenix#9836](https://github.com/mozilla-mobile/fenix/pull/9836), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)|<ul><li>identifier: The identifier of the tip the action was taken on</li></ul>|2021-08-01 |2 |
-| toolbar_settings.changed_position |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |The user selected a new position for the toolbar  |[mozilla-mobile/fenix#6608](https://github.com/mozilla-mobile/fenix/pull/6608), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)|<ul><li>position: A string that indicates the new position of the toolbar TOP or BOTTOM </li></ul>|2021-08-01 |2 |
-| top_sites.long_press |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user long pressed on a top site  |[mozilla-mobile/fenix#15136](https://github.com/mozilla-mobile/fenix/pull/15136), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)|<ul><li>type: The type of top site. Options are: "FRECENCY," "DEFAULT," or "PINNED." </li></ul>|2021-08-01 |2 |
-| top_sites.open_default |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user opened a default top site  |[mozilla-mobile/fenix#10752](https://github.com/mozilla-mobile/fenix/pull/10752), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| top_sites.open_frecency |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user opened a frecency top site  |[mozilla-mobile/fenix#15136](https://github.com/mozilla-mobile/fenix/pull/15136), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| top_sites.open_google_search_attribution |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user opened the google top site  |[mozilla-mobile/fenix#17637](https://github.com/mozilla-mobile/fenix/pull/17637)||2021-08-01 |2 |
-| top_sites.open_in_new_tab |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user opens a new tab based on a top site item  |[mozilla-mobile/fenix#7523](https://github.com/mozilla-mobile/fenix/pull/7523), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| top_sites.open_in_private_tab |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user opens a new private tab based on a top site item  |[mozilla-mobile/fenix#7523](https://github.com/mozilla-mobile/fenix/pull/7523), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| top_sites.open_pinned |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user opened a pinned top site  |[mozilla-mobile/fenix#15136](https://github.com/mozilla-mobile/fenix/pull/15136), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| top_sites.remove |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user removes a top site item  |[mozilla-mobile/fenix#7523](https://github.com/mozilla-mobile/fenix/pull/7523), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| top_sites.swipe_carousel |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user swiped to change the page of the top sites carousel  |[mozilla-mobile/fenix#15136](https://github.com/mozilla-mobile/fenix/pull/15136), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)|<ul><li>page: The page number the carousel is now on </li></ul>|2021-08-01 |2 |
-| tracking_protection.etp_setting_changed |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user changed their tracking protection level setting to either strict, standard, or custom.  |[mozilla-mobile/fenix#5414](https://github.com/mozilla-mobile/fenix/pull/5414#issuecomment-532847188), [mozilla-mobile/fenix#11383](https://github.com/mozilla-mobile/fenix/pull/11383), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)|<ul><li>etp_setting: The new setting for ETP: strict, standard, custom</li></ul>|2021-08-01 |2 |
-| tracking_protection.etp_settings |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user opened tracking protection settings through settings.  |[mozilla-mobile/fenix#5414](https://github.com/mozilla-mobile/fenix/pull/5414#issuecomment-532847188), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| tracking_protection.etp_shield |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user pressed the tracking protection shield icon in toolbar.  |[mozilla-mobile/fenix#5414](https://github.com/mozilla-mobile/fenix/pull/5414#issuecomment-532847188), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| tracking_protection.etp_tracker_list |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user pressed into a list of categorized trackers in tracking protection panel.  |[mozilla-mobile/fenix#5414](https://github.com/mozilla-mobile/fenix/pull/5414#issuecomment-532847188), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| tracking_protection.exception_added |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user added a tracking protection exception through the TP toggle in the panel.  |[mozilla-mobile/fenix#5414](https://github.com/mozilla-mobile/fenix/pull/5414#issuecomment-532847188), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| tracking_protection.panel_settings |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user opened tracking protection settings from the panel.  |[mozilla-mobile/fenix#5414](https://github.com/mozilla-mobile/fenix/pull/5414#issuecomment-532847188), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| user_specified_search_engines.custom_engine_added |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user added a new custom search engine  |[mozilla-mobile/fenix#6918](https://github.com/mozilla-mobile/fenix/pull/6918), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| user_specified_search_engines.custom_engine_deleted |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user deleted a custom search engine  |[mozilla-mobile/fenix#6918](https://github.com/mozilla-mobile/fenix/pull/6918), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| voice_search.tapped |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user selected the voice search button on the search screen.  |[mozilla-mobile/fenix#10785](https://github.com/mozilla-mobile/fenix/pull/10785), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-
-## first-session
-
-This ping is intended to capture the source of the app install
-on the first session.
-
-
-This ping includes the [client id](https://mozilla.github.io/glean/book/user/pings/index.html#the-client_info-section).
-
-**Data reviews for this ping:**
-
-- <https://github.com/mozilla-mobile/fenix/pull/8074#issuecomment-586512202>
-
-**Bugs related to this ping:**
-
-- <https://github.com/mozilla-mobile/fenix/issues/7295>
-
-All Glean pings contain built-in metrics in the [`ping_info`](https://mozilla.github.io/glean/book/user/pings/index.html#the-ping_info-section) and [`client_info`](https://mozilla.github.io/glean/book/user/pings/index.html#the-client_info-section) sections.
-
-In addition to those built-in metrics, the following metrics are added to the ping:
-
-| Name | Type | Description | Data reviews | Extras | Expiration | [Data Sensitivity](https://wiki.mozilla.org/Firefox/Data_Collection) |
-| --- | --- | --- | --- | --- | --- | --- |
-| first_session.adgroup |[string](https://mozilla.github.io/glean/book/user/metrics/string.html) |The name of the AdGroup that was used to source this installation.  |[mozilla-mobile/fenix#8074](https://github.com/mozilla-mobile/fenix/pull/8074#issuecomment-586480836), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |1, 2 |
-| first_session.campaign |[string](https://mozilla.github.io/glean/book/user/metrics/string.html) |The name of the campaign that is responsible for this installation.  |[mozilla-mobile/fenix#8074](https://github.com/mozilla-mobile/fenix/pull/8074#issuecomment-586512202), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |1, 2 |
-| first_session.creative |[string](https://mozilla.github.io/glean/book/user/metrics/string.html) |The identifier of the creative material that the user interacted with.  |[mozilla-mobile/fenix#8074](https://github.com/mozilla-mobile/fenix/pull/8074#issuecomment-586512202), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |1, 2 |
-| first_session.network |[string](https://mozilla.github.io/glean/book/user/metrics/string.html) |The name of the Network that sourced this installation.  |[mozilla-mobile/fenix#8074](https://github.com/mozilla-mobile/fenix/pull/8074#issuecomment-586512202), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |1, 2 |
-| first_session.timestamp |[datetime](https://mozilla.github.io/glean/book/user/metrics/datetime.html) |The Glean generated date and time of the installation. This is unique per app install, though the rest of the data in this ping is from Adjust and will remain static across installs.  |[mozilla-mobile/fenix#8074](https://github.com/mozilla-mobile/fenix/pull/8074#issuecomment-586512202), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |1, 2 |
-
-## metrics
-
-This is a built-in ping that is assembled out of the box by the Glean SDK.
-
-See the Glean SDK documentation for the [`metrics` ping](https://mozilla.github.io/glean/book/user/pings/metrics.html).
-
-All Glean pings contain built-in metrics in the [`ping_info`](https://mozilla.github.io/glean/book/user/pings/index.html#the-ping_info-section) and [`client_info`](https://mozilla.github.io/glean/book/user/pings/index.html#the-client_info-section) sections.
-
-In addition to those built-in metrics, the following metrics are added to the ping:
-
-| Name | Type | Description | Data reviews | Extras | Expiration | [Data Sensitivity](https://wiki.mozilla.org/Firefox/Data_Collection) |
-| --- | --- | --- | --- | --- | --- | --- |
-| addons.enabled_addons |[string_list](https://mozilla.github.io/glean/book/user/metrics/string_list.html) |A list of all enabled add-ons on the device.  |[mozilla-mobile/fenix#11080](https://github.com/mozilla-mobile/fenix/pull/11080), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |2 |
-| addons.has_enabled_addons |[boolean](https://mozilla.github.io/glean/book/user/metrics/boolean.html) |Whether or not the user has enabled add-ons on the device.  |[mozilla-mobile/fenix#8318](https://github.com/mozilla-mobile/fenix/pull/8318), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |2 |
-| addons.has_installed_addons |[boolean](https://mozilla.github.io/glean/book/user/metrics/boolean.html) |Whether or not the user has installed add-ons on the device.  |[mozilla-mobile/fenix#8318](https://github.com/mozilla-mobile/fenix/pull/8318), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |2 |
-| addons.installed_addons |[string_list](https://mozilla.github.io/glean/book/user/metrics/string_list.html) |A list of all installed add-ons on the device.  |[mozilla-mobile/fenix#11080](https://github.com/mozilla-mobile/fenix/pull/11080), [mozilla-mobile/fenix#13958](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877), [mozilla-mobile/fenix#18143](https://github.com/mozilla-mobile/fenix/pull/18143)||2021-07-01 |2 |
-| browser.search.ad_clicks |[labeled_counter](https://mozilla.github.io/glean/book/user/metrics/labeled_counters.html) |Records clicks of adverts on SERP pages. The key format is ‘<provider-name>’.  |[mozilla-mobile/fenix#10112](https://github.com/mozilla-mobile/fenix/pull/10112), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| browser.search.in_content |[labeled_counter](https://mozilla.github.io/glean/book/user/metrics/labeled_counters.html) |Records the type of interaction a user has on SERP pages.  |[mozilla-mobile/fenix#10167](https://github.com/mozilla-mobile/fenix/pull/10167), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| browser.search.with_ads |[labeled_counter](https://mozilla.github.io/glean/book/user/metrics/labeled_counters.html) |Records counts of SERP pages with adverts displayed. The key format is ‘<provider-name>’.  |[mozilla-mobile/fenix#10112](https://github.com/mozilla-mobile/fenix/pull/10112), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| engine_tab.kill_background_age |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |Measures the age of the engine session of a background tab at the time its content process got killed.  |[mozilla-mobile/fenix#17864](https://github.com/mozilla-mobile/fenix/pull/17864)||2021-12-31 |1 |
-| engine_tab.kill_foreground_age |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |Measures the age of the engine session of a foreground (selected) tab at the time its content process got killed.  |[mozilla-mobile/fenix#17864](https://github.com/mozilla-mobile/fenix/pull/17864)||2021-12-31 |1 |
-| engine_tab.kills |[labeled_counter](https://mozilla.github.io/glean/book/user/metrics/labeled_counters.html) |How often was the content process of a foreground (selected) or background tab killed.  |[mozilla-mobile/fenix#17864](https://github.com/mozilla-mobile/fenix/pull/17864)|<ul><li>foreground</li><li>background</li></ul>|2021-12-31 |1 |
-| events.normal_and_private_uri_count |[counter](https://mozilla.github.io/glean/book/user/metrics/counter.html) |A counter of URIs visited by the user in the current session, including page reloads. This includes private browsing.  This does not include background page requests and URIs from embedded pages but may be incremented without user interaction by website scripts that programmatically redirect to a new location.  |[mozilla-mobile/fenix#17935](https://github.com/mozilla-mobile/fenix/pull/17935)||2022-08-01 |2 |
-| events.total_uri_count |[counter](https://mozilla.github.io/glean/book/user/metrics/counter.html) |A counter of URIs visited by the user in the current session, including page reloads. This does not include background page requests and URIs from embedded pages or private browsing but may be incremented without user interaction by website scripts that programmatically redirect to a new location.  |[mozilla-mobile/fenix#1785](https://github.com/mozilla-mobile/fenix/pull/1785), [mozilla-mobile/fenix#8314](https://github.com/mozilla-mobile/fenix/pull/8314), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| metrics.adjust_ad_group |[string](https://mozilla.github.io/glean/book/user/metrics/string.html) |A string containing the Adjust ad group ID from which the user installed Fenix. This will not send on the first session the user runs. If the install is organic, this will be empty.  |[mozilla-mobile/fenix#9253](https://github.com/mozilla-mobile/fenix/pull/9253), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| metrics.adjust_campaign |[string](https://mozilla.github.io/glean/book/user/metrics/string.html) |A string containing the Adjust campaign ID from which the user installed Fenix. This will not send on the first session the user runs. If the install is organic, this will be empty.  |[mozilla-mobile/fenix#5579](https://github.com/mozilla-mobile/fenix/pull/5579), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |1 |
-| metrics.adjust_creative |[string](https://mozilla.github.io/glean/book/user/metrics/string.html) |A string containing the Adjust creative ID from which the user installed Fenix. This will not send on the first session the user runs. If the install is organic, this will be empty.  |[mozilla-mobile/fenix#9253](https://github.com/mozilla-mobile/fenix/pull/9253), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| metrics.adjust_network |[string](https://mozilla.github.io/glean/book/user/metrics/string.html) |A string containing the Adjust network ID from which the user installed Fenix. This will not send on the first session the user runs. If the install is organic, this will be empty.  |[mozilla-mobile/fenix#9253](https://github.com/mozilla-mobile/fenix/pull/9253), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| metrics.close_tab_setting |[string](https://mozilla.github.io/glean/book/user/metrics/string.html) |A string that indicates the setting for tab closing: MANUAL, ONE_DAY, ONE_WEEK, ONE_MONTH  |[mozilla-mobile/fenix#15811](https://github.com/mozilla-mobile/fenix/pull/15811#issuecomment-706402952)||2021-08-01 |2 |
-| metrics.default_browser |[boolean](https://mozilla.github.io/glean/book/user/metrics/boolean.html) |Is Fenix the default browser?  |[mozilla-mobile/fenix#1067](https://github.com/mozilla-mobile/fenix/pull/1067#issuecomment-474598673), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| metrics.default_moz_browser |[string](https://mozilla.github.io/glean/book/user/metrics/string.html) |The name of the default browser on device if and only if it's a Mozilla owned product  |[mozilla-mobile/fenix#1953/](https://github.com/mozilla-mobile/fenix/pull/1953/), [mozilla-mobile/fenix#5216](https://github.com/mozilla-mobile/fenix/pull/5216), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |1, 2 |
-| metrics.desktop_bookmarks_count |[counter](https://mozilla.github.io/glean/book/user/metrics/counter.html) |A counter that indicates how many bookmarks a user has in the desktop folder. This value will only be set if the user has at least *one* bookmark. If they have 0, this ping will not get sent, resulting in a null value. To disambiguate between a failed `desktop_bookmarks_count` ping and 0 bookmarks, please see `has_desktop_bookmarks`.  |[mozilla-mobile/fenix#16942](https://github.com/mozilla-mobile/fenix/pull/16942), [mozilla-mobile/fenix#16942](https://github.com/mozilla-mobile/fenix/pull/16942#issuecomment-742794701)||2021-08-01 |2 |
-| metrics.distribution_id |[string](https://mozilla.github.io/glean/book/user/metrics/string.html) |A string containing the distribution identifier. This is currently used to identify installs from Mozilla Online.  |[mozilla-mobile/fenix/issues/16075](https://github.com/mozilla-mobile/fenix/issues/16075)||never |1 |
-| metrics.has_desktop_bookmarks |[boolean](https://mozilla.github.io/glean/book/user/metrics/boolean.html) |A boolean that indicates if the user has bookmarks in the desktop folder  |[mozilla-mobile/fenix#16942](https://github.com/mozilla-mobile/fenix/pull/16942), [mozilla-mobile/fenix#16942](https://github.com/mozilla-mobile/fenix/pull/16942#issuecomment-742794701)||2021-08-01 |2 |
-| metrics.has_mobile_bookmarks |[boolean](https://mozilla.github.io/glean/book/user/metrics/boolean.html) |A boolean that indicates if the user has bookmarks in the mobile folder  |[mozilla-mobile/fenix#16942](https://github.com/mozilla-mobile/fenix/pull/16942), [mozilla-mobile/fenix#16942](https://github.com/mozilla-mobile/fenix/pull/16942#issuecomment-742794701)||2021-08-01 |2 |
-| metrics.has_open_tabs |[boolean](https://mozilla.github.io/glean/book/user/metrics/boolean.html) |A boolean that indicates if the user has any open NORMAL tabs.  |[mozilla-mobile/fenix#12024](https://github.com/mozilla-mobile/fenix/pull/12024), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| metrics.has_recent_pwas |[boolean](https://mozilla.github.io/glean/book/user/metrics/boolean.html) |A boolean that indicates if the user has recently used PWAs. See recently_used_pwa_count for the actual count.  |[mozilla-mobile/fenix#11982](https://github.com/mozilla-mobile/fenix/pull/11982#pullrequestreview-437963817), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| metrics.has_top_sites |[boolean](https://mozilla.github.io/glean/book/user/metrics/boolean.html) |A boolean that indicates if the user has top sites  |[mozilla-mobile/fenix#9556](https://github.com/mozilla-mobile/fenix/pull/9556), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| metrics.mobile_bookmarks_count |[counter](https://mozilla.github.io/glean/book/user/metrics/counter.html) |A counter that indicates how many bookmarks a user has in the mobile folder. This value will only be set if the user has at least *one* bookmark. If they have 0, this ping will not get sent, resulting in a null value. To disambiguate between a failed `mobile_bookmarks_count` ping and 0 bookmarks, please see `has_mobile_bookmarks`.  |[mozilla-mobile/fenix#16942](https://github.com/mozilla-mobile/fenix/pull/16942), [mozilla-mobile/fenix#16942](https://github.com/mozilla-mobile/fenix/pull/16942#issuecomment-742794701)||2021-08-01 |2 |
-| metrics.mozilla_products |[string_list](https://mozilla.github.io/glean/book/user/metrics/string_list.html) |A list of all the Mozilla products installed on device. We currently scan for: Firefox, Firefox Beta, Firefox Aurora, Firefox Nightly, Firefox Fdroid, Firefox Lite, Reference Browser, Reference Browser Debug, Fenix, Focus, and Lockwise.  |[mozilla-mobile/fenix#1953/](https://github.com/mozilla-mobile/fenix/pull/1953/), [mozilla-mobile/fenix#5216](https://github.com/mozilla-mobile/fenix/pull/5216), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |1, 2 |
-| metrics.recently_used_pwa_count |[counter](https://mozilla.github.io/glean/book/user/metrics/counter.html) |A counter that indicates how many PWAs a user has recently used. Threshold for "recency" set in HomeActivity#PWA_RECENTLY_USED_THRESHOLD. Currently we are not told by the OS when a PWA is removed by the user, so we use the "recently used" heuristic to judge how many PWAs are still active, as a proxy for "installed". This value will only be set if the user has at least *one* recently used PWA. If they have 0, this metric will not be sent, resulting in a null value during analysis on the server-side. To disambiguate between a failed `recently_used_pwa_count` metric and 0 recent PWAs, please see `has_recent_pwas`.  |[mozilla-mobile/fenix#11982](https://github.com/mozilla-mobile/fenix/pull/11982#pullrequestreview-437963817), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| metrics.search_count |[labeled_counter](https://mozilla.github.io/glean/book/user/metrics/labeled_counters.html) |The labels for this counter are `<search-engine-name>.<source>`.  If the search engine is bundled with Fenix `search-engine-name` will be the name of the search engine. If it's a custom search engine (defined: https://github.com/mozilla-mobile/fenix/issues/1607) the value will be `custom`.  `source` will be: `action`, `suggestion`, `widget`, `shortcut`, `topsite` (depending on the source from which the search started). Also added the `other` option for the source but it should never enter on this case.  |[mozilla-mobile/fenix#1677](https://github.com/mozilla-mobile/fenix/pull/1677), [mozilla-mobile/fenix#5216](https://github.com/mozilla-mobile/fenix/pull/5216), [mozilla-mobile/fenix#7310](https://github.com/mozilla-mobile/fenix/pull/7310), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |1, 2 |
-| metrics.search_widget_installed |[boolean](https://mozilla.github.io/glean/book/user/metrics/boolean.html) |Whether or not the search widget is installed  |[mozilla-mobile/fenix#10958](https://github.com/mozilla-mobile/fenix/pull/10958), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| metrics.start_reason_activity_error |[boolean](https://mozilla.github.io/glean/book/user/metrics/boolean.html) |The `AppStartReasonProvider.ActivityLifecycleCallbacks.onActivityCreated` was unexpectedly called twice. We can use this metric to validate our assumptions about how these APIs are called. This probe can be removed once we validate these assumptions.  |[mozilla-mobile/fenix#18632](https://github.com/mozilla-mobile/fenix/pull/18632#issue-600193452)||2021-08-11 |1 |
-| metrics.start_reason_process_error |[boolean](https://mozilla.github.io/glean/book/user/metrics/boolean.html) |The `AppStartReasonProvider.ProcessLifecycleObserver.onCreate` was unexpectedly called twice. We can use this metric to validate our assumptions about how these APIs are called. This probe can be removed once we validate these assumptions.  |[mozilla-mobile/fenix#18632](https://github.com/mozilla-mobile/fenix/pull/18632#issue-600193452)||2021-08-11 |1 |
-| metrics.tab_view_setting |[string](https://mozilla.github.io/glean/book/user/metrics/string.html) |A string that indicates the setting for tab view: GRID, LIST  |[mozilla-mobile/fenix#15811](https://github.com/mozilla-mobile/fenix/pull/15811#issuecomment-706402952)||2021-08-01 |2 |
-| metrics.tabs_open_count |[counter](https://mozilla.github.io/glean/book/user/metrics/counter.html) |A counter that indicates how many NORMAL tabs a user has open. This value will only be set if the user has at least *one* open tab. If they have 0, this ping will not get sent, resulting in a null value. To disambiguate between a failed `tabs_open_count` ping and 0 open tabs, please see `has_open_tabs`.  |[mozilla-mobile/fenix#12024](https://github.com/mozilla-mobile/fenix/pull/12024), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| metrics.toolbar_position |[string](https://mozilla.github.io/glean/book/user/metrics/string.html) |A string that indicates the new position of the toolbar TOP or BOTTOM  |[mozilla-mobile/fenix#6608](https://github.com/mozilla-mobile/fenix/pull/6608), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| metrics.top_sites_count |[counter](https://mozilla.github.io/glean/book/user/metrics/counter.html) |A counter that indicates how many top sites a user has. This value will only be set if the user has at least *one* top site. If they have 0, this ping will not get sent, resulting in a null value. To disambiguate between a failed `top_sites_count` ping and 0 top sites, please see `has_top_sites`.  |[mozilla-mobile/fenix#9556](https://github.com/mozilla-mobile/fenix/pull/9556), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| perf.awesomebar.bookmark_suggestions |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |Duration of a bookmarks awesomebar suggestion query.  |[mozilla-mobile/fenix#10276](https://github.com/mozilla-mobile/fenix/pull/10276#pullrequestreview-411101979)||2021-11-15 |1, 2 |
-| perf.awesomebar.clipboard_suggestions |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |Duration of a clipboard awesomebar suggestion query.  |[mozilla-mobile/fenix#10276](https://github.com/mozilla-mobile/fenix/pull/10276#pullrequestreview-411101979)||2021-11-15 |1, 2 |
-| perf.awesomebar.history_suggestions |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |Duration of a history awesomebar suggestion query.  |[mozilla-mobile/fenix#10276](https://github.com/mozilla-mobile/fenix/pull/10276#pullrequestreview-411101979)||2021-11-15 |1, 2 |
-| perf.awesomebar.search_engine_suggestions |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |Duration of a search engine awesomebar suggestion query.  |[mozilla-mobile/fenix#10276](https://github.com/mozilla-mobile/fenix/pull/10276#pullrequestreview-411101979)||2021-11-15 |1, 2 |
-| perf.awesomebar.session_suggestions |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |Duration of a session awesomebar suggestion query.  |[mozilla-mobile/fenix#10276](https://github.com/mozilla-mobile/fenix/pull/10276#pullrequestreview-411101979)||2021-11-15 |1, 2 |
-| perf.awesomebar.shortcuts_suggestions |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |Duration of a shortcuts awesomebar suggestion query.  |[mozilla-mobile/fenix#10276](https://github.com/mozilla-mobile/fenix/pull/10276#pullrequestreview-411101979)||2021-11-15 |1, 2 |
-| perf.awesomebar.synced_tabs_suggestions |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |Duration of a synced tabs awesomebar suggestion query.  |[mozilla-mobile/fenix#10276](https://github.com/mozilla-mobile/fenix/pull/10276#pullrequestreview-411101979)||2021-11-15 |1, 2 |
-| perf.startup.app_on_create_to_glean_init |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |A subsection of the duration of `FenixApplication.onCreate` and thus the `application_on_create` probe from the start of the method through when `initializeGlean` is called. Note: `initializeGlean` is a no-op for Beta and Release builds which instead initialize it during `MigratingFenixApplication`, which we don't currently measure.  |[mozilla-mobile/fenix#18525](https://github.com/mozilla-mobile/fenix/pull/18525#issue-594961170)||2021-08-11 |1 |
-| perf.startup.app_on_create_to_megazord_init |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |A subsection of the duration of `FenixApplication.onCreate` and thus the `application_on_create` probe from after the `app_on_create_to_glean_init` probe until we block for the megazord to complete set up.  |[mozilla-mobile/fenix#18525](https://github.com/mozilla-mobile/fenix/pull/18525#issue-594961170)||2021-08-11 |1 |
-| perf.startup.app_on_create_to_setup_in_main |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |A subsection of the duration of `FenixApplication.onCreate` and thus the `application_on_create` probe from after the `app_on_create_to_megazord_init` probe until the end of `setupInMainProcessOnly`, which is expected to be the end of the `onCreate` call (unless the implementation later changes).  |[mozilla-mobile/fenix#18525](https://github.com/mozilla-mobile/fenix/pull/18525#issue-594961170)||2021-08-11 |1 |
-| perf.startup.application_on_create |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |The duration of `FenixApplication.onCreate` in the main process. This does not measure the duration of migration code (via `MigratingFenixApplication` included in the Beta and Release channels.  |[mozilla-mobile/fenix#17973](https://github.com/mozilla-mobile/fenix/pull/17973#issue-572183889)||2021-08-11 |1 |
-| perf.startup.base_bfragment_on_create_view |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |The duration of `BaseBrowserFragment.onCreateView`.  |[mozilla-mobile/fenix#18558](https://github.com/mozilla-mobile/fenix/pull/18558#issue-596791848)||2021-08-11 |1 |
-| perf.startup.base_bfragment_on_view_created |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |The duration of `BaseBrowserFragment.onViewCreated`.  |[mozilla-mobile/fenix#18558](https://github.com/mozilla-mobile/fenix/pull/18558#issue-596791848)||2021-08-11 |1 |
-| perf.startup.cold_main_app_to_first_frame |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |The duration from `*Application`'s initializer to the first Android frame being drawn in a [COLD MAIN start up](https://wiki.mozilla.org/index.php?title=Performance/Fenix/Glossary). Notably, this duration omits the time from process start to the initializer (which includes a lengthy dex operation) and the time from the first frame to visual completeness. This probe doesn't measure Custom Tabs or other uses of `ExternalAppBrowserActivity` to simplify result analysis. The methodology for determining this measurement is imperfect to simplify implementation. Issues may include: <br>- Not measuring Beta and Release channels (due to `MigrationDecisionActivity` interrupting the logic). <br>- Not distinguishing between MAIN to homescreen, onboarding, session restore, others? <br>- Not choosing to record a MAIN based on what the user would see and thus the core code path (i.e. the thing we want to measure) but rather on the initial `Intent` state. <br><br> The hope is that these cases will not have a significant impact on the end results but, if they appear to, we can replace it with a more complex implementation. <br><br> Around April 8, 2021 the implementation was refactored. Functionally, it should be the same but it's noted just in case there are bugs.  |[mozilla-mobile/fenix#18632](https://github.com/mozilla-mobile/fenix/pull/18632#issue-600193452)||2021-08-11 |1 |
-| perf.startup.cold_unknwn_app_to_first_frame |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |The duration from `*Application`'s initializer to the first Android frame being drawn in a [COLD start up](https://wiki.mozilla.org/index.php?title=Performance/Fenix/Glossary) where we can't say it was a MAIN or VIEW start up. The methodology for determining this measurement is imperfect to simplify implementation. <br><br> See the `cold_main_app_to_first_frame` probe docs for known issues and more details. <br><br> Around April 8, 2021 the implementation was refactored. Functionally, it should be the same but it's noted just in case there are bugs.  |[mozilla-mobile/fenix#18632](https://github.com/mozilla-mobile/fenix/pull/18632#issue-600193452)||2021-08-11 |1 |
-| perf.startup.cold_view_app_to_first_frame |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |The duration from `*Application`'s initializer to the first Android frame being drawn in a [COLD VIEW start up](https://wiki.mozilla.org/index.php?title=Performance/Fenix/Glossary). The methodology for determining this measurement is imperfect to simplify implementation. Issues may include: <br>-Including VIEW intents that aren't valid so take code paths similar to MAIN (this is speculative) <br><br> See the `cold_main_app_to_first_frame` probe docs for other possible known issues and more details. <br><br> Around April 8, 2021 the implementation was refactored. Functionally, it should be the same but it's noted just in case there are bugs.  |[mozilla-mobile/fenix#18632](https://github.com/mozilla-mobile/fenix/pull/18632#issue-600193452)||2021-08-11 |1 |
-| perf.startup.home_activity_on_create |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |The duration of `HomeActivity.onCreate`.  |[mozilla-mobile/fenix#17973](https://github.com/mozilla-mobile/fenix/pull/17973#issue-572183889)||2021-08-11 |1 |
-| perf.startup.home_activity_on_start |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |The duration of `HomeActivity.onStart`. This may encapsulate `HomeFragment` or `BrowserFragment` creation, depending on the code path, so we expect this to take varying amounts of time. As such, this probe may not be easy to interpret directly but we believe collecting it may give us more information about different patterns we might see in performance data.  |[mozilla-mobile/fenix#18558](https://github.com/mozilla-mobile/fenix/pull/18558#issue-596791848)||2021-08-11 |1 |
-| perf.startup.home_fragment_on_create_view |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |The duration of `HomeFragment.onCreateView`.  |[mozilla-mobile/fenix#18558](https://github.com/mozilla-mobile/fenix/pull/18558#issue-596791848)||2021-08-11 |1 |
-| perf.startup.home_fragment_on_view_created |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |The duration of `HomeFragment.onViewCreated`.  |[mozilla-mobile/fenix#18558](https://github.com/mozilla-mobile/fenix/pull/18558#issue-596791848)||2021-08-11 |1 |
-| perf.startup.startup_type |[labeled_counter](https://mozilla.github.io/glean/book/user/metrics/labeled_counters.html) |Indicates how the browser was started. The label is divided into two variables. `state` is how cached the browser is when started. `path` is what code path we are expected to take. Together, they create a combined label: `state_path`. For brevity, the specific states are documented in the [Fenix perf glossary](https://wiki.mozilla.org/index.php?title=Performance/Fenix/Glossary). <br><br> This implementation is intended to be simple, not comprehensive. We list the implications below.  <br><br> These ways of opening the app undesirably adds events to our primary buckets (non-`unknown` cases): <br>- App switcher cold/warm: `cold/warm_` + duplicates path from previous launch <br>- Home screen shortcuts: `*_view` <br>- An Intent is sent internally that's uses `ACTION_MAIN` or `ACTION_VIEW` could be: `*_main/view` (unknown if this ever happens) <br>- A command-line launch uses `ACTION_MAIN` or `ACTION_VIEW` could be: `*_main/view`  <br><br> These ways of opening the app undesirably do not add their events to our primary buckets: <br>- Close and reopen the app very quickly: no event is recorded.  <br><br> These ways of opening the app don't affect our primary buckets: <br>- App switcher hot: `hot_unknown` <br>- PWA (all states): `unknown_unknown` <br>- Custom tab: `unknown_view` <br>- Cold start where a service or other non-activity starts the process (not manually tested) - this seems to happen if you have the homescreen widget: `unknown_*` <br>- Another activity is drawn before HomeActivity (e.g. widget voice search): `unknown_*` <br>- Widget text search: `*_unknown`  <br><br> In addition to the events above, the `unknown` state may be chosen when we were unable to determine a cause due to implementation details or the API was used incorrectly. We may be able to record the events listed above into different buckets but we kept the implementation simple for now. <br><br> N.B.: for implementation simplicity, we duplicate the logic in app that determines `path` so it's not perfectly accurate. In one way, we record we is intended to happen rather than what actually happened (e.g. the user may click a link so we record VIEW but the app does a MAIN by going to the homescreen because the link was invalid).  |[mozilla-mobile/fenix#19028](https://github.com/mozilla-mobile/fenix/pull/19028)|<ul><li>cold_main</li><li>cold_view</li><li>cold_unknown</li><li>warm_main</li><li>warm_view</li><li>warm_unknown</li><li>hot_main</li><li>hot_view</li><li>hot_unknown</li><li>unknown_main</li><li>unknown_view</li><li>unknown_unknown</li></ul>|2021-10-09 |2 |
-| preferences.accessibility_services |[string_list](https://mozilla.github.io/glean/book/user/metrics/string_list.html) |Whether or not the user has touch exploration or switch services enabled. These are built into the Android OS, not Fenix prefs. default: ""  |[mozilla-mobile/fenix#11211](https://github.com/mozilla-mobile/fenix/pull/11211), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| preferences.open_links_in_a_private_tab |[string_list](https://mozilla.github.io/glean/book/user/metrics/string_list.html) |Whether or not the user has enabled open links in a private tab. default: false  |[mozilla-mobile/fenix#11211](https://github.com/mozilla-mobile/fenix/pull/11211), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| preferences.open_links_in_app |[string_list](https://mozilla.github.io/glean/book/user/metrics/string_list.html) |Whether or not the user has the open links in apps feature enabled. default: false  |[mozilla-mobile/fenix#11446](https://github.com/mozilla-mobile/fenix/pull/11446), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| preferences.remote_debugging |[string_list](https://mozilla.github.io/glean/book/user/metrics/string_list.html) |Whether or not the user has remote debugging enabled default: false  |[mozilla-mobile/fenix#11211](https://github.com/mozilla-mobile/fenix/pull/11211), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| preferences.search_bookmarks |[string_list](https://mozilla.github.io/glean/book/user/metrics/string_list.html) |Whether or not the user has enabled bookmark search suggestions default: true  |[mozilla-mobile/fenix#11211](https://github.com/mozilla-mobile/fenix/pull/11211), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| preferences.search_browsing_history |[string_list](https://mozilla.github.io/glean/book/user/metrics/string_list.html) |Whether or not the user has enabled browsing history suggestions. default: true  |[mozilla-mobile/fenix#11211](https://github.com/mozilla-mobile/fenix/pull/11211), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| preferences.search_suggestions_private |[string_list](https://mozilla.github.io/glean/book/user/metrics/string_list.html) |Whether or not the user has enabled showing search suggestions in private mode. default: false (we prompt the user, asking them to make a selection)  |[mozilla-mobile/fenix#11211](https://github.com/mozilla-mobile/fenix/pull/11211), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| preferences.show_clipboard_suggestions |[string_list](https://mozilla.github.io/glean/book/user/metrics/string_list.html) |Whether or not the user has enabled clipboard search suggestions. default: true  |[mozilla-mobile/fenix#11211](https://github.com/mozilla-mobile/fenix/pull/11211), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| preferences.show_search_shortcuts |[string_list](https://mozilla.github.io/glean/book/user/metrics/string_list.html) |Whether or not the user has enabled search shortcuts. default: true  |[mozilla-mobile/fenix#11211](https://github.com/mozilla-mobile/fenix/pull/11211), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| preferences.show_search_suggestions |[string_list](https://mozilla.github.io/glean/book/user/metrics/string_list.html) |Whether or not the user has search suggestions enabled default: true  |[mozilla-mobile/fenix#11211](https://github.com/mozilla-mobile/fenix/pull/11211), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| preferences.show_voice_search |[string_list](https://mozilla.github.io/glean/book/user/metrics/string_list.html) |Whether or not the user has enabled the voice search button. default: true  |[mozilla-mobile/fenix#11211](https://github.com/mozilla-mobile/fenix/pull/11211), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| preferences.sync |[string_list](https://mozilla.github.io/glean/book/user/metrics/string_list.html) |Whether or not the user is signed into FxA default: false  |[mozilla-mobile/fenix#11211](https://github.com/mozilla-mobile/fenix/pull/11211), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| preferences.sync_items |[string_list](https://mozilla.github.io/glean/book/user/metrics/string_list.html) |The list of items the user has chosen to sync with FxA. default: "" if the user is signed out. Otherwise defaults to whatever is set in their FxA account. New accounts set: [bookmarks, history, passwords, tabs]  |[mozilla-mobile/fenix#11211](https://github.com/mozilla-mobile/fenix/pull/11211), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| preferences.telemetry |[string_list](https://mozilla.github.io/glean/book/user/metrics/string_list.html) |Whether or not the user has telemetry enabled. Note we should never receive a "false" value for this since telemetry would not send in that case. default: true  |[mozilla-mobile/fenix#11211](https://github.com/mozilla-mobile/fenix/pull/11211), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| preferences.theme |[string_list](https://mozilla.github.io/glean/book/user/metrics/string_list.html) |The theme the user has enabled. "light," "dark," "system," or "battery" default: "system" for API 28+, else "light"  |[mozilla-mobile/fenix#11446](https://github.com/mozilla-mobile/fenix/pull/11446), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| preferences.toolbar_position |[string_list](https://mozilla.github.io/glean/book/user/metrics/string_list.html) |The position of the toolbar default: bottom (defaults to top if the user has accessibility services)  |[mozilla-mobile/fenix#11211](https://github.com/mozilla-mobile/fenix/pull/11211), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| preferences.tracking_protection |[string_list](https://mozilla.github.io/glean/book/user/metrics/string_list.html) |What type of enhanced tracking protection the user has enabled. "standard," "strict," "custom," or "" (if disabled) default: "standard"  |[mozilla-mobile/fenix#11211](https://github.com/mozilla-mobile/fenix/pull/11211), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| search.default_engine.code |[string](https://mozilla.github.io/glean/book/user/metrics/string.html) |If the search engine is pre-loaded with Fenix this value will be the search engine identifier. If it's a custom search engine (defined: https://github.com/mozilla-mobile/fenix/issues/1607) the value will be "custom"  |[mozilla-mobile/fenix#1606](https://github.com/mozilla-mobile/fenix/pull/1606), [mozilla-mobile/fenix#5216](https://github.com/mozilla-mobile/fenix/pull/5216), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |1, 2 |
-| search.default_engine.name |[string](https://mozilla.github.io/glean/book/user/metrics/string.html) |If the search engine is pre-loaded with Fenix this value will be the search engine name. If it's a custom search engine (defined: https://github.com/mozilla-mobile/fenix/issues/1607) the value will be "custom"  |[mozilla-mobile/fenix#1606](https://github.com/mozilla-mobile/fenix/pull/1606), [mozilla-mobile/fenix#5216](https://github.com/mozilla-mobile/fenix/pull/5216), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |1, 2 |
-| search.default_engine.submission_url |[string](https://mozilla.github.io/glean/book/user/metrics/string.html) |If the search engine is pre-loaded with Fenix this value will be he base URL we use to build the search query for the search engine. For example: https://mysearchengine.com/?query=%s. If it's a custom search engine (defined: https://github.com/mozilla-mobile/fenix/issues/1607) the value will be "custom"  |[mozilla-mobile/fenix#1606](https://github.com/mozilla-mobile/fenix/pull/1606), [mozilla-mobile/fenix#5216](https://github.com/mozilla-mobile/fenix/pull/5216), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |1, 2 |
-| storage.stats.app_bytes |[memory_distribution](https://mozilla.github.io/glean/book/user/metrics/memory_distribution.html) |The size of the app's APK and related files as installed: this is expected to be larger than download size. This is the output of [StorageStats.getAppBytes](https://developer.android.com/reference/android/app/usage/StorageStats#getAppBytes()) so see that for details. This value is only available on Android 8+. A similar value may be available on the Google Play dashboard: we can use this value to see if that value is reliable enough.  |[mozilla-mobile/fenix#12876](https://github.com/mozilla-mobile/fenix/pull/12876#issuecomment-666770732), [mozilla-mobile/fenix#17704](https://github.com/mozilla-mobile/fenix/pull/17704#issue-564299127)||2021-08-01 |1, 2 |
-| storage.stats.cache_bytes |[memory_distribution](https://mozilla.github.io/glean/book/user/metrics/memory_distribution.html) |The size of all cached data in the app. This is the output of [StorageStats.getCacheBytes](https://developer.android.com/reference/android/app/usage/StorageStats#getCacheBytes()) so see that for details. This value is only available on Android 8+.  |[mozilla-mobile/fenix#12876](https://github.com/mozilla-mobile/fenix/pull/12876#issuecomment-666770732), [mozilla-mobile/fenix#17704](https://github.com/mozilla-mobile/fenix/pull/17704#issue-564299127)||2021-08-01 |1, 2 |
-| storage.stats.data_dir_bytes |[memory_distribution](https://mozilla.github.io/glean/book/user/metrics/memory_distribution.html) |The size of all data minus `cache_bytes`. This is the output of [StorageStats.getDataBytes](https://developer.android.com/reference/android/app/usage/StorageStats#getDataBytes()) except we subtract the value of `cache_bytes` so the cache is not measured redundantly; see that method for details. This value is only available on Android 8+.  |[mozilla-mobile/fenix#12876](https://github.com/mozilla-mobile/fenix/pull/12876#issuecomment-666770732), [mozilla-mobile/fenix#17704](https://github.com/mozilla-mobile/fenix/pull/17704#issue-564299127)||2021-08-01 |1, 2 |
-| storage.stats.query_stats_duration |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |How long it took to query the device for the StorageStats that contain the file size information. The docs say it may be expensive so we want to ensure it's not too expensive.  This value is only available on Android 8+.  |[mozilla-mobile/fenix#12876](https://github.com/mozilla-mobile/fenix/pull/12876#issuecomment-666770732), [mozilla-mobile/fenix#17704](https://github.com/mozilla-mobile/fenix/pull/17704#issue-564299127)||2021-08-01 |1, 2 |
-
-## startup-timeline
-
-This ping is intended to provide an understanding of startup performance.
-
-In addition to being captured on real devices, the ping data was prematurely
-optimized into this separate ping to be isolated from other metrics to be
-more easily captured by performance testing automation but that hasn't
-happened in practice. We would have removed it but implementation
-details don't make that possible:
-https://github.com/mozilla-mobile/fenix/issues/17972#issuecomment-781002987
-
-
-This ping includes the [client id](https://mozilla.github.io/glean/book/user/pings/index.html#the-client_info-section).
-
-**Data reviews for this ping:**
-
-- <https://github.com/mozilla-mobile/fenix/pull/9788#pullrequestreview-394228626>
-- <https://github.com/mozilla-mobile/fenix/pull/18043#issue-575389284>
-
-**Bugs related to this ping:**
-
-- <https://github.com/mozilla-mobile/fenix/issues/8803>
-- <https://github.com/mozilla-mobile/fenix/issues/17972>
-
-All Glean pings contain built-in metrics in the [`ping_info`](https://mozilla.github.io/glean/book/user/pings/index.html#the-ping_info-section) and [`client_info`](https://mozilla.github.io/glean/book/user/pings/index.html#the-client_info-section) sections.
-
-In addition to those built-in metrics, the following metrics are added to the ping:
-
-| Name | Type | Description | Data reviews | Extras | Expiration | [Data Sensitivity](https://wiki.mozilla.org/Firefox/Data_Collection) |
-| --- | --- | --- | --- | --- | --- | --- |
-| startup.timeline.clock_ticks_per_second_v2 |[quantity](https://mozilla.github.io/glean/book/user/metrics/quantity.html) |The number of clock tick time units that occur in one second on this particular device. This value is expected to be used in conjunction with the `framework_primary/secondary` metrics.  |[mozilla-mobile/fenix#9788](https://github.com/mozilla-mobile/fenix/pull/9788#pullrequestreview-394228626), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068), [mozilla-mobile/fenix#18158](https://github.com/mozilla-mobile/fenix/pull/18158#issue-579593943)|<ul><li>unit: clock ticks per second</li></ul>|2021-08-01 |1 |
-| startup.timeline.framework_primary |[timespan](https://mozilla.github.io/glean/book/user/metrics/timespan.html) |The duration the Android framework takes to start before letting us run code in `*Application.init` when this device has `clock_ticks_per_second_v2` equal to 100: if it's not equal to 100, then this value is captured in `framework_secondary`. We split this into two metrics to make it easier to analyze in GLAM. We split on 100 because when we did our initial brief analysis - https://sql.telemetry.mozilla.org/queries/75591 - the results for clocks ticks were overwhelmingly 100.  The duration is calculated from `appInitTimestamp - processStartTimestamp`. `processStartTimestamp` is derived from the clock tick time unit, which is expected to be less granular than nanoseconds. Therefore, we convert and round our timestamps to clock ticks before computing the difference and convert back to nanoseconds to report.  For debugging purposes, `clock_ticks_per_second_v2`, which may vary between devices, is also reported as a metric  |[mozilla-mobile/fenix#9788](https://github.com/mozilla-mobile/fenix/pull/9788#pullrequestreview-394228626), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068), [mozilla-mobile/fenix#18043](https://github.com/mozilla-mobile/fenix/pull/18043#issue-575389284)||2021-08-01 |1 |
-| startup.timeline.framework_secondary |[timespan](https://mozilla.github.io/glean/book/user/metrics/timespan.html) |The duration the Android framework takes to start before letting us run code in `*Application.init` when this device has `clock_ticks_per_second_v2` not equal to 100. For more details on this metric, see `framework_primary`  |[mozilla-mobile/fenix#18043](https://github.com/mozilla-mobile/fenix/pull/18043#issue-575389284)||2021-08-01 |1 |
-| startup.timeline.framework_start_error |[boolean](https://mozilla.github.io/glean/book/user/metrics/boolean.html) |An error when attempting to record `framework_primary/secondary` - the application init timestamp returned a negative value - which is likely indicative of a bug in the implementation.  |[mozilla-mobile/fenix#9788](https://github.com/mozilla-mobile/fenix/pull/9788#pullrequestreview-394228626), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |1 |
-| startup.timeline.framework_start_read_error |[boolean](https://mozilla.github.io/glean/book/user/metrics/boolean.html) |An error when attempting to read stats from /proc pseudo-filesystem - privacy managers can block access to reading these files - the application will catch a file reading exception.  |[mozilla-mobile/fenix#10481](https://github.com/mozilla-mobile/fenix/pull/10481), [mozilla-mobile/fenix#15713](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |1 |
-
-Data categories are [defined here](https://wiki.mozilla.org/Firefox/Data_Collection).
-
-<!-- AUTOGENERATED BY glean_parser.  DO NOT EDIT. -->
+Metrics definitions for Firefox for Android have moved to the [Glean Dictionary](https://dictionary.telemetry.mozilla.org/apps/fenix).
 
+This file is kept only for historical reference.
diff --git a/docs/telemetry.md b/docs/telemetry.md
index 4b56bfe2b..14a7ab760 100644
--- a/docs/telemetry.md
+++ b/docs/telemetry.md
@@ -3,9 +3,11 @@
 Fenix uses Mozilla's telemetry service (Glean) to measure feature performance and engagement.
 
 ## Glean pings and metrics
+
 By using the Glean SDK, Fenix can send the pings the SDK owns and defines, as documented [in the Glean SDK docs](https://mozilla.github.io/glean/book/user/pings/index.html).
 
-Additional metrics or pings defined by Fenix are documented in the [Glean SDK autogenerated docs](metrics.md).
+Additional metrics or pings defined by Fenix are documented in the [Glean Dictionary](https://dictionary.telemetry.mozilla.org/apps/fenix).
 
 ## Crash reporting
+
 See [here](https://github.com/mozilla-mobile/fenix/blob/master/docs/crash-reporting.md) for details on crash reporting in Firefox for Android.
diff --git a/l10n-release.toml b/l10n-release.toml
index 02dac9510..409f5ff29 100644
--- a/l10n-release.toml
+++ b/l10n-release.toml
@@ -7,11 +7,13 @@ locales = [
   "ast",
   "az",
   "be",
+  "bg",
   "bn",
   "br",
   "bs",
   "ca",
   "cak",
+  "ckb",
   "co",
   "cs",
   "cy",
@@ -45,6 +47,7 @@ locales = [
   "hsb",
   "hu",
   "hy-AM",
+  "ia",
   "id",
   "is",
   "it",
@@ -86,6 +89,7 @@ locales = [
   "tl",
   "tr",
   "trs",
+  "tt",
   "uk",
   "ur",
   "vec",
diff --git a/l10n.toml b/l10n.toml
index 8e0601d8a..1018619f7 100644
--- a/l10n.toml
+++ b/l10n.toml
@@ -14,6 +14,7 @@ locales = [
   "ca",
   "cak",
   "ceb",
+  "ckb",
   "co",
   "cs",
   "cy",
@@ -97,6 +98,7 @@ locales = [
   "tr",
   "trs",
   "tt",
+  "tzm",
   "uk",
   "ur",
   "uz",
diff --git a/mozilla-detekt-rules/src/main/java/org/mozilla/fenix/detektrules/CustomRulesetConsoleReport.kt b/mozilla-detekt-rules/src/main/java/org/mozilla/fenix/detektrules/CustomRulesetConsoleReport.kt
index 8266688bf..f7e828061 100644
--- a/mozilla-detekt-rules/src/main/java/org/mozilla/fenix/detektrules/CustomRulesetConsoleReport.kt
+++ b/mozilla-detekt-rules/src/main/java/org/mozilla/fenix/detektrules/CustomRulesetConsoleReport.kt
@@ -14,8 +14,8 @@ class CustomRulesetConsoleReport : ConsoleReport() {
     @Suppress("DEPRECATION") // locationAsString
     override fun render(detektion: Detektion): String? {
         return detektion.findings["mozilla-detekt-rules"]?.fold("") { accumulator, finding ->
-            accumulator + "${finding.id}:\n    ${finding.locationAsString}\n    ${finding.messageOrDescription()}\n\n"
+            accumulator + "${finding.id}:\n    ${finding.file}\n    ${finding.messageOrDescription()}\n\n"
             // This creates an extra newline at the very end but it's not worth fixing.
         }
     }
-}
\ No newline at end of file
+}
diff --git a/mozilla-detekt-rules/src/test/java/org/mozilla/fenix/detektrules/perf/MozillaBannedPropertyAccessTest.kt b/mozilla-detekt-rules/src/test/java/org/mozilla/fenix/detektrules/perf/MozillaBannedPropertyAccessTest.kt
index a45e75b06..daa96a8a1 100644
--- a/mozilla-detekt-rules/src/test/java/org/mozilla/fenix/detektrules/perf/MozillaBannedPropertyAccessTest.kt
+++ b/mozilla-detekt-rules/src/test/java/org/mozilla/fenix/detektrules/perf/MozillaBannedPropertyAccessTest.kt
@@ -7,8 +7,8 @@
 package org.mozilla.fenix.detektrules.perf
 
 import io.gitlab.arturbosch.detekt.api.Config
-import io.gitlab.arturbosch.detekt.api.YamlConfig
 import io.gitlab.arturbosch.detekt.test.lint
+import io.gitlab.arturbosch.detekt.test.yamlConfig
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.BeforeEach
@@ -26,7 +26,8 @@ internal class MozillaBannedPropertyAccessTest {
 
     @BeforeEach
     fun setup() {
-        config = YamlConfig.loadResource(this.javaClass.getResource("/config.yml"))
+        config = yamlConfig("/config.yml")
+
     }
 
     @Test
diff --git a/taskcluster/ci/build/kind.yml b/taskcluster/ci/build/kind.yml
index 2d647cb8f..6e7ed7d47 100644
--- a/taskcluster/ci/build/kind.yml
+++ b/taskcluster/ci/build/kind.yml
@@ -122,6 +122,23 @@ jobs:
         treeherder:
             symbol: beta(Bat)
 
+    android-test-mozillaonline:
+        apk-artifact-template:
+            # 3 differences here:
+            #  * "androidTest/" is added
+            #  * "{gradle_build_type}" is forced to "beta"
+            #  * "{fileName}" is forced to "app-beta-androidTest.apk"
+            path: '/builds/worker/checkouts/src/app/build/outputs/apk/androidTest/beta/app-beta-androidTest.apk'
+        disable-optimization: true
+        run:
+            gradle-build-type: androidTest
+            gradle-extra-options:
+                - -PmozillaOnline
+            test-build-type: beta
+        run-on-tasks-for: [github-push] # We want this on push so that we detect problem before triggering a new beta
+        treeherder:
+            symbol: beta(Bat-mo)
+
     nightly-simulation:
         attributes:
             nightly: false
@@ -155,6 +172,21 @@ jobs:
         treeherder:
             symbol: beta(B)
 
+    beta-mozillaonline:
+        apk-artifact-template:
+            github-name: 'fenix-mozillaonline-{version}-{abi}.apk'
+        attributes:
+            release-type: beta
+        include-release-version: true
+        include-shippable-secrets: true
+        filter-incomplete-translations: true
+        run:
+            gradle-build-type: beta
+            gradle-extra-options:
+                - -PmozillaOnline
+        treeherder:
+            symbol: beta(Bmo)
+
     release:
         attributes:
             release-type: release
@@ -165,3 +197,18 @@ jobs:
             gradle-build-type: release
         treeherder:
             symbol: release(B)
+
+    release-mozillaonline:
+        apk-artifact-template:
+            github-name: 'fenix-mozillaonline-{version}-{abi}.apk'
+        attributes:
+            release-type: release
+        include-release-version: true
+        include-shippable-secrets: true
+        filter-incomplete-translations: true
+        run:
+            gradle-build-type: release
+            gradle-extra-options:
+                - -PmozillaOnline
+        treeherder:
+            symbol: release(Bmo)
diff --git a/taskcluster/ci/signing/kind.yml b/taskcluster/ci/signing/kind.yml
index 9c62998d8..0b5e2c933 100644
--- a/taskcluster/ci/signing/kind.yml
+++ b/taskcluster/ci/signing/kind.yml
@@ -7,6 +7,7 @@ loader: fenix_taskgraph.loader.multi_dep:loader
 transforms:
     - fenix_taskgraph.transforms.multi_dep:transforms
     - fenix_taskgraph.transforms.signing:transforms
+    - fenix_taskgraph.transforms.notify:transforms
     - taskgraph.transforms.task:transforms
 
 kind-dependencies:
@@ -19,12 +20,16 @@ group-by: build-type
 job-template:
     description: Sign Fenix
     worker: {}
-    signing-format: autograph_apk
+    signing-format:
+        by-build-type:
+            beta-mozillaonline: autograph_apk_mozillaonline
+            release-mozillaonline: autograph_apk_mozillaonline
+            default: autograph_apk
     index:
         by-tasks-for:
             (action|cron|github-release):
                 by-build-type:
-                    (nightly|debug|nightly-simulation|beta|release):
+                    (nightly|debug|nightly-simulation|beta|beta-mozillaonline|release|release-mozillaonline):
                         type: signing
                     default: {}
             default: {}
@@ -33,15 +38,33 @@ job-template:
             # No test job runs on push against this build type. Although we do want nightly-simulation
             # signed to use it in the gecko trees.
             # We want beta on push so that we detect problem before shipping it
-            (nightly-simulation|beta-firebase|android-test-beta|nightly-firebase|android-test-nightly): [github-push]
+            (nightly-simulation|beta-firebase|android-test-beta|android-test-mozillaonline|nightly-firebase|android-test-nightly): [github-push]
             default: []
     treeherder:
         job-symbol:
             by-build-type:
                 android-test.+: Bats
+                android-test-mozillaonline: Bats-mo
                 beta-firebase: Bfs
                 nightly-firebase: Bfs
+                beta-mozillaonline: Bmos
+                release-mozillaonline: Bmos
                 default: Bs
         kind: build
         platform: android-all/opt
         tier: 1
+    notify:
+        by-build-type:
+            .*mozillaonline:
+                by-level:
+                    '3':
+                        email:
+                            content: The Mozilla Online Fenix {version} APKs are now available
+                            link:
+                                text: Taskcluster Task
+                                href: 'https://firefox-ci-tc.services.mozilla.com/tasks/${status.taskId}'
+                            on-reasons: [completed]
+                            subject: Mozilla Online Fenix {version} APKs are now available
+                            to-addresses: [mozillaonline-fenix@mozilla.com]
+                    default: {}
+            default: {}
diff --git a/taskcluster/ci/toolchain/gecko-derived.yml b/taskcluster/ci/toolchain/gecko-derived.yml
index 27343ca1c..0c1875780 100644
--- a/taskcluster/ci/toolchain/gecko-derived.yml
+++ b/taskcluster/ci/toolchain/gecko-derived.yml
@@ -43,7 +43,7 @@ linux64-minidump-stackwalk:
 
 linux64-node:
     attributes:
-        toolchain-artifact: public/build/node.tar.xz
+        toolchain-artifact: public/build/node.tar.zst
     description: "Node.js toolchain"
     run:
         index-search:
diff --git a/taskcluster/docker/bump/mozilla_key.asc b/taskcluster/docker/bump/mozilla_key.asc
index b07b59578..7a56655ca 100644
--- a/taskcluster/docker/bump/mozilla_key.asc
+++ b/taskcluster/docker/bump/mozilla_key.asc
@@ -209,42 +209,42 @@ DUHrg7L+PdpvyVxi8Py0Zfe05h6SjBPrw3eTQS6ODkoZQyh8D7M2HKUiUxvfufvn
 LEfeWpd7Vp7hl/VdP3TtbOzL9H/89O5ywf7S/oRKaqgOWkYhs3cfyjqz2boQk8nw
 N29sLzm5cH+APxNcju7sz07klp8dRNeImbmgj8mT1xId10mAixJ0NOY8udLhlwg1
 UfsYhP+Yvy9yMcoSZOs5+RjluW/E2qubP3RUt81ohUupdM0NVUJiR/I3Ri6ARb3V
-S2aAGtW4oS6PpyVT0dkWrlp8VqFpNTUKE95dNi5Og7kCDQRc8DnqARAArfHmi1u4
-195+bUEPiAnhjgSFW8wJ15R/W43U6qJZTPoosJHZQTTRBpLu/rkPXU6H3punG0lF
-7oeZCTS8ubVCBuKBmS76QIy3Rz/M7JYE4JUMpqFkm79rLOKavMaA26ehOdXZKMJM
-hUrhC2SjBR4D4iW32F8UJm8BIhYRrOPttZcLSOLVTvc7NV28yQ/V7aJsZHGGnj3g
-caSPSZ61iFCre9CT2Yv0HMTzBtrIv2IrZwlWpnFcPFq4vluzACVt0sjYyVKsf3CD
-om/L3WVcb3VkSGZnZFpBTur7+CKLRAQn5benA9BCMtyI595ww3+fb+8KXVl4nY81
-YyhdBfI1Il+kv2bhM+Jb3aLaQoCRoQ5nYuKVQmG5koSm334HEifwVp+MAjhyjwPl
-we+c8z49e3XFkfA/RjP7ILrCctn2xw3DnQAz8pyltzpNQhDSQ8ew0w8Jtnz0TLre
-LrUi9RTEpe8wQ0Wm3D69Z8PsxEY5ko5t0fdWsq0PVCpT/+D/F5IY3NxRVq0UNUO/
-0pZFJq06kqLkHDqJRjGthDTYKjXjmO6BOcZz7OuEywM0Pc+urtHR0zDgwEtQOgtJ
-eui6z1WBqECw5DO1kJ+885xXZykdp7DzlItJjHcqxv+togEbTb7heMXbFAKAirYt
-8DrF0blIYl3ouDeKna/CGiBCBYGBCirWqs8AEQEAAYkEcgQYAQoAJhYhBBTyZoLQ
-kWzdgeN7bWG3tSbZjwNTBQJc8DnqAhsCBQkDwmcAAkAJEGG3tSbZjwNTwXQgBBkB
-CgAdFiEECXsxMHeuYqAvhNpN8aZmj7t9Vy4FAlzwOeoACgkQ8aZmj7t9Vy6KUBAA
-ir/JmLeGjHNKANuVCVzEYoNpVyQ6jmQVErxRZvLel4HRtMxXcxaOIKqY3uvJDcrf
-XbobzjLFcJM1K/uQ4uxXHL4MHHlN1+Z4FqZ1fxnF4O/Zub4oqVlHQUaMmfdKIuA+
-Sun4ZZrM5lsog+yg643bSHRp4wLqa87ZHPyQZSMJZrv+NCcg0eQ38adueg5c7Cfx
-x/C23YyRvxdF77WVMHB3n2u5g17SFrM7DKCZxKC8zpGbydd64SXEx1UCJgpckt6P
-fj5Og038uAHdMPvZxdK2afvPxl2RopX5/zVzI9HpWLuVosggamq4EZKx6XmzSlvY
-8UXGtNmg0tmK3/HZbHjtXfRV2TzgViMQ0Rvvk6kYQSvBVFtNA4pEQ661eUbCIl7Y
-LUah/ocJJxN94vJvPyiguf6VJdwH+X/rzCrE97NZjF9swPjZi1MSQly8+9Fqi6Eo
-SPEBI/kS5PcrpPe26OyqDUr+sTcF6LSSs6dPFQJ1TV/0HXZleme0p6HBLPkumdC+
-vbBH3zIFGgpB9PZiLdcrtA2njpe3zNog91XDuoyfeA4PKJZIQYK2REXt7F0dn3Ih
-bbKh8WHPcz+2Mi+7z21EPAaIMRHyEGTxnaZxuaUzNDUl/5oJDliNlSRQ3v6zhU3U
-5PvJilZxXWlHxwOPKiHktFdMzC3eDmZK2JVt4ir2abOiABAAmroor1nbyryYCjMo
-t374nF5+Ki/J1dV+pZjgag5+G29DdJraYql37xvedPtva3AiUo+qkjFY/GR7sFZL
-axKFl+paSW1sBHVIft+Q543xjmDfIFvG8dAn8qhMedFvvgyuVo/i/gy+44Cf5e3T
-CsS3Y4o5IPr+MiOdep80W68d8e+1PJ/h9VfWx6w30nBEp69z7VkuM3uMg66/V6fm
-CvAO0ZCHLR9k6MhIsYp/Lrb32uenRqVGou4CEWftG7VmNBV+oP1UR8MISyM07Ghb
-3kBrsxW12hpDoUQEorSrW0KNnw9/agDIsZCjnLTfQP5wN3WVPAZSY+9ufPj9+o0A
-zopa9mO0ZU0k2UuWl3gD28CC8CgjXA41dJHnqxkqolds5Ih9LwCXMVaJJ/ojI+lT
-mjNUcsbJIBWq2tFbdyLgI54qxEvzlbiJIYKXm5hlwT3B6i1qRQ7RHS7+mLTsEnBN
-HmG+f0gN17Jit6oMxAMwX3IcJeD6gIYkAH/7W8eRIAFGxZsIRHIHfcTGOcOvvP+R
-Y6F8B2JnX4yk/Yg+0MRdy58prJKCkEBlgR4sCY2gPC2D6aKVIPcHtNMzXUhjV79S
-2rvQDP/wE4rrB/IiyY996H0Iehb4kBult05Sz6sf6CMcTY+WzwEMunUSgdU8ZVq+
-F9KVFsbqgXjmz6B0vY9MrMSj67u5Ag0EValA9AEQAK/z677fpoVUj4zQz0g60wVW
+S2aAGtW4oS6PpyVT0dkWrlp8VqFpNTUKE95dNi5Og7kCDQRgos3VARAAtSRABroy
+kqOO+3Zq3pehRGM2aft2djiigKhhVg+eJr+YffIU2Q73l9zniYSzVMkFVuJPd7Wk
+BnlEMIn8BUGh04op6MV+kzX0guu3v/9i/0agNS31xAdXzmf1i5sbQU1eRylyZRSi
+sM2iuF7BYrfSsOBHv71cf+iM94KxrzXiB1bDNL4DN0T5+vCoDjgHaXbten4Qdm6O
+djBCUv9Ix8dhT4OzHwHOUK7gomTrQM6Hyb0vgQsDXKV2Ps/pWOSk/J2cCrQUrafF
+qkVAAC3m6kaGU8te6YlAU7GFcf4MOPw15WTM2iaKWwPkwK9b/Ro/5RfZbqnde8EB
+AoFkg0X8mshGVDBtYCaW+1qUA3ZBcQzUvosYUsNQC9Nx8Y9/tkqCwIBUzsxuIrSY
+HxeqPThxSMvCmg2qHXmmbAxsbOz3DTOwKpWSRGOCTGFpsLBqWigjG+L+9iIx+7kr
+2gH8tYck1RPyQm04k9udD8wwXCvylTUzNVd876sN3o1xySaO5nz8JtM//xPPctFF
+MZmC01bBn+jRuapDqY+qTFL+eKherOUZgs3nHt7cEBz3m8neGg0/JhyBwS6sQF7h
+0ETBapVDlKCRuvAgJHIrjejL5v+kVRrH9L6ey5CAdRG9SbffsNwZoo5o8SrdGcX6
+hpFiqg1jZWvZv5x7/PPSW7fPuNNHsoxVRn8AEQEAAYkEcgQYAQoAJhYhBBTyZoLQ
+kWzdgeN7bWG3tSbZjwNTBQJgos3VAhsCBQkDwmcAAkAJEGG3tSbZjwNTwXQgBBkB
+CgAdFiEEQ2D+IQnEl2MYb44h6+QekPbxL20FAmCizdUACgkQ6+QekPbxL22N6w/+
+ObmFWpCr0dmV1tm+1tuCL05sJ031KFl3EkH389FmrMMoVk49e7H5Urn77ezQXO9M
+e8R0nZgVUavJdKcJzgf1IZtLq5Vq5q563I8gglr8rJaaefGYuv9jitx/Ca2s+uvJ
+MUHgMeBPmFFOKoIF8QgOJdkSht2lIkd6bd89ayLLoIXlGi8d6K4tEWeMigtds9FY
+cyX7o8xXmt9XqCIaMbkJtiUzjz63dN0O81UCj0TvK17KXAvclhzrriZuo2rOeDTB
+cQmKKy2UKZaJjUqiezuOg1t513ZIzhy1oXzg5CJb5jgsmZmjtJjr161fv5d8Yock
+j73z2/z47wry6ThESfYSkIxJIiIP5SwZyNMeeHSZUnaMTqzd5kDL5qnNrhJHCBBy
+xcIBcGppv3VjZ1QNU1k0Tx+MzpfZtbE//idw+Q7Iz9T/3zjN79JhYi1tzzaaQR6J
+oEiNMpHHkdkOGRwfdipM7oKl7HKl+zJCzaLTE4mbInCxSgn+1RhI+rGzTXVxqIKo
+nYrWra4EVBAgguMrxNMjuEtbsF54Q27x2+H/Mew+et6K/suqyh63Szfd14LWEj4N
+aR89tEz76nJyJFuFtDeGSmu68/Pi5S8Ls9MxKJJiIJmc3lQqDUTHEiLc7RtZAsgA
+WlLc6UnFsaCqXKJxuaMs7qFD7pqSGfHxYboBxax7Sqrttw//eC7rghiFzfcnEZQn
+6+GPW3FJc5P1diSLto99six3uaWKjvSnZScvPOe8ogJt1JQpQAABoHfd7HzzlGzJ
+tU/yDL931WD6nETp6b/dk7t3aUpk8WFMG19L+L9QbEpjxDi2wozO7CGg6FhC7mu+
+KsSsorLqd3QYKoBLG0Pb2K3Zz3PN7y17kf1Aixa2//prFNfpEGwP9flz2TUvSdtd
+9JvcnDz+/3yB63tmuCsUPZaR3lhTkNiXZG7WTALA1AqIUKFpxI+cOQxaO2+H6XXi
+ON3x8A2Pzd1mZyuUMPk2c6I/c1ZfzJXxF/WJVfuztZXNCGocYF4kB3X07uOuiKrI
+DMXDT3Op3wJ0RInpjyyPlwwov3zIVQcG3mfWPclXNcIRSAdadLq6yhTBUVbhMd2j
+2qga1vtaVlH/m0zFhib88RLf1/FiVX76D1q+anG+gT+SsMPd7hSGQQ2+6ngBAvx4
+T1IHtFgPqfNaA49m8b3aAorGo6Bbzmwh4Xr+7DM2fSskBskGdIPZgA4Vyu4/PC5a
+CTyd0NqlBgj/g7XRQMGvFRkdnEIcVZbvxdzn4j16dS+43dUzFMLKThRbkUaunaYo
+ZPIYuiqbwCoFX7vJdgBMaTxYfkClc5LJSVr+X+9RYNwlOn4kiQzKstVtl/qfpDow
+6QsGmA9J7v8Vt9JEg052REcZZmC5Ag0EValA9AEQAK/z677fpoVUj4zQz0g60wVW
 f+1y2lGb8iFYICmvrJyaEra5SRkyihYA1WmEzhN4T//tHw3UIfe646+GkY3eIQW2
 jY9DM2XaElmMN8k/v54nbn5oD7rNEyCTFTvCOq5d74HH1vw96Lzay1vy45E7jPWv
 qfg9Se8KAnzElohTJjizyhU+0QbmPHnQlY8gOkT/SvRo9bFEUnqjWh0fRq+K1tdL
@@ -313,5 +313,40 @@ NTwSHK/6YbtJbqoVwISJrGUuvOfBlkJZVlCzVsPG1+QZaPAL3HxVXavYgCu2hze4
 OOWUe2Xuqihw8hb+F1rhP64/QtpjPxgLLb1NIBpm6OgdZjRjCbl9xnd3RvH6hYxO
 +zgdn3icn2fFHhdZ7xtYcZZrg9QOXuv6LDvVe5I4VyszNs0jtdcx0P+T5VIrKFAY
 yf0CCuL/UQTRrW0SrKOV/RZHuvdpVYK3YIAyd49kKjLk6O9awFQy7cXq3PhjatBi
-=+4NK
+uQINBFzwOeoBEACt8eaLW7jX3n5tQQ+ICeGOBIVbzAnXlH9bjdTqollM+iiwkdlB
+NNEGku7+uQ9dTofem6cbSUXuh5kJNLy5tUIG4oGZLvpAjLdHP8zslgTglQymoWSb
+v2ss4pq8xoDbp6E51dkowkyFSuELZKMFHgPiJbfYXxQmbwEiFhGs4+21lwtI4tVO
+9zs1XbzJD9XtomxkcYaePeBxpI9JnrWIUKt70JPZi/QcxPMG2si/YitnCVamcVw8
+Wri+W7MAJW3SyNjJUqx/cIOib8vdZVxvdWRIZmdkWkFO6vv4IotEBCflt6cD0EIy
+3Ijn3nDDf59v7wpdWXidjzVjKF0F8jUiX6S/ZuEz4lvdotpCgJGhDmdi4pVCYbmS
+hKbffgcSJ/BWn4wCOHKPA+XB75zzPj17dcWR8D9GM/sgusJy2fbHDcOdADPynKW3
+Ok1CENJDx7DTDwm2fPRMut4utSL1FMSl7zBDRabcPr1nw+zERjmSjm3R91ayrQ9U
+KlP/4P8Xkhjc3FFWrRQ1Q7/SlkUmrTqSouQcOolGMa2ENNgqNeOY7oE5xnPs64TL
+AzQ9z66u0dHTMODAS1A6C0l66LrPVYGoQLDkM7WQn7zznFdnKR2nsPOUi0mMdyrG
+/62iARtNvuF4xdsUAoCKti3wOsXRuUhiXei4N4qdr8IaIEIFgYEKKtaqzwARAQAB
+iQRyBBgBCgAmFiEEFPJmgtCRbN2B43ttYbe1JtmPA1MFAlzwOeoCGwIFCQPCZwAC
+QAkQYbe1JtmPA1PBdCAEGQEKAB0WIQQJezEwd65ioC+E2k3xpmaPu31XLgUCXPA5
+6gAKCRDxpmaPu31XLopQEACKv8mYt4aMc0oA25UJXMRig2lXJDqOZBUSvFFm8t6X
+gdG0zFdzFo4gqpje68kNyt9duhvOMsVwkzUr+5Di7FccvgwceU3X5ngWpnV/GcXg
+79m5viipWUdBRoyZ90oi4D5K6fhlmszmWyiD7KDrjdtIdGnjAuprztkc/JBlIwlm
+u/40JyDR5Dfxp256DlzsJ/HH8LbdjJG/F0XvtZUwcHefa7mDXtIWszsMoJnEoLzO
+kZvJ13rhJcTHVQImClyS3o9+Pk6DTfy4Ad0w+9nF0rZp+8/GXZGilfn/NXMj0elY
+u5WiyCBqargRkrHpebNKW9jxRca02aDS2Yrf8dlseO1d9FXZPOBWIxDRG++TqRhB
+K8FUW00DikRDrrV5RsIiXtgtRqH+hwknE33i8m8/KKC5/pUl3Af5f+vMKsT3s1mM
+X2zA+NmLUxJCXLz70WqLoShI8QEj+RLk9yuk97bo7KoNSv6xNwXotJKzp08VAnVN
+X/QddmV6Z7SnocEs+S6Z0L69sEffMgUaCkH09mIt1yu0DaeOl7fM2iD3VcO6jJ94
+Dg8olkhBgrZERe3sXR2fciFtsqHxYc9zP7YyL7vPbUQ8BogxEfIQZPGdpnG5pTM0
+NSX/mgkOWI2VJFDe/rOFTdTk+8mKVnFdaUfHA48qIeS0V0zMLd4OZkrYlW3iKvZp
+s6IAEACauiivWdvKvJgKMyi3fvicXn4qL8nV1X6lmOBqDn4bb0N0mtpiqXfvG950
++29rcCJSj6qSMVj8ZHuwVktrEoWX6lpJbWwEdUh+35DnjfGOYN8gW8bx0CfyqEx5
+0W++DK5Wj+L+DL7jgJ/l7dMKxLdjijkg+v4yI516nzRbrx3x77U8n+H1V9bHrDfS
+cESnr3PtWS4ze4yDrr9Xp+YK8A7RkIctH2ToyEixin8utvfa56dGpUai7gIRZ+0b
+tWY0FX6g/VRHwwhLIzTsaFveQGuzFbXaGkOhRASitKtbQo2fD39qAMixkKOctN9A
+/nA3dZU8BlJj7258+P36jQDOilr2Y7RlTSTZS5aXeAPbwILwKCNcDjV0keerGSqi
+V2zkiH0vAJcxVokn+iMj6VOaM1RyxskgFara0Vt3IuAjnirES/OVuIkhgpebmGXB
+PcHqLWpFDtEdLv6YtOwScE0eYb5/SA3XsmK3qgzEAzBfchwl4PqAhiQAf/tbx5Eg
+AUbFmwhEcgd9xMY5w6+8/5FjoXwHYmdfjKT9iD7QxF3LnymskoKQQGWBHiwJjaA8
+LYPpopUg9we00zNdSGNXv1Lau9AM//ATiusH8iLJj33ofQh6FviQG6W3TlLPqx/o
+IxxNj5bPAQy6dRKB1TxlWr4X0pUWxuqBeObPoHS9j0ysxKPruw==
+=81zK
 -----END PGP PUBLIC KEY BLOCK-----
diff --git a/taskcluster/docker/ui-tests/Dockerfile b/taskcluster/docker/ui-tests/Dockerfile
index 023124c3a..c2393f89b 100644
--- a/taskcluster/docker/ui-tests/Dockerfile
+++ b/taskcluster/docker/ui-tests/Dockerfile
@@ -11,7 +11,7 @@ USER worker:worker
 
 ENV GOOGLE_SDK_DOWNLOAD ./gcloud.tar.gz
 ENV GOOGLE_SDK_VERSION 233
-ENV FLANK_VERSION v21.01.0
+ENV FLANK_VERSION v21.05.0
 
 ENV TEST_TOOLS /builds/worker/test-tools
 ENV PATH ${PATH}:${TEST_TOOLS}:${TEST_TOOLS}/google-cloud-sdk/bin
diff --git a/taskcluster/docker/visual-metrics/run-visual-metrics.py b/taskcluster/docker/visual-metrics/run-visual-metrics.py
index 698d66237..2593a0877 100755
--- a/taskcluster/docker/visual-metrics/run-visual-metrics.py
+++ b/taskcluster/docker/visual-metrics/run-visual-metrics.py
@@ -46,6 +46,9 @@ class Job:
     #: The extra options for this job.
     extra_options = attr.ib(type=str)
 
+    #: If true, we allow 0's in the vismet results
+    accept_zero_vismet = attr.ib(type=bool)
+
     #: json_path: The path to the ``browsertime.json`` file on disk.
     json_path = attr.ib(type=Path)
 
@@ -61,6 +64,7 @@ JOB_SCHEMA = Schema(
                 Required("test_name"): str,
                 Required("browsertime_json_path"): str,
                 Required("extra_options"): [str],
+                Required("accept_zero_vismet"): bool,
             }
         ],
         Required("application"): {Required("name"): str, "version": str},
@@ -185,7 +189,7 @@ def append_result(log, suites, test_name, name, result, extra_options):
             "replicates": [result],
             "lowerIsBetter": True,
             "unit": "ms",
-            "shouldAlert": SHOULD_ALERT[name],
+            "shouldAlert": SHOULD_ALERT.get(name, False),
         }
     else:
         subtests[name]["replicates"].append(result)
@@ -322,6 +326,7 @@ def main(log, args):
                         extra_options=len(job["extra_options"]) > 0
                         and job["extra_options"]
                         or jobs_json["extra_options"],
+                        accept_zero_vismet=job["accept_zero_vismet"],
                         json_path=browsertime_json_path,
                         video_path=browsertime_json_path.parent / video,
                         count=count,
@@ -420,18 +425,20 @@ def run_visual_metrics(job, visualmetrics_path, options):
         # Python 3.5 requires a str object (not 3.6+)
         res = json.loads(res.decode("utf8"))
 
-        # Ensure that none of these values are at 0 which
-        # is indicative of a failling test
-        monitored_tests = [
-            "contentfulspeedindex",
-            "lastvisualchange",
-            "perceptualspeedindex",
-            "speedindex",
-        ]
         failed_tests = []
-        for metric, val in res.items():
-            if metric.lower() in monitored_tests and val == 0:
-                failed_tests.append(metric)
+        if not job.accept_zero_vismet:
+            # Ensure that none of these values are at 0 which
+            # is indicative of a failling test
+            monitored_tests = [
+                "contentfulspeedindex",
+                "lastvisualchange",
+                "perceptualspeedindex",
+                "speedindex",
+            ]
+            for metric, val in res.items():
+                if metric.lower() in monitored_tests and val == 0:
+                    failed_tests.append(metric)
+
         if failed_tests:
             log.error(
                 "TEST-UNEXPECTED-FAIL | Some visual metrics have an erroneous value of 0."
diff --git a/taskcluster/fenix_taskgraph/job.py b/taskcluster/fenix_taskgraph/job.py
index a289a31d7..0f33ec5e4 100644
--- a/taskcluster/fenix_taskgraph/job.py
+++ b/taskcluster/fenix_taskgraph/job.py
@@ -99,7 +99,7 @@ def _extract_gradlew_command(run, fetches_dir):
         "-P{repo_name}Repo=file://{dir}/{repo_name}".format(
             dir=maven_dependencies_dir, repo_name=repo_name
         )
-        for repo_name in ("google", "jcenter")
+        for repo_name in ("google", "central")
     ]
     gradle_command = ["./gradlew"] + gradle_repos_args + ["listRepositories"] + run.pop("gradlew")
     post_gradle_commands = run.pop("post-gradlew", [])
diff --git a/taskcluster/fenix_taskgraph/transforms/build.py b/taskcluster/fenix_taskgraph/transforms/build.py
index b7abc9444..f0d2ba155 100644
--- a/taskcluster/fenix_taskgraph/transforms/build.py
+++ b/taskcluster/fenix_taskgraph/transforms/build.py
@@ -12,7 +12,6 @@ import datetime
 
 from taskgraph.transforms.base import TransformSequence
 from fenix_taskgraph.gradle import get_variant
-from fenix_taskgraph.util import upper_case_first_letter
 
 
 transforms = TransformSequence()
@@ -70,11 +69,19 @@ def build_gradle_command(config, tasks):
 
         task["run"]["gradlew"] = [
             "clean",
-            "assemble{}".format(upper_case_first_letter(variant_config["name"]))
+            "assemble{}".format(variant_config["name"].capitalize()),
         ]
 
         yield task
 
+@transforms.add
+def extra_gradle_options(config, tasks):
+    for task in tasks:
+        for extra in task["run"].pop("gradle-extra-options", []):
+            task["run"]["gradlew"].append(extra)
+
+        yield task
+
 @transforms.add
 def add_test_build_type(config, tasks):
     for task in tasks:
@@ -96,14 +103,11 @@ def add_disable_optimization(config, tasks):
 
 @transforms.add
 def add_nightly_version(config, tasks):
-    push_date_string = config.params["moz_build_date"]
-    push_date_time = datetime.datetime.strptime(push_date_string, "%Y%m%d%H%M%S")
-    formated_date_time = 'Nightly {}'.format(push_date_time.strftime('%y%m%d %H:%M'))
-
     for task in tasks:
         if task.pop("include-nightly-version", False):
             task["run"]["gradlew"].extend([
-                '-PversionName={}'.format(formated_date_time),
+                # We only set the `official` flag here. The actual version name will be determined
+                # by Gradle (depending on the Gecko/A-C version being used)
                 '-Pofficial'
             ])
         yield task
diff --git a/taskcluster/fenix_taskgraph/transforms/signing.py b/taskcluster/fenix_taskgraph/transforms/signing.py
index 428bde612..65d010049 100644
--- a/taskcluster/fenix_taskgraph/transforms/signing.py
+++ b/taskcluster/fenix_taskgraph/transforms/signing.py
@@ -18,7 +18,7 @@ transforms = TransformSequence()
 @transforms.add
 def resolve_keys(config, tasks):
     for task in tasks:
-        for key in ("run-on-tasks-for",):
+        for key in ("run-on-tasks-for", "signing-format", "notify"):
             resolve_keyed_by(
                 task,
                 key,
@@ -38,7 +38,7 @@ def set_worker_type(config, tasks):
         if (
             str(config.params["level"]) == "3"
             and task["attributes"]["build-type"]
-            in ("nightly", "beta", "release", "android-test-nightly")
+            in ("nightly", "beta", "release", "android-test-nightly", "beta-mozillaonline", "release-mozillaonline")
             and config.params["tasks_for"] in ("cron", "github-release", "action")
         ):
             worker_type = "signing"
@@ -56,7 +56,7 @@ def set_signing_type(config, tasks):
         ):
             if task["attributes"]["build-type"] in ("beta", "release"):
                 signing_type = "fennec-production-signing"
-            elif task["attributes"]["build-type"] in ("nightly", "android-test-nightly"):
+            elif task["attributes"]["build-type"] in ("nightly", "android-test-nightly", "beta-mozillaonline", "release-mozillaonline"):
                 signing_type = "production-signing"
         task.setdefault("worker", {})["signing-type"] = signing_type
         yield task
@@ -90,3 +90,17 @@ def set_signing_format(config, tasks):
         for upstream_artifact in task["worker"]["upstream-artifacts"]:
             upstream_artifact["formats"] = [signing_format]
         yield task
+
+
+@transforms.add
+def format_email(config, tasks):
+    version = config.params["version"]
+
+    for task in tasks:
+        if "notify" in task:
+            email = task["notify"].get("email")
+            if email:
+                email["subject"] = email["subject"].format(version=version)
+                email["content"] = email["content"].format(version=version)
+
+        yield task
diff --git a/taskcluster/fenix_taskgraph/util.py b/taskcluster/fenix_taskgraph/util.py
deleted file mode 100644
index d613fc2f7..000000000
--- a/taskcluster/fenix_taskgraph/util.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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/.
-
-from __future__ import absolute_import, print_function, unicode_literals
-
-import re
-
-
-def upper_case_first_letter(string):
-    return string[0].upper() + string[1:]
diff --git a/taskcluster/scripts/toolchain/android-gradle-dependencies.sh b/taskcluster/scripts/toolchain/android-gradle-dependencies.sh
index 7117fe288..90777def3 100755
--- a/taskcluster/scripts/toolchain/android-gradle-dependencies.sh
+++ b/taskcluster/scripts/toolchain/android-gradle-dependencies.sh
@@ -19,7 +19,7 @@ pushd $PROJECT_DIR
 . taskcluster/scripts/toolchain/android-gradle-dependencies/before.sh
 
 NEXUS_PREFIX='http://localhost:8081/nexus/content/repositories'
-GRADLE_ARGS="--parallel -PgoogleRepo=$NEXUS_PREFIX/google/ -PjcenterRepo=$NEXUS_PREFIX/jcenter/ -PcentralRepo=$NEXUS_PREFIX/central/"
+GRADLE_ARGS="--parallel -PgoogleRepo=$NEXUS_PREFIX/google/ -PcentralRepo=$NEXUS_PREFIX/central/"
 # We build everything to be sure to fetch all dependencies
 ./gradlew $GRADLE_ARGS assemble assembleAndroidTest testClasses ktlint detekt
 # Some tests may be flaky, although they still download dependencies. So we let the following
diff --git a/taskcluster/scripts/toolchain/android-gradle-dependencies/after.sh b/taskcluster/scripts/toolchain/android-gradle-dependencies/after.sh
index eed8d01fb..0dc8cc208 100644
--- a/taskcluster/scripts/toolchain/android-gradle-dependencies/after.sh
+++ b/taskcluster/scripts/toolchain/android-gradle-dependencies/after.sh
@@ -20,7 +20,6 @@ set -v
 pushd $WORKSPACE
 mkdir -p android-gradle-dependencies /builds/worker/artifacts
 
-cp -R ${NEXUS_WORK}/storage/jcenter android-gradle-dependencies
 cp -R ${NEXUS_WORK}/storage/google android-gradle-dependencies
 cp -R ${NEXUS_WORK}/storage/central android-gradle-dependencies
 
diff --git a/taskcluster/scripts/toolchain/android-gradle-dependencies/nexus.xml b/taskcluster/scripts/toolchain/android-gradle-dependencies/nexus.xml
index 2b40bedf3..64e4c9633 100644
--- a/taskcluster/scripts/toolchain/android-gradle-dependencies/nexus.xml
+++ b/taskcluster/scripts/toolchain/android-gradle-dependencies/nexus.xml
@@ -23,37 +23,6 @@
     <resolveLinks>true</resolveLinks>
   </routing>
   <repositories>
-    <repository>
-      <id>jcenter</id>
-      <name>jcenter</name>
-      <providerRole>org.sonatype.nexus.proxy.repository.Repository</providerRole>
-      <providerHint>maven2</providerHint>
-      <localStatus>IN_SERVICE</localStatus>
-      <notFoundCacheActive>true</notFoundCacheActive>
-      <notFoundCacheTTL>1440</notFoundCacheTTL>
-      <userManaged>true</userManaged>
-      <exposed>true</exposed>
-      <browseable>true</browseable>
-      <writePolicy>READ_ONLY</writePolicy>
-      <indexable>true</indexable>
-      <searchable>true</searchable>
-      <localStorage>
-        <provider>file</provider>
-      </localStorage>
-      <remoteStorage>
-        <url>https://jcenter.bintray.com/</url>
-      </remoteStorage>
-      <externalConfiguration>
-        <repositoryPolicy>RELEASE</repositoryPolicy>
-        <checksumPolicy>STRICT</checksumPolicy>
-        <fileTypeValidation>true</fileTypeValidation>
-        <downloadRemoteIndex>false</downloadRemoteIndex>
-        <artifactMaxAge>-1</artifactMaxAge>
-        <metadataMaxAge>1440</metadataMaxAge>
-        <itemMaxAge>1440</itemMaxAge>
-        <autoBlockActive>true</autoBlockActive>
-      </externalConfiguration>
-    </repository>
     <repository>
       <id>gradle-plugins</id>
       <name>Gradle Plugins</name>
diff --git a/version.txt b/version.txt
index 8035b554e..746cbd417 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-89.1.1
+90.1.2