diff --git a/.github/ISSUE_TEMPLATE/---bug-report.md b/.github/ISSUE_TEMPLATE/---bug-report.md
index b9d0ec5da..e27d73793 100644
--- a/.github/ISSUE_TEMPLATE/---bug-report.md
+++ b/.github/ISSUE_TEMPLATE/---bug-report.md
@@ -18,6 +18,6 @@ assignees: ''
 
 ### Device information
 
-* Android device: ?
-* Fenix version: ?
+* Device vendor / model and Android version: ?
+* Firefox for Android version: ? (go to Settings -> About Firefox)
  
diff --git a/.github/stale.yml b/.github/stale.yml
new file mode 100644
index 000000000..64e7e858f
--- /dev/null
+++ b/.github/stale.yml
@@ -0,0 +1,62 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 180
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 7
+
+# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
+onlyLabels: []
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - pin
+  - "feature request 🌟"
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: false
+
+# Label to use when marking as stale
+staleLabel: wontfix
+
+# Comment to post when marking as stale. Set to `false` to disable
+markComment: >
+  See: https://github.com/mozilla-mobile/fenix/issues/17373
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions. 
+
+# Comment to post when removing the stale label.
+# unmarkComment: >
+#   Your comment here.
+
+# Comment to post when closing a stale Issue or Pull Request.
+# closeComment: >
+#   Your comment here.
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+# Limit to only `issues` or `pulls`
+only: issues
+
+# Optionally, specify configuration settings that are specific to just 'issues' or 'pulls':
+# pulls:
+#   daysUntilStale: 30
+#   markComment: >
+#     This pull request has been automatically marked as stale because it has not had
+#     recent activity. It will be closed if no further activity occurs. Thank you
+#     for your contributions.
+
+issues:
+   exemptLabels:
+     - pin
+     - "feature request 🌟"
diff --git a/.github/workflows/build-contributor-pr.yml b/.github/workflows/build-contributor-pr.yml
new file mode 100644
index 000000000..b966cb796
--- /dev/null
+++ b/.github/workflows/build-contributor-pr.yml
@@ -0,0 +1,103 @@
+name: Android build PR
+on: [pull_request]
+jobs:
+  run-build:
+    runs-on: ubuntu-20.04
+    if: github.event.pull_request.head.repo.full_name != github.repository
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+      - name: Setup Java
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: "Clean & Assemble Debug"
+        uses: eskatos/gradle-command-action@v1
+        with:
+          wrapper-cache-enabled: true
+          dependencies-cache-enabled: true
+          configuration-cache-enabled: true
+          arguments: clean app:assembleDebug
+
+  run-testDebugUnitTest:
+    runs-on: ubuntu-20.04
+    if: github.event.pull_request.head.repo.full_name != github.repository
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+      - name: Setup Java
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: "Test Debug Unit Tests"
+        uses: eskatos/gradle-command-action@v1
+        with:
+          wrapper-cache-enabled: true
+          dependencies-cache-enabled: true
+          configuration-cache-enabled: true
+          arguments: testDebugUnitTest
+
+  run-detekt:
+    runs-on: ubuntu-20.04
+    if: github.event.pull_request.head.repo.full_name != github.repository
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+      - name: Setup Java
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: "Detekt"
+        uses: eskatos/gradle-command-action@v1
+        with:
+          wrapper-cache-enabled: true
+          dependencies-cache-enabled: true
+          configuration-cache-enabled: true
+          arguments: detekt
+      - name: Archive detekt results
+        uses: actions/upload-artifact@v2
+        with:
+          name: detekt report
+          path: build/reports/detekt.html
+
+  run-ktlint:
+    runs-on: ubuntu-20.04
+    if: github.event.pull_request.head.repo.full_name != github.repository
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+      - name: Setup Java
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: "Ktlint"
+        uses: eskatos/gradle-command-action@v1
+        with:
+          wrapper-cache-enabled: true
+          dependencies-cache-enabled: true
+          configuration-cache-enabled: true
+          arguments: ktlint
+
+  run-lintDebug:
+    runs-on: ubuntu-20.04
+    if: github.event.pull_request.head.repo.full_name != github.repository
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+      - name: Setup Java
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: "Lint Debug"
+        uses: eskatos/gradle-command-action@v1
+        with:
+          wrapper-cache-enabled: true
+          dependencies-cache-enabled: true
+          configuration-cache-enabled: true
+          arguments: lintDebug
+      - name: Archive lint results
+        uses: actions/upload-artifact@v2
+        with:
+          name: lintDebug report
+          path: app/build/reports/lint-results-debug.html
+
diff --git a/.mergify.yml b/.mergify.yml
index 1028efadc..21382057c 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -21,7 +21,7 @@ pull_request_rules:
     conditions:
       - author=mozilla-l10n-automation-bot
       - status-success=pr-complete
-      - files~=(strings.xml)
+      - files~=(strings.xml|l10n.toml)
     actions:
       review:
         type: APPROVE
diff --git a/.taskcluster.yml b/.taskcluster.yml
index 4ee1f0b8c..2e71a5c7b 100644
--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@@ -103,7 +103,7 @@ tasks:
               $if: >
                 tasks_for in ["action", "cron"]
                 || (tasks_for == "github-pull-request" && pullRequestAction in ["opened", "reopened", "synchronize"])
-                || (tasks_for == "github-push" && head_branch[:10] != "refs/tags/") && (head_branch != "staging.tmp") && (head_branch != "trying.tmp")
+                || (tasks_for == "github-push" && head_branch[:10] != "refs/tags/") && (head_branch != "staging.tmp") && (head_branch != "trying.tmp") && (head_branch[:8] != "mergify/")
                 || (tasks_for == "github-release" && releaseAction == "published" && (ownerEmail != "mozilla-release-automation-bot@users.noreply.github.com") && (ownerEmail != "mozilla-release-automation-bot-staging@users.noreply.github.com"))
               then:
                   $let:
@@ -166,7 +166,7 @@ tasks:
                           routes:
                               $flattenDeep:
                                   - checks
-                                  - $if: 'level == "3"'
+                                  - $if: 'level == "3" || repoUrl == "https://github.com/mozilla-releng/staging-fenix"'
                                     then:
                                         - tc-treeherder.v2.${project}.${head_sha}
                                         # TODO Bug 1601928: Make this scope fork-friendly once ${project} is better defined. This will enable
diff --git a/app/build.gradle b/app/build.gradle
index dc1be5113..13507c0b3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -41,12 +41,25 @@ android {
         buildConfigField "String", "AMO_BASE_URL", "\"https://addons.mozilla.org\""
         buildConfigField "String", "AMO_COLLECTION_NAME", "\"7dfae8669acc4312a65e8ba5553036\""
         buildConfigField "String", "AMO_COLLECTION_USER", "\"mozilla\""
+        // These add-ons should be excluded for Mozilla Online builds.
+        buildConfigField "String[]", "MOZILLA_ONLINE_ADDON_EXCLUSIONS",
+                "{" +
+                        "\"uBlock0@raymondhill.net\"," +
+                        "\"firefox@ghostery.com\"," +
+                        "\"jid1-MnnxcxisBPnSXQ@jetpack\"," +
+                        "\"adguardadblocker@adguard.com\"," +
+                        "\"foxyproxy@eric.h.jung\"," +
+                        "\"{73a6fe31-595d-460b-a920-fcc0f8843232}\"," +
+                        "\"jid1-BoFifL9Vbdl2zQ@jetpack\"," +
+                        "\"woop-NoopscooPsnSXQ@jetpack\"" +
+                "}"
         // This should be the base URL used to call the AMO API.
         buildConfigField "String", "AMO_SERVER_URL", "\"https://services.addons.mozilla.org\""
         def deepLinkSchemeValue = "fenix-dev"
         buildConfigField "String", "DEEP_LINK_SCHEME", "\"$deepLinkSchemeValue\""
         manifestPlaceholders = [
-                "deepLinkScheme": deepLinkSchemeValue
+                "deepLinkScheme": deepLinkSchemeValue,
+                "requestLegacyExternalStorage": true
         ]
 
         // Build flag for "Mozilla Online" variants. See `Config.isMozillaOnline`.
@@ -81,13 +94,19 @@ android {
             applicationIdSuffix ".fenix.debug"
             resValue "bool", "IS_DEBUG", "true"
             pseudoLocalesEnabled true
+            def deepLinkSchemeValue = "fenix-dev"
+            buildConfigField "String", "DEEP_LINK_SCHEME", "\"$deepLinkSchemeValue\""
+            manifestPlaceholders = [
+                    "deepLinkScheme": deepLinkSchemeValue,
+                    "requestLegacyExternalStorage": false
+            ]
         }
         nightly releaseTemplate >> {
             applicationIdSuffix ".fenix"
             buildConfigField "boolean", "USE_RELEASE_VERSIONING", "true"
             def deepLinkSchemeValue = "fenix-nightly"
             buildConfigField "String", "DEEP_LINK_SCHEME", "\"$deepLinkSchemeValue\""
-            manifestPlaceholders = ["deepLinkScheme": deepLinkSchemeValue]
+            manifestPlaceholders = ["deepLinkScheme": deepLinkSchemeValue, "requestLegacyExternalStorage": false]
         }
         beta releaseTemplate >> {
             buildConfigField "boolean", "USE_RELEASE_VERSIONING", "true"
@@ -103,7 +122,8 @@ android {
                     //  - https://issuetracker.google.com/issues/36924841
                     //  - https://issuetracker.google.com/issues/36905922
                     "sharedUserId": "org.mozilla.firefox.sharedID",
-                    "deepLinkScheme": deepLinkSchemeValue
+                    "deepLinkScheme": deepLinkSchemeValue,
+                    "requestLegacyExternalStorage": true
             ]
         }
         release releaseTemplate >> {
@@ -120,7 +140,8 @@ android {
                     //  - https://issuetracker.google.com/issues/36924841
                     //  - https://issuetracker.google.com/issues/36905922
                     "sharedUserId": "org.mozilla.firefox.sharedID",
-                    "deepLinkScheme": deepLinkSchemeValue
+                    "deepLinkScheme": deepLinkSchemeValue,
+                    "requestLegacyExternalStorage": true
             ]
         }
         forkDebug {
@@ -398,6 +419,16 @@ android.applicationVariants.all { variant ->
         buildConfigField 'String', 'NIMBUS_ENDPOINT', 'null'
         println("--")
     }
+
+// -------------------------------------------------------------------------------------------------
+// BuildConfig: Set flag for official builds; similar to MOZILLA_OFFICIAL in mozilla-central.
+// -------------------------------------------------------------------------------------------------
+
+    if (project.hasProperty("official") || gradle.hasProperty("localProperties.official")) {
+        buildConfigField 'Boolean', 'MOZILLA_OFFICIAL', 'true'
+    } else {
+        buildConfigField 'Boolean', 'MOZILLA_OFFICIAL', 'false'
+    }
 }
 
 androidExtensions {
@@ -507,6 +538,7 @@ dependencies {
     implementation Deps.mozilla_feature_top_sites
     implementation Deps.mozilla_feature_share
     implementation Deps.mozilla_feature_accounts_push
+    implementation Deps.mozilla_feature_webauthn
     implementation Deps.mozilla_feature_webcompat
     implementation Deps.mozilla_feature_webnotifications
     implementation Deps.mozilla_feature_webcompat_reporter
diff --git a/app/metrics.yaml b/app/metrics.yaml
index 5291a91ca..d2c763aca 100644
--- a/app/metrics.yaml
+++ b/app/metrics.yaml
@@ -234,6 +234,25 @@ events:
     notification_emails:
       - fenix-core@mozilla.com
     expires: "2021-08-01"
+  normal_and_private_uri_count:
+    type: counter
+    description: |
+      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.
+    send_in_pings:
+      - metrics
+    bugs:
+      - https://github.com/mozilla-mobile/fenix/issues/17089
+    data_reviews:
+      - https://github.com/mozilla-mobile/fenix/pull/17935
+    data_sensitivity:
+      - interaction
+    notification_emails:
+      - fenix-core@mozilla.com
+    expires: "2022-08-01"
   preference_toggled:
     type: event
     description: |
@@ -623,7 +642,7 @@ login_dialog:
       - interaction
     notification_emails:
       - fenix-core@mozilla.com
-    expires: "2021-02-01"
+    expires: "2021-08-01"
   cancelled:
     type: event
     description: |
@@ -636,7 +655,7 @@ login_dialog:
       - interaction
     notification_emails:
       - fenix-core@mozilla.com
-    expires: "2021-02-01"
+    expires: "2021-08-01"
   saved:
     type: event
     description: |
@@ -649,7 +668,7 @@ login_dialog:
       - interaction
     notification_emails:
       - fenix-core@mozilla.com
-    expires: "2021-02-01"
+    expires: "2021-08-01"
   never_save:
     type: event
     description: |
@@ -662,7 +681,7 @@ login_dialog:
       - interaction
     notification_emails:
       - fenix-core@mozilla.com
-    expires: "2021-02-01"
+    expires: "2021-08-01"
 
 find_in_page:
   opened:
@@ -3859,14 +3878,21 @@ addons:
     expires: "2021-04-01"
 
 startup.timeline:
-  framework_start:
+  framework_primary:
     send_in_pings:
       - startup-timeline
     type: timespan
-    time_unit: nanosecond
+    time_unit: millisecond
     description: |
       The duration the Android framework takes to start before letting us run
-      code in `*Application.init`. This is calculated from `appInitTimestamp -
+      code in `*Application.init` when this device has `clock_ticks_per_second`
+      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
@@ -3876,9 +3902,30 @@ startup.timeline:
       devices, is also reported as a metric
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/8803
+      - https://github.com/mozilla-mobile/fenix/issues/17972
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/9788#pullrequestreview-394228626
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
+      - https://github.com/mozilla-mobile/fenix/pull/18043#issue-575389284
+    data_sensitivity:
+      - technical
+    notification_emails:
+      - perf-android-fe@mozilla.com
+      - mcomella@mozilla.com
+    expires: "2021-08-01"
+  framework_secondary:
+    send_in_pings:
+      - startup-timeline
+    type: timespan
+    time_unit: millisecond
+    description: |
+      The duration the Android framework takes to start before letting us run
+      code in `*Application.init` when this device has `clock_ticks_per_second`
+      not equal to 100. For more details on this metric, see `framework_primary`
+    bugs:
+      - https://github.com/mozilla-mobile/fenix/issues/17972
+    data_reviews:
+      - https://github.com/mozilla-mobile/fenix/pull/18043#issue-575389284
     data_sensitivity:
       - technical
     notification_emails:
@@ -3890,9 +3937,9 @@ startup.timeline:
       - startup-timeline
     type: boolean
     description: |
-      An error when attempting to record `framework_start` - the application
-      init timestamp returned a negative value - which is likely indicative of a
-      bug in the implementation.
+      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.
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/8803
     data_reviews:
@@ -3943,6 +3990,38 @@ startup.timeline:
       - mcomella@mozilla.com
     expires: "2021-08-01"
 
+perf.startup:
+  application_on_create:
+    type: timing_distribution
+    time_unit: millisecond
+    description: |
+      The duration of `FenixApplication.onCreate` in the main process.
+    bugs:
+      - https://github.com/mozilla-mobile/fenix/issues/17969
+    data_reviews:
+      - https://github.com/mozilla-mobile/fenix/pull/17973#issue-572183889
+    data_sensitivity:
+      - technical
+    notification_emails:
+      - perf-android-fe@mozilla.com
+      - mcomella@mozilla.com
+    expires: "2021-08-11"
+  home_activity_on_create:
+    type: timing_distribution
+    time_unit: millisecond
+    description: |
+      The duration of `HomeActivity.onCreate`.
+    bugs:
+      - https://github.com/mozilla-mobile/fenix/issues/17969
+    data_reviews:
+      - https://github.com/mozilla-mobile/fenix/pull/17973#issue-572183889
+    data_sensitivity:
+      - technical
+    notification_emails:
+      - perf-android-fe@mozilla.com
+      - mcomella@mozilla.com
+    expires: "2021-08-11"
+
 perf.awesomebar:
   history_suggestions:
     send_in_pings:
@@ -4083,7 +4162,7 @@ autoplay:
       - interaction
     notification_emails:
       - fenix-core@mozilla.com
-    expires: "2021-02-01"
+    expires: "2021-08-01"
   setting_changed:
     type: event
     description: |
@@ -4102,7 +4181,7 @@ autoplay:
       - interaction
     notification_emails:
       - fenix-core@mozilla.com
-    expires: "2021-02-01"
+    expires: "2021-08-01"
 
 storage.stats:
   query_stats_duration:
@@ -4308,6 +4387,47 @@ tabs:
       - fenix-core@mozilla.com
     expires: "2021-08-01"
 
+banner_open_in_app:
+  displayed:
+    type: event
+    description: |
+      Open in App banner was shown.
+    bugs:
+      - https://github.com/mozilla-mobile/fenix/issues/16828
+    data_reviews:
+      - https://github.com/mozilla-mobile/fenix/pull/17049
+    data_sensitivity:
+      - interaction
+    notification_emails:
+      - fenix-core@mozilla.com
+    expires: "2021-08-01"
+  dismissed:
+    type: event
+    description: |
+      User tapped 'dismiss' on Open in App banner.
+    bugs:
+      - https://github.com/mozilla-mobile/fenix/issues/16828
+    data_reviews:
+      - https://github.com/mozilla-mobile/fenix/pull/17049
+    data_sensitivity:
+      - interaction
+    notification_emails:
+      - fenix-core@mozilla.com
+    expires: "2021-08-01"
+  go_to_settings:
+    type: event
+    description: |
+      User tapped 'go to settings' on Open in App banner.
+    bugs:
+      - https://github.com/mozilla-mobile/fenix/issues/16828
+    data_reviews:
+      - https://github.com/mozilla-mobile/fenix/pull/17049
+    data_sensitivity:
+      - interaction
+    notification_emails:
+      - fenix-core@mozilla.com
+    expires: "2021-08-01"
+
 contextual_menu:
   copy_tapped:
     type: event
@@ -4361,3 +4481,156 @@ contextual_menu:
     notification_emails:
       - fenix-core@mozilla.com
     expires: "2021-06-01"
+
+engine:
+  tab_kills:
+    type: labeled_counter
+    labels:
+      - foreground
+      - background
+    description: |
+      How often was the content process of a foreground (selected) or
+      background tab killed.
+    bugs:
+      - https://github.com/mozilla-mobile/android-components/issues/9366
+    data_reviews:
+      - https://github.com/mozilla-mobile/fenix/pull/17864
+    data_sensitivity:
+      - technical
+    notification_emails:
+      - fenix-core@mozilla.com
+      - skaspari@mozilla.com
+    expires: "2021-12-31"
+  kill_foreground_age:
+    type: timespan
+    time_unit: millisecond
+    description: |
+      Measures the age of the engine session of a foreground (selected) tab
+      at the time its content process got killed.
+    bugs:
+      - https://github.com/mozilla-mobile/android-components/issues/9366
+    data_reviews:
+      - TBD
+    data_sensitivity:
+      - technical
+    notification_emails:
+      - fenix-core@mozilla.com
+      - skaspari@mozilla.com
+    expires: "2021-12-31"
+  kill_background_age:
+    type: timespan
+    time_unit: millisecond
+    description: |
+      Measures the age of the engine session of a background tab at the
+      time its content process got killed.
+    bugs:
+      - https://github.com/mozilla-mobile/android-components/issues/9366
+    data_reviews:
+      - https://github.com/mozilla-mobile/fenix/pull/17864
+    data_sensitivity:
+      - technical
+    notification_emails:
+      - fenix-core@mozilla.com
+      - skaspari@mozilla.com
+    expires: "2021-12-31"
+
+android_keystore_experiment:
+  experiment_failure:
+    type: event
+    description: |
+      Records an instance of an unexpected failure during the experiment
+    extra_keys:
+      failure_exception:
+        description: |
+          Exception class associated with an unexpected failure of this
+          experiment, not caught by the other failure handlers.
+    bugs:
+      - https://github.com/mozilla-mobile/fenix/issues/17869
+    data_reviews:
+      - https://github.com/mozilla-mobile/fenix/pull/18333#pullrequestreview-612447395
+    data_sensitivity:
+      - technical
+    notification_emails:
+      - fenix-core@mozilla.com
+    expires: "2021-09-01"
+  get_failure:
+    type: event
+    description: |
+      Unexpected failure when trying to read from secure prefs.
+    extra_keys:
+      failure_exception:
+        description: |
+          Exception class associated with an unexpected failure of this
+          experiment.
+    bugs:
+      - https://github.com/mozilla-mobile/fenix/issues/17869
+    data_reviews:
+      - https://github.com/mozilla-mobile/fenix/pull/18333#pullrequestreview-612447395
+    data_sensitivity:
+      - technical
+    notification_emails:
+      - fenix-core@mozilla.com
+    expires: "2021-09-01"
+  get_result:
+    type: event
+    description: |
+      Success when trying to read from secure prefs.
+    extra_keys:
+      result:
+        description: |
+          Result code identifying whether the read operation returned the
+          expected value or not.
+    bugs:
+      - https://github.com/mozilla-mobile/fenix/issues/17869
+    data_reviews:
+      - https://github.com/mozilla-mobile/fenix/pull/18333#pullrequestreview-612447395
+    data_sensitivity:
+      - technical
+    notification_emails:
+      - fenix-core@mozilla.com
+    expires: "2021-09-01"
+  write_failure:
+    type: event
+    description: |
+      Unexpected failure when trying to write to secure prefs.
+    extra_keys:
+      failure_exception:
+        description: |
+          Exception class associated with an unexpected failure of this
+          experiment.
+    bugs:
+      - https://github.com/mozilla-mobile/fenix/issues/17869
+    data_reviews:
+      - https://github.com/mozilla-mobile/fenix/pull/18333#pullrequestreview-612447395
+    data_sensitivity:
+      - technical
+    notification_emails:
+      - fenix-core@mozilla.com
+    expires: "2021-09-01"
+  write_success:
+    type: event
+    description: |
+      Success in writing to secure prefs.
+    bugs:
+      - https://github.com/mozilla-mobile/fenix/issues/17869
+    data_reviews:
+      - https://github.com/mozilla-mobile/fenix/pull/18333#pullrequestreview-612447395
+    data_sensitivity:
+      - technical
+    notification_emails:
+      - fenix-core@mozilla.com
+    expires: "2021-09-01"
+  reset:
+    type: event
+    description: |
+      An experiment failed, and was reset to run again in the future from a
+      blank state.
+    bugs:
+      - https://github.com/mozilla-mobile/fenix/issues/17869
+    data_reviews:
+      - https://github.com/mozilla-mobile/fenix/pull/18333#pullrequestreview-612447395
+    data_sensitivity:
+      - technical
+    notification_emails:
+      - fenix-core@mozilla.com
+    expires: "2021-09-01"
diff --git a/app/pings.yaml b/app/pings.yaml
index ae1474c71..bd726ff12 100644
--- a/app/pings.yaml
+++ b/app/pings.yaml
@@ -12,8 +12,8 @@ activation:
     an hashed version of the Google Advertising ID.
   include_client_id: false
   bugs:
-    - 1538011
-    - 1501822
+    - https://bugzilla.mozilla.com/1538011/
+    - https://bugzilla.mozilla.com/1501822/
   data_reviews:
     - https://github.com/mozilla-mobile/fenix/pull/1707#issuecomment-486972209
   notification_emails:
@@ -35,14 +35,19 @@ startup-timeline:
   description: |
     This ping is intended to provide an understanding of startup performance.
 
-    The ping is intended to be captured by performance testing automation to
-    report results there, in addition to user telemetry. We place these metrics
-    into their own ping in order to isolate them and make this process easier.
-  include_client_id: false
+    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
+  include_client_id: true
   bugs:
     - https://github.com/mozilla-mobile/fenix/issues/8803
+    - https://github.com/mozilla-mobile/fenix/issues/17972
   data_reviews:
     - https://github.com/mozilla-mobile/fenix/pull/9788#pullrequestreview-394228626
+    - https://github.com/mozilla-mobile/fenix/pull/18043#issue-575389284
   notification_emails:
     - perf-android-fe@mozilla.com
-    - esmyth@mozilla.com
+    - mcomella@mozilla.com
diff --git a/app/src/androidTest/assets/pages/trackingPage.html b/app/src/androidTest/assets/pages/trackingPage.html
index 1a0d735a6..a0a53c954 100644
--- a/app/src/androidTest/assets/pages/trackingPage.html
+++ b/app/src/androidTest/assets/pages/trackingPage.html
@@ -9,5 +9,71 @@
   </head>
   <body>
     <iframe src="http://trackertest.org/"></iframe>
+
+    <h3>Level 1 (Basic) List</h3>
+    <p>social-track-digest256:</p>
+    <img
+            src="https://social-track-digest256.dummytracker.org/test_not_blocked.png"
+            onerror="this.onerror=null;this.src='https://not-a-tracker.dummytracker.org/test_blocked.png'">
+    <br/>
+    <p>ads-track-digest256:</p>
+    <img
+            src="https://ads-track-digest256.dummytracker.org/test_not_blocked.png"
+            onerror="this.onerror=null;this.src='https://not-a-tracker.dummytracker.org/test_blocked.png'">
+    <br/>
+    <p>analytics-track-digest256:</p>
+    <img
+            src="https://analytics-track-digest256.dummytracker.org/test_not_blocked.png"
+            onerror="this.onerror=null;this.src='https://not-a-tracker.dummytracker.org/test_blocked.png'">
+    <br/>
+    <p>Fingerprinting:
+    <pre id="result">test not run</pre>
+    <script src="https://base-fingerprinting-track-digest256.dummytracker.org/tracker.js"
+            onerror="this.onerror=null;var result=document.getElementById('result');result.innerHTML='blocked';"
+            onload="this.onload=null;var result=document.getElementById('result');result.innerHTML='NOT blocked';"
+    ></script>
+    </p>
+    <br/>
+    <p>Cryptomining:
+      <img
+              src="https://base-cryptomining-track-digest256.dummytracker.org/test_not_blocked.png" alt="not blocked"
+              onerror="this.onerror=null;this.src='https://not-a-tracker.dummytracker.org/test_blocked.png';this.alt='blocked'">
+    </p>
+
+    <p><b>Cookie blocking</b>
+    </p>
+    <iframe height=0 width=0 src="https://social-tracking-protection-facebook-digest256.dummytracker.org/cookie_access_test.html?test_origin=senglehardt.com"></iframe>
+    <iframe height=0 width=0 src="https://social-tracking-protection-linkedin-digest256.dummytracker.org/cookie_access_test.html?test_origin=senglehardt.com"></iframe>
+    <iframe height=0 width=0 src="https://social-tracking-protection-twitter-digest256.dummytracker.org/cookie_access_test.html?test_origin=senglehardt.com"></iframe>
+    <p>
+      * Facebook-cookies <pre id="social-tracking-protection-facebook-digest256"></pre>
+    * LinkedIn-cookies <pre id="social-tracking-protection-linkedin-digest256"></pre>
+    * Twitter-cookies <pre id="social-tracking-protection-twitter-digest256"></pre>
+    </p>
+
+    <script>
+      function updateCookieStatus(statusMessage, list) {
+          var output = document.getElementById(list);
+          if (statusMessage === 'cookies') {
+            output.innerHTML = "Cookies not blocked";
+          } else if (statusMessage === 'no_cookies') {
+            output.innerHTML = "Blocked";
+          } else {
+            output.innerHTML = "Unrecognized status";
+          }
+      }
+      window.addEventListener("message", event => {
+        lists = [
+          'social-tracking-protection-facebook-digest256',
+          'social-tracking-protection-linkedin-digest256',
+          'social-tracking-protection-twitter-digest256'
+        ];
+        lists.forEach(list => {
+          if (event.origin === `https://${list}.dummytracker.org`) {
+            updateCookieStatus(event.data, list);
+          }
+        });
+      }, false);
+  </script>
   </body>
 </html>
diff --git a/app/src/androidTest/java/org/mozilla/fenix/glean/BaselinePingTest.kt b/app/src/androidTest/java/org/mozilla/fenix/glean/BaselinePingTest.kt
index afcc8d50e..c3a26ae21 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/glean/BaselinePingTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/glean/BaselinePingTest.kt
@@ -152,7 +152,7 @@ class BaselinePingTest {
             .click()
 
         // Validate the received data.
-        val baselinePing = waitForPingContent("baseline", "background")!!
+        val baselinePing = waitForPingContent("baseline", "inactive")!!
 
         val metrics = baselinePing.getJSONObject("metrics")
 
diff --git a/app/src/androidTest/java/org/mozilla/fenix/helpers/HomeActivityTestRule.kt b/app/src/androidTest/java/org/mozilla/fenix/helpers/HomeActivityTestRule.kt
index 10b8b5d33..a3f049647 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/helpers/HomeActivityTestRule.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/helpers/HomeActivityTestRule.kt
@@ -4,6 +4,7 @@
 
 package org.mozilla.fenix.helpers
 
+import android.view.ViewConfiguration.getLongPressTimeout
 import androidx.test.espresso.intent.rule.IntentsTestRule
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.ActivityTestRule
@@ -25,11 +26,18 @@ class HomeActivityTestRule(
     private val skipOnboarding: Boolean = false
 ) :
     ActivityTestRule<HomeActivity>(HomeActivity::class.java, initialTouchMode, launchActivity) {
+    private val longTapUserPreference = getLongPressTimeout()
+
     override fun beforeActivityLaunched() {
         super.beforeActivityLaunched()
-        setLongTapTimeout()
+        setLongTapTimeout(3000)
         if (skipOnboarding) { skipOnboardingBeforeLaunch() }
     }
+
+    override fun afterActivityFinished() {
+        super.afterActivityFinished()
+        setLongTapTimeout(longTapUserPreference)
+    }
 }
 
 /**
@@ -46,17 +54,24 @@ class HomeActivityIntentTestRule(
     private val skipOnboarding: Boolean = false
 ) :
     IntentsTestRule<HomeActivity>(HomeActivity::class.java, initialTouchMode, launchActivity) {
+    private val longTapUserPreference = getLongPressTimeout()
+
     override fun beforeActivityLaunched() {
         super.beforeActivityLaunched()
-        setLongTapTimeout()
+        setLongTapTimeout(3000)
         if (skipOnboarding) { skipOnboardingBeforeLaunch() }
     }
+
+    override fun afterActivityFinished() {
+        super.afterActivityFinished()
+        setLongTapTimeout(longTapUserPreference)
+    }
 }
 
 // changing the device preference for Touch and Hold delay, to avoid long-clicks instead of a single-click
-fun setLongTapTimeout() {
+fun setLongTapTimeout(delay: Int) {
     val mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
-    mDevice.executeShellCommand("settings put secure long_press_timeout 3000")
+    mDevice.executeShellCommand("settings put secure long_press_timeout $delay")
 }
 
 private fun skipOnboardingBeforeLaunch() {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/helpers/SessionLoadedIdlingResource.kt b/app/src/androidTest/java/org/mozilla/fenix/helpers/SessionLoadedIdlingResource.kt
index a32fe743d..0d3537f65 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/helpers/SessionLoadedIdlingResource.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/helpers/SessionLoadedIdlingResource.kt
@@ -5,6 +5,7 @@ package org.mozilla.fenix.helpers
 
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.IdlingResource
+import mozilla.components.browser.state.selector.selectedTab
 import org.mozilla.fenix.FenixApplication
 
 /**
@@ -21,13 +22,12 @@ class SessionLoadedIdlingResource : IdlingResource {
 
     override fun isIdleNow(): Boolean {
         val context = ApplicationProvider.getApplicationContext<FenixApplication>()
-        val sessionManager = context.components.core.sessionManager
-        val session = sessionManager.selectedSession
+        val selectedTab = context.components.core.store.state.selectedTab
 
-        return if (session?.loading == true) {
+        return if (selectedTab?.content?.loading == true) {
             false
         } else {
-            if (session?.progress == 100) {
+            if (selectedTab?.content?.progress == 100) {
                 invokeCallback()
                 true
             } else {
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 ad339c592..9dffa1728 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/helpers/TestHelper.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/helpers/TestHelper.kt
@@ -12,11 +12,6 @@ import android.os.Build
 import android.os.Environment
 import androidx.preference.PreferenceManager
 import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.ViewAction
-import androidx.test.espresso.action.CoordinatesProvider
-import androidx.test.espresso.action.GeneralClickAction
-import androidx.test.espresso.action.Press
-import androidx.test.espresso.action.Tap
 import androidx.test.espresso.action.ViewActions.longClick
 import androidx.test.espresso.assertion.ViewAssertions
 import androidx.test.espresso.matcher.ViewMatchers.withId
@@ -108,22 +103,6 @@ object TestHelper {
         }
     }
 
-    fun sendSingleTapToScreen(x: Int, y: Int): ViewAction? {
-        return GeneralClickAction(
-            Tap.SINGLE,
-            CoordinatesProvider { view ->
-                val screenPos = IntArray(2)
-                view.getLocationOnScreen(screenPos)
-                val screenX = screenPos[0] + x.toFloat()
-                val screenY = screenPos[1] + y.toFloat()
-                floatArrayOf(screenX, screenY)
-            },
-            Press.FINGER,
-            0,
-            0
-        )
-    }
-
     // Remove test file from the device Downloads folder
     @Suppress("Deprecation")
     fun deleteDownloadFromStorage(fileName: String) {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/helpers/ext/ViewInteraction.kt b/app/src/androidTest/java/org/mozilla/fenix/helpers/ext/ViewInteraction.kt
index 601c450cf..e818a0733 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/helpers/ext/ViewInteraction.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/helpers/ext/ViewInteraction.kt
@@ -4,7 +4,14 @@
 
 package org.mozilla.fenix.helpers
 
+import android.view.InputDevice
+import android.view.MotionEvent
+import androidx.test.espresso.ViewAction
 import androidx.test.espresso.ViewInteraction
+import androidx.test.espresso.action.GeneralClickAction
+import androidx.test.espresso.action.GeneralLocation
+import androidx.test.espresso.action.Press
+import androidx.test.espresso.action.Tap
 import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.assertion.ViewAssertions.matches
 
@@ -21,3 +28,21 @@ fun ViewInteraction.assertIsChecked(isChecked: Boolean): ViewInteraction {
 fun ViewInteraction.assertIsSelected(isSelected: Boolean): ViewInteraction {
     return this.check(matches(isSelected(isSelected)))!!
 }
+
+/**
+ * Perform a click (simulate the finger touching the View) at a specific location in the View
+ * rather than the default middle of the View.
+ *
+ * Useful in situations where the View we want clicked contains other Views in it's x,y middle
+ * and we need to simulate the touch in some other free space of the View we want clicked.
+ */
+fun ViewInteraction.clickAtLocationInView(locationInView: GeneralLocation): ViewAction =
+    ViewActions.actionWithAssertions(
+        GeneralClickAction(
+            Tap.SINGLE,
+            locationInView,
+            Press.FINGER,
+            InputDevice.SOURCE_UNKNOWN,
+            MotionEvent.BUTTON_PRIMARY
+        )
+    )
diff --git a/app/src/androidTest/java/org/mozilla/fenix/screenshots/DefaultHomeScreenTest.kt b/app/src/androidTest/java/org/mozilla/fenix/screenshots/DefaultHomeScreenTest.kt
index 0fa99cc35..d0f32270d 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/screenshots/DefaultHomeScreenTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/screenshots/DefaultHomeScreenTest.kt
@@ -44,10 +44,14 @@ class DefaultHomeScreenTest : ScreenshotTest() {
             SystemClock.sleep(TestAssetHelper.waitingTimeShort)
             Screengrab.screenshot("HomeScreenRobot_home-screen")
         }.openThreeDotMenu {
-        }.openSettings { }
+        }.openSettings {
+        }.openPrivateBrowsingSubMenu {
+            clickPrivateModeScreenshotsSwitch()
+        }
         // To get private screenshot,
         // dismiss onboarding going to settings and back
         mDevice.pressBack()
+        mDevice.pressBack()
         homeScreen {
             togglePrivateBrowsingModeOnOff()
             Screengrab.screenshot("HomeScreenRobot_private-browsing-menu")
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 dcf5a6c4f..3b50a489f 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
@@ -494,12 +494,16 @@ class BookmarksTest {
         }.openBookmarks {
             createFolder("1")
             getInstrumentation().waitForIdleSync()
+            waitForBookmarksFolderContentToExist("Bookmarks", "1")
             selectFolder("1")
+            verifyCurrentFolderTitle("1")
             createFolder("2")
             getInstrumentation().waitForIdleSync()
+            waitForBookmarksFolderContentToExist("1", "2")
             selectFolder("2")
             verifyCurrentFolderTitle("2")
             navigateUp()
+            waitForBookmarksFolderContentToExist("1", "2")
             verifyCurrentFolderTitle("1")
             mDevice.pressBack()
             verifyBookmarksMenuView()
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/ContextMenusTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/ContextMenusTest.kt
index c877171ec..258a2a803 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/ContextMenusTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ContextMenusTest.kt
@@ -69,6 +69,7 @@ class ContextMenusTest {
             snackBarButtonClick("Switch")
             verifyUrl(genericURL.url.toString())
         }.openTabDrawer {
+            verifyNormalModeSelected()
             verifyExistingOpenTabs("Test_Page_1")
             verifyExistingOpenTabs("Test_Page_4")
         }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/NavigationToolbarTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/NavigationToolbarTest.kt
index b29837983..ee42a73e6 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/NavigationToolbarTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/NavigationToolbarTest.kt
@@ -66,7 +66,6 @@ class NavigationToolbarTest {
         }
     }
 
-    @Ignore("Flaky test: https://github.com/mozilla-mobile/fenix/issues/12894")
     @Test
     fun goForwardTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
@@ -79,7 +78,8 @@ class NavigationToolbarTest {
         }.enterURLAndEnterToBrowser(nextWebPage.url) {
             mDevice.waitForIdle()
             verifyUrl(nextWebPage.url.toString())
-            mDevice.pressBack()
+        }.openThreeDotMenu {
+        }.goBack {
             mDevice.waitForIdle()
             verifyUrl(defaultWebPage.url.toString())
         }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/ReaderViewTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/ReaderViewTest.kt
index d7e0c50b8..3d37cf44e 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/ReaderViewTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ReaderViewTest.kt
@@ -12,11 +12,14 @@ import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.ui.robots.navigationToolbar
 import androidx.test.espresso.IdlingRegistry
+import org.junit.Ignore
+import org.mozilla.fenix.FeatureFlags
 import org.mozilla.fenix.R
 import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.ViewVisibilityIdlingResource
 import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
 import org.mozilla.fenix.helpers.TestAssetHelper
+import org.mozilla.fenix.ui.robots.browserScreen
 import org.mozilla.fenix.ui.robots.mDevice
 
 /**
@@ -28,10 +31,10 @@ import org.mozilla.fenix.ui.robots.mDevice
  *
  */
 
-// @Ignore("Temp disable - reader view page detection issues: https://github.com/mozilla-mobile/fenix/issues/9688 ")
 class ReaderViewTest {
     private lateinit var mockWebServer: MockWebServer
     private var readerViewNotification: ViewVisibilityIdlingResource? = null
+    private val estimatedReadingTime = "1 - 2 minutes"
 
     @get:Rule
     val activityIntentTestRule = HomeActivityIntentTestRule()
@@ -101,6 +104,7 @@ class ReaderViewTest {
 
     @Test
     fun verifyReaderViewToggle() {
+        // New three-dot menu design does not have readerview appearance menu item
         val readerViewPage =
             TestAssetHelper.getLoremIpsumAsset(mockWebServer)
 
@@ -119,18 +123,27 @@ class ReaderViewTest {
         navigationToolbar {
             verifyReaderViewDetected(true)
             toggleReaderView()
-        }.openThreeDotMenu {
-            verifyReaderViewAppearance(true)
-        }.closeBrowserMenuToBrowser { }
+            mDevice.waitForIdle()
+        }
+
+        if (!FeatureFlags.toolbarMenuFeature) {
+            browserScreen {
+                verifyPageContent(estimatedReadingTime)
+            }.openThreeDotMenu {
+                verifyReaderViewAppearance(true)
+            }.closeBrowserMenuToBrowser { }
+        }
 
         navigationToolbar {
             toggleReaderView()
+            mDevice.waitForIdle()
         }.openThreeDotMenu {
             verifyReaderViewAppearance(false)
         }.close { }
     }
 
     @Test
+    @Ignore("To be re-implemented in https://github.com/mozilla-mobile/fenix/issues/17971")
     fun verifyReaderViewAppearanceFontToggle() {
         val readerViewPage =
             TestAssetHelper.getLoremIpsumAsset(mockWebServer)
@@ -150,6 +163,11 @@ class ReaderViewTest {
         navigationToolbar {
             verifyReaderViewDetected(true)
             toggleReaderView()
+            mDevice.waitForIdle()
+        }
+
+        browserScreen {
+            verifyPageContent(estimatedReadingTime)
         }.openThreeDotMenu {
             verifyReaderViewAppearance(true)
         }.openReaderViewAppearance {
@@ -166,6 +184,7 @@ class ReaderViewTest {
     }
 
     @Test
+    @Ignore("To be re-implemented in https://github.com/mozilla-mobile/fenix/issues/17971")
     fun verifyReaderViewAppearanceFontSizeToggle() {
         val readerViewPage =
             TestAssetHelper.getLoremIpsumAsset(mockWebServer)
@@ -185,6 +204,11 @@ class ReaderViewTest {
         navigationToolbar {
             verifyReaderViewDetected(true)
             toggleReaderView()
+            mDevice.waitForIdle()
+        }
+
+        browserScreen {
+            verifyPageContent(estimatedReadingTime)
         }.openThreeDotMenu {
             verifyReaderViewAppearance(true)
         }.openReaderViewAppearance {
@@ -207,6 +231,7 @@ class ReaderViewTest {
     }
 
     @Test
+    @Ignore("To be re-implemented in https://github.com/mozilla-mobile/fenix/issues/17971")
     fun verifyReaderViewAppearanceColorSchemeChange() {
         val readerViewPage =
             TestAssetHelper.getLoremIpsumAsset(mockWebServer)
@@ -226,6 +251,11 @@ class ReaderViewTest {
         navigationToolbar {
             verifyReaderViewDetected(true)
             toggleReaderView()
+            mDevice.waitForIdle()
+        }
+
+        browserScreen {
+            verifyPageContent(estimatedReadingTime)
         }.openThreeDotMenu {
             verifyReaderViewAppearance(true)
         }.openReaderViewAppearance {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAddonsTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAddonsTest.kt
index 79057f88c..9bd09b80b 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAddonsTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAddonsTest.kt
@@ -79,19 +79,23 @@ class SettingsAddonsTest {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
         val addonName = "uBlock Origin"
 
-        navigationToolbar {
-        }.openNewTabAndEnterToBrowser(defaultWebPage.url) {
-        }.openThreeDotMenu {
-        }.openAddonsManagerMenu {
-            addonsListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.add_ons_list), 1)
-            IdlingRegistry.getInstance().register(addonsListIdlingResource!!)
-            clickInstallAddon(addonName)
-            verifyAddonPrompt(addonName)
-            cancelInstallAddon()
-            clickInstallAddon(addonName)
-            acceptInstallAddon()
-            verifyDownloadAddonPrompt(addonName, activityTestRule)
+        navigationToolbar {}
+            .openNewTabAndEnterToBrowser(defaultWebPage.url) {}
+            .openThreeDotMenu {}
+            .openAddonsManagerMenu {
+                addonsListIdlingResource =
+                    RecyclerViewIdlingResource(
+                        activityTestRule.activity.findViewById(R.id.add_ons_list),
+                        1
+                    )
+                IdlingRegistry.getInstance().register(addonsListIdlingResource!!)
+                clickInstallAddon(addonName)
+                verifyAddonPrompt(addonName)
+                cancelInstallAddon()
+                clickInstallAddon(addonName)
+                acceptInstallAddon()
+
+                verifyDownloadAddonPrompt(addonName, activityTestRule)
         }
     }
 
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 28efbb031..6cc2b33d8 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt
@@ -27,7 +27,9 @@ import org.mozilla.fenix.helpers.TestHelper
 import org.mozilla.fenix.helpers.TestHelper.deleteDownloadFromStorage
 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.dismissTrackingOnboarding
 import org.mozilla.fenix.ui.robots.downloadRobot
 import org.mozilla.fenix.ui.robots.enhancedTrackingProtection
 import org.mozilla.fenix.ui.robots.homeScreen
@@ -48,10 +50,6 @@ class SmokeTest {
     private var recentlyClosedTabsListIdlingResource: RecyclerViewIdlingResource? = null
     private var readerViewNotification: ViewVisibilityIdlingResource? = null
     private val downloadFileName = "Globe.svg"
-    private val searchEngine = object {
-        var title = "Ecosia"
-        var url = "https://www.ecosia.org/search?q=%s"
-    }
     val collectionName = "First Collection"
     private var bookmarksListIdlingResource: RecyclerViewIdlingResource? = null
 
@@ -201,6 +199,7 @@ class SmokeTest {
 
     @Test
     // Verifies the list of items in a tab's 3 dot menu
+    @Ignore("To be re-implemented with the three dot menu changes https://github.com/mozilla-mobile/fenix/issues/17870")
     fun verifyPageMainMenuItemsTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
@@ -365,6 +364,7 @@ class SmokeTest {
 
     @Test
     // Turns ETP toggle off from Settings and verifies the ETP shield is not displayed in the nav bar
+    @Ignore("To be re-implemented with the three dot menu changes https://github.com/mozilla-mobile/fenix/issues/17870")
     fun verifyETPShieldNotDisplayedIfOFFGlobally() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
@@ -372,7 +372,7 @@ class SmokeTest {
         }.openThreeDotMenu {
         }.openSettings {
         }.openEnhancedTrackingProtectionSubMenu {
-            clickEnhancedTrackingProtectionDefaults()
+            switchEnhancedTrackingProtectionToggle()
             verifyEnhancedTrackingProtectionOptionsGrayedOut()
         }.goBackToHomeScreen {
             navigationToolbar {
@@ -381,7 +381,7 @@ class SmokeTest {
             }.openThreeDotMenu {
             }.openSettings {
             }.openEnhancedTrackingProtectionSubMenu {
-                clickEnhancedTrackingProtectionDefaults()
+                switchEnhancedTrackingProtectionToggle()
             }.goBack {
             }.goBackToBrowser {
                 clickEnhancedTrackingProtectionPanel()
@@ -391,6 +391,32 @@ class SmokeTest {
         }
     }
 
+    @Test
+    fun customTrackingProtectionSettingsTest() {
+        val trackingPage = TestAssetHelper.getEnhancedTrackingProtectionAsset(mockWebServer)
+
+        homeScreen {
+        }.openThreeDotMenu {
+        }.openSettings {
+        }.openEnhancedTrackingProtectionSubMenu {
+            verifyEnhancedTrackingProtectionOptions()
+            selectTrackingProtectionOption("Custom")
+            verifyCustomTrackingProtectionSettings()
+        }.goBackToHomeScreen {}
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(trackingPage.url) {}
+
+        enhancedTrackingProtection {
+            dismissTrackingOnboarding()
+        }.openEnhancedTrackingProtectionSheet {
+            verifyTrackingCookiesBlocked()
+            verifyCryptominersBlocked()
+            verifyFingerprintersBlocked()
+            verifyBasicLevelTrackingContentBlocked()
+        }
+    }
+
     @Test
     // Verifies changing the default engine from the Search Shortcut menu
     fun verifySearchEngineCanBeChangedTemporarilyUsingShortcuts() {
@@ -495,31 +521,6 @@ class SmokeTest {
     }
 
     @Ignore("Failing, see: https://github.com/mozilla-mobile/fenix/issues/17847")
-    @Test
-    // Verifies setting as default a customized search engine name and URL
-    fun editCustomSearchEngineTest() {
-        homeScreen {
-        }.openThreeDotMenu {
-        }.openSettings {
-        }.openSearchSubMenu {
-            openAddSearchEngineMenu()
-            selectAddCustomSearchEngine()
-            typeCustomEngineDetails(searchEngine.title, searchEngine.url)
-            saveNewSearchEngine()
-            openEngineOverflowMenu("Ecosia")
-            clickEdit()
-            typeCustomEngineDetails("Test", searchEngine.url)
-            saveEditSearchEngine()
-            changeDefaultSearchEngine("Test")
-        }.goBack {
-        }.goBack {
-        }.openSearch {
-            verifyDefaultSearchEngine("Test")
-            clickSearchEngineShortcutButton()
-            verifyEnginesListShortcutContains("Test")
-        }
-    }
-
     @Test
     // Swipes the nav bar left/right to switch between tabs
     fun swipeToSwitchTabTest() {
@@ -532,14 +533,15 @@ class SmokeTest {
         }.openNewTab {
         }.submitQuery(secondWebPage.url.toString()) {
             swipeNavBarRight(secondWebPage.url.toString())
-            verifyPageContent(firstWebPage.content)
+            verifyUrl(firstWebPage.url.toString())
             swipeNavBarLeft(firstWebPage.url.toString())
-            verifyPageContent(secondWebPage.content)
+            verifyUrl(secondWebPage.url.toString())
         }
     }
 
     @Test
     // Saves a login, then changes it and verifies the update
+    @Ignore("To be re-implemented with the three dot menu changes https://github.com/mozilla-mobile/fenix/issues/17870")
     fun updateSavedLoginTest() {
         val saveLoginTest =
             TestAssetHelper.getSaveLoginAsset(mockWebServer)
@@ -603,6 +605,7 @@ class SmokeTest {
     }
 
     @Test
+    @Ignore("To be re-implemented in https://github.com/mozilla-mobile/fenix/issues/17799")
     // Installs uBlock add-on and checks that the app doesn't crash while loading pages with trackers
     fun noCrashWithAddonInstalledTest() {
         // setting ETP to Strict mode to test it works with add-ons
@@ -1110,6 +1113,7 @@ class SmokeTest {
     }
 
     @Test
+    @Ignore("To be re-implemented in https://github.com/mozilla-mobile/fenix/issues/17799")
     fun mainMenuInstallPWATest() {
         val pwaPage = "https://rpappalax.github.io/testapp/"
 
@@ -1126,10 +1130,12 @@ class SmokeTest {
     }
 
     @Test
+    @Ignore("To be re-implemented in https://github.com/mozilla-mobile/fenix/issues/17971")
     // Verifies that reader mode is detected and the custom appearance controls are displayed
     fun verifyReaderViewAppearanceUI() {
         val readerViewPage =
             TestAssetHelper.getLoremIpsumAsset(mockWebServer)
+        val estimatedReadingTime = "1 - 2 minutes"
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(readerViewPage.url) {
@@ -1146,6 +1152,11 @@ class SmokeTest {
         navigationToolbar {
             verifyReaderViewDetected(true)
             toggleReaderView()
+            mDevice.waitForIdle()
+        }
+
+        browserScreen {
+            verifyPageContent(estimatedReadingTime)
         }.openThreeDotMenu {
             verifyReaderViewAppearance(true)
         }.openReaderViewAppearance {
@@ -1160,4 +1171,31 @@ class SmokeTest {
             verifyAppearanceColorSepia(true)
         }
     }
+
+    @Test
+    fun closeTabCrashedReporterTest() {
+
+        homeScreen {
+        }.openNavigationToolbar {
+        }.openTabCrashReporter {
+        }.clickTabCrashedCloseButton {
+        }.openTabDrawer {
+            verifyNoTabsOpened()
+        }
+    }
+
+    @Test
+    fun restoreTabCrashedReporterTest() {
+        val website = TestAssetHelper.getGenericAsset(mockWebServer, 1)
+
+        homeScreen {
+        }.openNavigationToolbar {
+        }.enterURLAndEnterToBrowser(website.url) {}
+
+        navigationToolbar {
+        }.openTabCrashReporter {
+            clickTabCrashedRestoreButton()
+            verifyPageContent(website.content)
+        }
+    }
 }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/StrictEnhancedTrackingProtectionTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/StrictEnhancedTrackingProtectionTest.kt
index 659f7547e..c3583b70d 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/StrictEnhancedTrackingProtectionTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/StrictEnhancedTrackingProtectionTest.kt
@@ -8,6 +8,7 @@ import androidx.test.platform.app.InstrumentationRegistry
 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.settings
@@ -70,7 +71,7 @@ class StrictEnhancedTrackingProtectionTest {
         }.openEnhancedTrackingProtectionSubMenu {
             verifyEnhancedTrackingProtectionHeader()
             verifyEnhancedTrackingProtectionOptions()
-            verifyEnhancedTrackingProtectionDefaults()
+            verifyTrackingProtectionSwitchEnabled()
         }.openExceptions {
             verifyDefault()
         }
@@ -126,6 +127,7 @@ class StrictEnhancedTrackingProtectionTest {
     }
 
     @Test
+    @Ignore("To be re-implemented with the three dot menu changes https://github.com/mozilla-mobile/fenix/issues/17870")
     fun testStrictVisitDisable() {
         val trackingProtectionTest =
             TestAssetHelper.getEnhancedTrackingProtectionAsset(mockWebServer)
@@ -177,7 +179,7 @@ class StrictEnhancedTrackingProtectionTest {
         }.openProtectionSettings {
             verifyEnhancedTrackingProtectionHeader()
             verifyEnhancedTrackingProtectionOptions()
-            verifyEnhancedTrackingProtectionDefaults()
+            verifyTrackingProtectionSwitchEnabled()
         }
 
         settingsSubMenuEnhancedTrackingProtection {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/TabbedBrowsingTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/TabbedBrowsingTest.kt
index 24d78cc61..73a3a4977 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/TabbedBrowsingTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/TabbedBrowsingTest.kt
@@ -10,13 +10,11 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior
 import okhttp3.mockwebserver.MockWebServer
 import org.junit.After
 import org.junit.Before
-import org.junit.BeforeClass
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.HomeActivityTestRule
 import org.mozilla.fenix.helpers.TestAssetHelper
-import org.mozilla.fenix.helpers.TestHelper.sendSingleTapToScreen
 import org.mozilla.fenix.ui.robots.browserScreen
 import org.mozilla.fenix.ui.robots.homeScreen
 import org.mozilla.fenix.ui.robots.navigationToolbar
@@ -55,16 +53,6 @@ class TabbedBrowsingTest {
         }
     }
 
-    // changing the device preference for Touch and Hold delay, to avoid long-clicks instead of a single-click
-    companion object {
-        @BeforeClass
-        @JvmStatic
-        fun setDevicePreference() {
-            val mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
-            mDevice.executeShellCommand("settings put secure long_press_timeout 3000")
-        }
-    }
-
     @After
     fun tearDown() {
         mockWebServer.shutdown()
@@ -72,8 +60,6 @@ class TabbedBrowsingTest {
 
     @Test
     fun openNewTabTest() {
-        homeScreen { }.dismissOnboarding()
-
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
         navigationToolbar {
@@ -81,26 +67,26 @@ class TabbedBrowsingTest {
             mDevice.waitForIdle()
             verifyTabCounter("1")
         }.openTabDrawer {
-            verifyExistingTabList()
-        }.openTabsListThreeDotMenu {
-            verifyCloseAllTabsButton()
-            verifyShareTabButton()
-            verifySelectTabs()
+            verifyNormalModeSelected()
+            verifyExistingOpenTabs("Test_Page_1")
+            closeTab()
+        }.openTabDrawer {
+            verifyNoTabsOpened()
+        }.openNewTab {
+        }.submitQuery(defaultWebPage.url.toString()) {
+            mDevice.waitForIdle()
+            verifyTabCounter("1")
+        }.openTabDrawer {
+            verifyNormalModeSelected()
+            verifyExistingOpenTabs("Test_Page_1")
         }
     }
 
     @Test
     fun openNewPrivateTabTest() {
-        homeScreen { }.dismissOnboarding()
-
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
-        homeScreen { }.togglePrivateBrowsingMode()
-
-        homeScreen {
-            verifyPrivateSessionMessage()
-            verifyTabButton()
-        }
+        homeScreen {}.togglePrivateBrowsingMode()
 
         navigationToolbar {
         }.openNewTabAndEnterToBrowser(defaultWebPage.url) {
@@ -108,7 +94,7 @@ class TabbedBrowsingTest {
             verifyTabCounter("1")
         }.openTabDrawer {
             verifyExistingTabList()
-            verifyCloseTabsButton("Test_Page_1")
+            verifyPrivateModeSelected()
         }.toggleToNormalTabs {
             verifyNoTabsOpened()
         }.toggleToPrivateTabs {
@@ -156,7 +142,6 @@ class TabbedBrowsingTest {
         }.openNewTabAndEnterToBrowser(genericURL.url) {
         }.openTabDrawer {
             verifyExistingOpenTabs("Test_Page_1")
-            verifyCloseTabsButton("Test_Page_1")
             closeTabViaXButton("Test_Page_1")
             verifySnackBarText("Tab closed")
             snackBarButtonClick("UNDO")
@@ -187,8 +172,7 @@ class TabbedBrowsingTest {
         browserScreen {
         }.openTabDrawer {
             verifyExistingOpenTabs("Test_Page_1")
-        }.openNewTab {
-        }.dismissSearchBar { }
+        }.closeTabDrawer { }
     }
 
     @Test
@@ -249,15 +233,12 @@ class TabbedBrowsingTest {
         notificationShade {
             verifyPrivateTabsNotification()
         }.clickClosePrivateTabsNotification {
-            // Tap an empty spot on the app homescreen to make sure it's into focus
-            sendSingleTapToScreen(20, 20)
             verifyHomeScreen()
         }
     }
 
     @Test
     fun verifyTabTrayNotShowingStateHalfExpanded() {
-        homeScreen { }.dismissOnboarding()
 
         navigationToolbar {
         }.openTabTray {
@@ -282,8 +263,6 @@ class TabbedBrowsingTest {
 
     @Test
     fun verifyEmptyTabTray() {
-        homeScreen { }.dismissOnboarding()
-
         navigationToolbar {
         }.openTabTray {
             verifyNoTabsOpened()
@@ -298,8 +277,6 @@ class TabbedBrowsingTest {
 
     @Test
     fun verifyOpenTabDetails() {
-        homeScreen { }.dismissOnboarding()
-
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
         navigationToolbar {
@@ -317,8 +294,6 @@ class TabbedBrowsingTest {
 
     @Test
     fun verifyContextMenuShortcuts() {
-        homeScreen { }.dismissOnboarding()
-
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
         navigationToolbar {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/ThreeDotMenuMainTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/ThreeDotMenuMainTest.kt
index ca48ce5b6..86645af12 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/ThreeDotMenuMainTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ThreeDotMenuMainTest.kt
@@ -12,6 +12,7 @@ import org.junit.Before
 import org.junit.BeforeClass
 import org.junit.Rule
 import org.junit.Test
+import org.mozilla.fenix.FeatureFlags
 import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.HomeActivityTestRule
 import org.mozilla.fenix.ui.robots.homeScreen
@@ -54,40 +55,68 @@ class ThreeDotMenuMainTest {
 
     @Test
     fun threeDotMenuItemsTest() {
-        homeScreen {
-        }.openThreeDotMenu {
-            verifySettingsButton()
-            verifyBookmarksButton()
-            verifyHistoryButton()
-            verifyHelpButton()
-            verifyWhatsNewButton()
-        }.openSettings {
-            verifySettingsView()
-        }.goBack {
-        }.openThreeDotMenu {
-        }.openHelp {
-            verifyHelpUrl()
-        }.openTabDrawer {
-        }.openNewTab {
-        }.dismissSearchBar {
-        }.openThreeDotMenu {
-        }.openWhatsNew {
-            verifyWhatsNewURL()
-        }.openTabDrawer {
-        }.openNewTab {
-        }.dismissSearchBar { }
-
-        homeScreen {
-        }.openThreeDotMenu {
-        }.openBookmarks {
-            verifyBookmarksMenuView()
-        }.closeMenu {
-        }
+        if (FeatureFlags.toolbarMenuFeature) {
+            homeScreen {
+            }.openThreeDotMenu {
+            }.openHistory {
+                verifyHistoryMenuView()
+            }.goBackToBrowser {}
+
+            homeScreen {
+            }.openThreeDotMenu {
+            }.openBookmarks {
+                verifyBookmarksMenuView()
+            }.closeMenu {}
+
+            homeScreen {
+            }.openThreeDotMenu {
+                verifySettingsButton()
+                verifyBookmarksButton()
+                verifyHistoryButton()
+            }.openSettings {
+                verifySettingsView()
+            }.goBack {
+            }.openThreeDotMenu {
+            }.goBack {}
+        } else {
+            homeScreen {
+            }.openThreeDotMenu {
+                verifySettingsButton()
+                verifyBookmarksButton()
+                verifyHistoryButton()
+                verifyHelpButton()
+                verifyWhatsNewButton()
+            }.openSettings {
+                verifySettingsView()
+            }.goBack {
+            }.openThreeDotMenu {
+            }.openHelp {
+                verifyHelpUrl()
+            }.openTabDrawer {
+                closeTab()
+            }
 
-        homeScreen {
-        }.openThreeDotMenu {
-        }.openHistory {
-            verifyHistoryMenuView()
+            homeScreen {
+            }.openThreeDotMenu {
+            }.openWhatsNew {
+                verifyWhatsNewURL()
+            }.openTabDrawer {
+                closeTab()
+            }
+
+            homeScreen {
+            }.openThreeDotMenu {
+            }.openBookmarks {
+                verifyBookmarksMenuView()
+            }.closeMenu {
+            }
+
+            homeScreen {
+            }.openThreeDotMenu {
+            }.openHistory {
+                verifyHistoryMenuView()
+            }
         }
+
     }
 }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BookmarksRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BookmarksRobot.kt
index 8eddc0384..3f15b840e 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BookmarksRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BookmarksRobot.kt
@@ -105,6 +105,10 @@ class BookmarksRobot {
     fun verifySelectDefaultFolderSnackBarText() = assertSnackBarText("Can’t edit default folders")
 
     fun verifyCurrentFolderTitle(title: String) {
+        mDevice.findObject(UiSelector().resourceId("$packageName:id/navigationToolbar")
+            .textContains(title))
+            .waitForExists(waitingTime)
+
         onView(
             allOf(
                 withText(title),
@@ -114,6 +118,14 @@ class BookmarksRobot {
             .check(matches(isDisplayed()))
     }
 
+    fun waitForBookmarksFolderContentToExist(parentFolderName: String, childFolderName: String) {
+        mDevice.findObject(UiSelector().resourceId("$packageName:id/navigationToolbar")
+            .textContains(parentFolderName))
+            .waitForExists(waitingTime)
+
+        mDevice.waitNotNull(Until.findObject(By.text(childFolderName)), waitingTime)
+    }
+
     fun verifySignInToSyncButton() =
         signInToSyncButton().check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
 
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 efce62eec..2e7343f36 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
@@ -32,6 +32,7 @@ import androidx.test.uiautomator.By.text
 import androidx.test.uiautomator.UiDevice
 import androidx.test.uiautomator.UiSelector
 import androidx.test.uiautomator.Until
+import mozilla.components.browser.state.selector.selectedTab
 import org.hamcrest.CoreMatchers.allOf
 import org.hamcrest.CoreMatchers.containsString
 import org.hamcrest.Matchers.not
@@ -49,8 +50,8 @@ class BrowserRobot {
     private lateinit var sessionLoadedIdlingResource: SessionLoadedIdlingResource
 
     fun verifyCurrentPrivateSession(context: Context) {
-        val session = context.components.core.sessionManager.selectedSession
-        assertTrue("Current session is private", session?.private!!)
+        val selectedTab = context.components.core.store.state.selectedTab
+        assertTrue("Current session is private", selectedTab?.content?.private ?: false)
     }
 
     fun verifyUrl(url: String) {
@@ -465,6 +466,20 @@ class BrowserRobot {
             HomeScreenRobot().interact()
             return HomeScreenRobot.Transition()
         }
+
+        fun clickTabCrashedCloseButton(interact: HomeScreenRobot.() -> Unit): HomeScreenRobot.Transition {
+
+            assertTrue(
+                mDevice.findObject(UiSelector().resourceId("$packageName:id/closeTabButton"))
+                    .waitForExists(waitingTime)
+            )
+
+            val tabCrashedCloseButton = mDevice.findObject(text("Close tab"))
+            tabCrashedCloseButton.click()
+
+            HomeScreenRobot().interact()
+            return HomeScreenRobot.Transition()
+        }
     }
 }
 
@@ -525,3 +540,14 @@ private fun mediaPlayerPlayButton() =
             .className("android.widget.Button")
             .text("Play")
     )
+
+fun clickTabCrashedRestoreButton() {
+
+    assertTrue(
+        mDevice.findObject(UiSelector().resourceId("$packageName:id/restoreTabButton"))
+            .waitForExists(waitingTime)
+    )
+
+    val tabCrashRestoreButton = mDevice.findObject(UiSelector().resourceIdMatches("$packageName:id/restoreTabButton"))
+    tabCrashRestoreButton.click()
+}
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/EnhancedTrackingProtectionRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/EnhancedTrackingProtectionRobot.kt
index aa6adc18a..5fb906ad7 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/EnhancedTrackingProtectionRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/EnhancedTrackingProtectionRobot.kt
@@ -8,13 +8,20 @@ package org.mozilla.fenix.ui.robots
 
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.assertion.ViewAssertions
+import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.uiautomator.By
 import androidx.test.uiautomator.UiDevice
+import androidx.test.uiautomator.UiSelector
 import androidx.test.uiautomator.Until
+import org.hamcrest.Matchers.containsString
 import org.mozilla.fenix.R
 import org.mozilla.fenix.helpers.TestAssetHelper
+import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime
 import org.mozilla.fenix.helpers.TestHelper.packageName
 import org.mozilla.fenix.helpers.click
 import org.mozilla.fenix.helpers.ext.waitNotNull
@@ -37,6 +44,14 @@ class EnhancedTrackingProtectionRobot {
     fun verifyEnhancedTrackingProtectionDetailsStatus(status: String) =
         assertEnhancedTrackingProtectionDetailsStatus(status)
 
+    fun verifyTrackingCookiesBlocked() = assertTrackingCookiesBlocked()
+
+    fun verifyFingerprintersBlocked() = assertFingerprintersBlocked()
+
+    fun verifyCryptominersBlocked() = assertCryptominersBlocked()
+
+    fun verifyBasicLevelTrackingContentBlocked() = assertBasicLevelTrackingContentBlocked()
+
     class Transition {
         fun openEnhancedTrackingProtectionSheet(interact: EnhancedTrackingProtectionRobot.() -> Unit): Transition {
             openEnhancedTrackingProtectionSheet().click()
@@ -129,3 +144,45 @@ private fun openEnhancedTrackingProtectionSettings() =
 
 private fun openEnhancedTrackingProtectionDetails() =
     onView(ViewMatchers.withId(R.id.tracking_content))
+
+private fun assertTrackingCookiesBlocked() {
+    mDevice.findObject(UiSelector().resourceId("$packageName:id/cross_site_tracking"))
+        .waitForExists(waitingTime)
+    onView(withId(R.id.blocking_header)).check(matches(isDisplayed()))
+    onView(withId(R.id.cross_site_tracking)).check(matches(isDisplayed()))
+}
+
+private fun assertFingerprintersBlocked() {
+    mDevice.findObject(UiSelector().resourceId("$packageName:id/fingerprinters"))
+        .waitForExists(waitingTime)
+    onView(withId(R.id.blocking_header)).check(matches(isDisplayed()))
+    onView(withId(R.id.fingerprinters)).check(matches(isDisplayed()))
+}
+
+private fun assertCryptominersBlocked() {
+    mDevice.findObject(UiSelector().resourceId("$packageName:id/cryptominers"))
+        .waitForExists(waitingTime)
+    onView(withId(R.id.blocking_header)).check(matches(isDisplayed()))
+    onView(withId(R.id.cryptominers)).check(matches(isDisplayed()))
+}
+
+private fun assertBasicLevelTrackingContentBlocked() {
+    mDevice.findObject(UiSelector().resourceId("$packageName:id/tracking_content"))
+        .waitForExists(waitingTime)
+
+    onView(withId(R.id.tracking_content))
+        .check(matches(isDisplayed()))
+        .click()
+    onView(withId(R.id.blocking_text_list))
+        .check(
+            matches(
+                withText(
+                    containsString(
+                        "social-track-digest256.dummytracker.org\n" +
+                                "ads-track-digest256.dummytracker.org\n" +
+                                "analytics-track-digest256.dummytracker.org"
+                    )
+                )
+            )
+        )
+}
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 7c156b5b2..0d29f036e 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
@@ -309,6 +309,7 @@ class HomeScreenRobot {
         }
 
         fun openThreeDotMenu(interact: ThreeDotMenuMainRobot.() -> Unit): ThreeDotMenuMainRobot.Transition {
+            mDevice.waitNotNull(Until.findObject(By.res("$packageName:id/menuButton")), waitingTime)
             threeDotButton().perform(click())
 
             ThreeDotMenuMainRobot().interact()
@@ -485,8 +486,11 @@ private fun assertFocusedNavigationToolbar() =
     onView(allOf(withHint("Search or enter address")))
         .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
 
-private fun assertHomeScreen() = onView(ViewMatchers.withResourceName("homeLayout"))
+private fun assertHomeScreen() {
+    mDevice.findObject(UiSelector().resourceId("$packageName:id/homeLayout")).waitForExists(waitingTime)
+    onView(ViewMatchers.withResourceName("homeLayout"))
     .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+}
 
 private fun assertHomeMenu() = onView(ViewMatchers.withResourceName("menuButton"))
     .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt
index 3c63c7eb9..1a0ad0075 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt
@@ -30,6 +30,7 @@ import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.uiautomator.By
 import androidx.test.uiautomator.UiDevice
+import androidx.test.uiautomator.UiSelector
 import androidx.test.uiautomator.Until
 import org.hamcrest.CoreMatchers.allOf
 import org.hamcrest.CoreMatchers.anyOf
@@ -121,6 +122,30 @@ class NavigationToolbarRobot {
             return BrowserRobot.Transition()
         }
 
+        fun openTabCrashReporter(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
+            val crashUrl = "about:crashcontent"
+
+            sessionLoadedIdlingResource = SessionLoadedIdlingResource()
+
+            mDevice.waitNotNull(Until.findObject(By.res("$packageName:id/toolbar")),
+                waitingTime
+            )
+            urlBar().click()
+            mDevice.waitNotNull(
+                Until.findObject(By.res("$packageName:id/mozac_browser_toolbar_edit_url_view")),
+                waitingTime
+            )
+
+            awesomeBar().perform(replaceText(crashUrl), pressImeActionButton())
+
+            runWithIdleRes(sessionLoadedIdlingResource) {
+                mDevice.findObject(UiSelector().resourceId("$packageName:id/crash_tab_image"))
+            }
+
+            BrowserRobot().interact()
+            return BrowserRobot.Transition()
+        }
+
         fun openThreeDotMenu(interact: ThreeDotMenuMainRobot.() -> Unit): ThreeDotMenuMainRobot.Transition {
             mDevice.waitNotNull(Until.findObject(By.res("$packageName:id/mozac_browser_toolbar_menu")), waitingTime)
             threeDotButton().click()
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NotificationRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NotificationRobot.kt
index aea828072..2c7ffe6ac 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NotificationRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NotificationRobot.kt
@@ -67,7 +67,7 @@ class NotificationRobot {
 
         fun clickClosePrivateTabsNotification(interact: HomeScreenRobot.() -> Unit): HomeScreenRobot.Transition {
             NotificationRobot().verifySystemNotificationExists("Close private tabs")
-            closePrivateTabsNotification().clickAndWaitForNewWindow()
+            closePrivateTabsNotification().click()
 
             HomeScreenRobot().interact()
             return HomeScreenRobot.Transition()
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 5f565b257..6bf120a16 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
@@ -270,6 +270,9 @@ private fun assertSearchEngineList() {
 }
 
 private fun assertEngineListShortcutContains(searchEngineName: String) {
+    mDevice.findObject(UiSelector().resourceId("$packageName:id/awesome_bar"))
+        .waitForExists(waitingTime)
+
     onView(withId(R.id.awesome_bar))
         .perform(swipeDown())
         .check(matches(hasDescendant(withText(searchEngineName))))
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuEnhancedTrackingProtectionRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuEnhancedTrackingProtectionRobot.kt
index 340699e58..14e7b0a8e 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuEnhancedTrackingProtectionRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuEnhancedTrackingProtectionRobot.kt
@@ -13,6 +13,7 @@ import androidx.test.espresso.contrib.RecyclerViewActions
 import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
 import androidx.test.espresso.matcher.ViewMatchers.hasSibling
 import androidx.test.espresso.matcher.ViewMatchers.Visibility
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withChild
 import androidx.test.espresso.matcher.ViewMatchers.withContentDescription
 import androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility
@@ -25,6 +26,7 @@ import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.uiautomator.UiDevice
 import org.hamcrest.CoreMatchers.allOf
 import org.hamcrest.CoreMatchers.not
+import org.mozilla.fenix.helpers.TestHelper.scrollToElementByText
 import org.mozilla.fenix.helpers.assertIsChecked
 import org.mozilla.fenix.helpers.click
 import org.mozilla.fenix.helpers.isChecked
@@ -49,9 +51,9 @@ class SettingsSubMenuEnhancedTrackingProtectionRobot {
 
     fun verifyEnhancedTrackingProtectionOptionsGrayedOut() = assertEnhancedTrackingProtectionOptionsGrayedOut()
 
-    fun verifyEnhancedTrackingProtectionDefaults() = assertEnhancedTrackingProtectionDefaults()
+    fun verifyTrackingProtectionSwitchEnabled() = assertTrackingProtectionSwitchEnabled()
 
-    fun clickEnhancedTrackingProtectionDefaults() = onView(withResourceName("switch_widget")).click()
+    fun switchEnhancedTrackingProtectionToggle() = onView(withResourceName("switch_widget")).click()
 
     fun verifyRadioButtonDefaults() = assertRadioButtonDefaults()
 
@@ -60,11 +62,15 @@ class SettingsSubMenuEnhancedTrackingProtectionRobot {
         verifyEnhancedTrackingProtectionHeaderDescription()
         verifyLearnMoreText()
         verifyEnhancedTrackingProtectionTextWithSwitchWidget()
-        verifyEnhancedTrackingProtectionDefaults()
+        verifyTrackingProtectionSwitchEnabled()
         verifyRadioButtonDefaults()
         verifyEnhancedTrackingProtectionOptions()
     }
 
+    fun verifyCustomTrackingProtectionSettings() = assertCustomTrackingProtectionSettings()
+
+    fun selectTrackingProtectionOption(option: String) = onView(withText(option)).click()
+
     class Transition {
         val mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())!!
 
@@ -183,7 +189,7 @@ private fun assertEnhancedTrackingProtectionOptionsGrayedOut() {
         .check(matches(not(isEnabled(true))))
 }
 
-private fun assertEnhancedTrackingProtectionDefaults() {
+private fun assertTrackingProtectionSwitchEnabled() {
     onView(withResourceName("switch_widget")).check(
         matches(
             isChecked(
@@ -218,3 +224,28 @@ private fun goBackButton() =
 
 private fun openExceptions() =
     onView(allOf(withText("Exceptions")))
+
+private fun assertCustomTrackingProtectionSettings() {
+    scrollToElementByText("Redirect Trackers")
+    cookiesCheckbox().check(matches(isDisplayed()))
+    cookiesDropDownMenuDefault().check(matches(isDisplayed()))
+    trackingContentCheckbox().check(matches(isDisplayed()))
+    trackingcontentDropDownDefault().check(matches(isDisplayed()))
+    cryptominersCheckbox().check(matches(isDisplayed()))
+    fingerprintersCheckbox().check(matches(isDisplayed()))
+    redirectTrackersCheckbox().check(matches(isDisplayed()))
+}
+
+private fun cookiesCheckbox() = onView(withText("Cookies"))
+
+private fun cookiesDropDownMenuDefault() = onView(withText("All cookies (will cause websites to break)"))
+
+private fun trackingContentCheckbox() = onView(withText("Tracking content"))
+
+private fun trackingcontentDropDownDefault() = onView(withText("In all tabs"))
+
+private fun cryptominersCheckbox() = onView(withText("Cryptominers"))
+
+private fun fingerprintersCheckbox() = onView(withText("Fingerprinters"))
+
+private fun redirectTrackersCheckbox() = onView(withText("Redirect Trackers"))
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuPrivateBrowsingRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuPrivateBrowsingRobot.kt
index 5ce0944af..c8ef29dd0 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuPrivateBrowsingRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuPrivateBrowsingRobot.kt
@@ -46,6 +46,8 @@ class SettingsSubMenuPrivateBrowsingRobot {
 
     fun verifyPrivateBrowsingShortcutIcon() = assertPrivateBrowsingShortcutIcon()
 
+    fun clickPrivateModeScreenshotsSwitch() = screenshotsInPrivateModeSwitch().click()
+
     fun clickOpenLinksInPrivateTabSwitch() = openLinksInPrivateTabSwitch().click()
 
     fun addPrivateShortcutToHomescreen() {
@@ -92,6 +94,9 @@ private fun assertNavigationToolBarHeader() {
 private fun openLinksInPrivateTabSwitch() =
     onView(withText("Open links in a private tab"))
 
+private fun screenshotsInPrivateModeSwitch() =
+    onView(withText("Allow screenshots in private browsing"))
+
 private fun addPrivateBrowsingShortcutButton() = onView(withText("Add private browsing shortcut"))
 
 private fun goBackButton() = onView(withContentDescription("Navigate up"))
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuSearchRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuSearchRobot.kt
index da518f563..92c29ce00 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuSearchRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuSearchRobot.kt
@@ -8,25 +8,20 @@ package org.mozilla.fenix.ui.robots
 
 import androidx.recyclerview.widget.RecyclerView
 import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.action.ViewActions.clearText
 import androidx.test.espresso.action.ViewActions.click
-import androidx.test.espresso.action.ViewActions.typeText
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.contrib.RecyclerViewActions
 import androidx.test.espresso.matcher.ViewMatchers.Visibility
 import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
-import androidx.test.espresso.matcher.ViewMatchers.withChild
+import androidx.test.espresso.matcher.ViewMatchers.withContentDescription
 import androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
-import androidx.test.espresso.matcher.ViewMatchers.withContentDescription
-import androidx.test.espresso.matcher.ViewMatchers.withParent
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.uiautomator.UiDevice
 import androidx.test.uiautomator.UiSelector
 import org.hamcrest.CoreMatchers
-import org.hamcrest.CoreMatchers.allOf
 import org.mozilla.fenix.R
 import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime
 import org.mozilla.fenix.helpers.click
@@ -67,33 +62,6 @@ class SettingsSubMenuSearchRobot {
         saveNewSearchEngine()
     }
 
-    fun selectAddCustomSearchEngine() = onView(withText("Other")).click()
-
-    fun typeCustomEngineDetails(engineName: String, engineURL: String) {
-        onView(withId(R.id.edit_engine_name))
-            .perform(clearText())
-            .perform(typeText(engineName))
-        onView(withId(R.id.edit_search_string))
-            .perform(clearText())
-            .perform(typeText(engineURL))
-    }
-
-    fun openEngineOverflowMenu(searchEngineName: String) {
-        mDevice.findObject(
-            UiSelector().resourceId("org.mozilla.fenix.debug:id/overflow_menu")
-        ).waitForExists(waitingTime)
-        threeDotMenu(searchEngineName).click()
-    }
-
-    fun clickEdit() = onView(withText("Edit")).click()
-
-    fun saveEditSearchEngine() {
-        onView(withId(R.id.save_button)).click()
-        mDevice.findObject(
-            UiSelector().resourceId("org.mozilla.fenix.debug:id/recycler_view")
-        ).waitForExists(waitingTime)
-    }
-
     class Transition {
         val mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
 
@@ -220,11 +188,3 @@ private fun addSearchEngineSaveButton() = onView(withId(R.id.add_search_engine))
 private fun assertEngineListContains(searchEngineName: String) {
     onView(withId(R.id.search_engine_group)).check(matches(hasDescendant(withText(searchEngineName))))
 }
-
-private fun threeDotMenu(searchEngineName: String) =
-    onView(
-        allOf(
-            withId(R.id.overflow_menu),
-            withParent(withChild(withText(searchEngineName)))
-        )
-    )
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 16dddca95..0f84a9ef0 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
@@ -15,6 +15,7 @@ import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.NoMatchingViewException
 import androidx.test.espresso.UiController
 import androidx.test.espresso.ViewAction
+import androidx.test.espresso.action.GeneralLocation
 import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.action.ViewActions.replaceText
@@ -42,7 +43,9 @@ import org.hamcrest.Matcher
 import org.mozilla.fenix.R
 import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime
+import org.mozilla.fenix.helpers.TestHelper.packageName
 import org.mozilla.fenix.helpers.click
+import org.mozilla.fenix.helpers.clickAtLocationInView
 import org.mozilla.fenix.helpers.ext.waitNotNull
 import org.mozilla.fenix.helpers.idlingresource.BottomSheetBehaviorStateIdlingResource
 import org.mozilla.fenix.helpers.matchers.BottomSheetBehaviorHalfExpandedMaxRatioMatcher
@@ -85,23 +88,46 @@ class TabDrawerRobot {
         mDevice.findObject(
             UiSelector().resourceId("org.mozilla.fenix.debug:id/mozac_browser_tabstray_close")
         ).waitForExists(waitingTime)
-        closeTabButton().click()
+
+        var retries = 0 // number of retries before failing, will stop at 2
+        do {
+            closeTabButton().click()
+            retries++
+        } while (mDevice.findObject(
+                UiSelector().resourceId("org.mozilla.fenix.debug:id/mozac_browser_tabstray_close")
+            ).exists() && retries < 3
+        )
     }
 
-    fun swipeTabRight(title: String) =
-        tab(title).perform(ViewActions.swipeRight())
+    fun swipeTabRight(title: String) {
+        var retries = 0 // number of retries before failing, will stop at 2
+        while (mDevice.findObject(UiSelector().text(title)).exists() && retries < 3) {
+            tab(title).perform(ViewActions.swipeRight())
+            retries++
+        }
+    }
 
-    fun swipeTabLeft(title: String) =
-        tab(title).perform(ViewActions.swipeLeft())
+    fun swipeTabLeft(title: String) {
+        var retries = 0 // number of retries before failing, will stop at 2
+        while (mDevice.findObject(UiSelector().text(title)).exists() && retries < 3) {
+            tab(title).perform(ViewActions.swipeLeft())
+            retries++
+        }
+    }
 
     fun closeTabViaXButton(title: String) {
-        val closeButton = onView(
-            allOf(
-                withId(R.id.mozac_browser_tabstray_close),
-                withContentDescription("Close tab $title")
+        mDevice.findObject(UiSelector().text(title)).waitForExists(waitingTime)
+        var retries = 0 // number of retries before failing, will stop at 2
+        do {
+            val closeButton = onView(
+                allOf(
+                    withId(R.id.mozac_browser_tabstray_close),
+                    withContentDescription("Close tab $title")
+                )
             )
-        )
-        closeButton.perform(click())
+            closeButton.perform(click())
+            retries++
+        } while (mDevice.findObject(UiSelector().text(title)).exists() && retries < 3)
     }
 
     fun verifySnackBarText(expectedText: String) {
@@ -231,7 +257,9 @@ class TabDrawerRobot {
         }
 
         fun clickTopBar(interact: TabDrawerRobot.() -> Unit): Transition {
-            onView(withId(R.id.topBar)).click()
+            // The topBar contains other views.
+            // Don't do the default click in the middle, rather click in some free space - top right.
+            onView(withId(R.id.topBar)).clickAtLocationInView(GeneralLocation.TOP_RIGHT)
             TabDrawerRobot().interact()
             return Transition()
         }
@@ -256,8 +284,11 @@ class TabDrawerRobot {
         }
 
         fun waitForTabTrayBehaviorToIdle(interact: TabDrawerRobot.() -> Unit): Transition {
+            // Need to get the behavior of tab_wrapper and wait for that to idle.
             var behavior: BottomSheetBehavior<*>? = null
-            onView(withId(R.id.tab_wrapper)).perform(object : ViewAction {
+
+            // Null check here since it's possible that the view is already animated away from the screen.
+            onView(withId(R.id.tab_wrapper))?.perform(object : ViewAction {
                 override fun getDescription(): String {
                     return "Postpone actions to after the BottomSheetBehavior has settled"
                 }
@@ -270,9 +301,13 @@ class TabDrawerRobot {
                     behavior = BottomSheetBehavior.from(view!!)
                 }
             })
-            runWithIdleRes(BottomSheetBehaviorStateIdlingResource(behavior!!)) {
-                TabDrawerRobot().interact()
+
+            behavior?.let {
+                runWithIdleRes(BottomSheetBehaviorStateIdlingResource(it)) {
+                    TabDrawerRobot().interact()
+                }
             }
+
             return Transition()
         }
 
@@ -326,6 +361,11 @@ private fun threeDotMenu() = onView(withId(R.id.tab_tray_overflow))
 
 private fun assertExistingOpenTabs(title: String) {
     try {
+        mDevice.findObject(UiSelector()
+            .resourceId("$packageName:id/mozac_browser_tabstray_title")
+            .textContains(title))
+            .waitForExists(waitingTime)
+
         tab(title).check(matches(isDisplayed()))
     } catch (e: NoMatchingViewException) {
         onView(withId(R.id.tabsTray)).perform(
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuMainRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuMainRobot.kt
index da61cb380..cc2304f33 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuMainRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuMainRobot.kt
@@ -38,6 +38,7 @@ import androidx.test.uiautomator.Until
 import org.hamcrest.Matcher
 import org.hamcrest.Matchers.allOf
 import org.junit.Assert.assertTrue
+import org.mozilla.fenix.FeatureFlags
 import org.mozilla.fenix.R
 import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime
 import org.mozilla.fenix.helpers.click
@@ -124,21 +125,33 @@ class ThreeDotMenuMainRobot {
     fun verifyShareTabsOverlay() = assertShareTabsOverlay()
 
     fun verifyThreeDotMainMenuItems() {
-        verifyAddOnsButton()
-        verifyDownloadsButton()
-        verifyHistoryButton()
-        verifyBookmarksButton()
-        verifySyncedTabsButton()
-        verifySettingsButton()
-        verifyFindInPageButton()
-        verifyAddFirefoxHome()
-        verifyAddToMobileHome()
-        verifyDesktopSite()
-        verifySaveCollection()
-        verifyAddBookmarkButton()
-        verifyShareButton()
-        verifyForwardButton()
-        verifyRefreshButton()
+        if (FeatureFlags.toolbarMenuFeature) {
+            verifyDownloadsButton()
+            verifyHistoryButton()
+            verifyBookmarksButton()
+            verifySettingsButton()
+            verifyDesktopSite()
+            verifySaveCollection()
+            verifyShareButton()
+            verifyForwardButton()
+            verifyRefreshButton()
+        } else {
+            verifyAddOnsButton()
+            verifyDownloadsButton()
+            verifyHistoryButton()
+            verifyBookmarksButton()
+            verifySyncedTabsButton()
+            verifySettingsButton()
+            verifyFindInPageButton()
+            verifyAddFirefoxHome()
+            verifyAddToMobileHome()
+            verifyDesktopSite()
+            verifySaveCollection()
+            verifyAddBookmarkButton()
+            verifyShareButton()
+            verifyForwardButton()
+            verifyRefreshButton()
+        }
     }
 
     private fun assertShareTabsOverlay() {
@@ -390,7 +403,8 @@ private fun assertSettingsButton() = settingsButton()
     .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
     .check(matches(isCompletelyDisplayed()))
 
-private fun addOnsButton() = onView(allOf(withText("Add-ons")))
+private val addOnsText = if (FeatureFlags.toolbarMenuFeature) "Extensions" else "Add-ons"
+private fun addOnsButton() = onView(allOf(withText(addOnsText)))
 private fun assertAddOnsButton() {
     onView(withId(R.id.mozac_browser_menu_menuView)).perform(swipeDown())
     addOnsButton().check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
diff --git a/app/src/geckoRelease/java/org/mozilla/fenix/engine/GeckoProvider.kt b/app/src/geckoRelease/java/org/mozilla/fenix/engine/GeckoProvider.kt
index a01593bb7..77303e932 100644
--- a/app/src/geckoRelease/java/org/mozilla/fenix/engine/GeckoProvider.kt
+++ b/app/src/geckoRelease/java/org/mozilla/fenix/engine/GeckoProvider.kt
@@ -13,12 +13,18 @@ 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.ContentBlocking
 import org.mozilla.geckoview.GeckoRuntime
 import org.mozilla.geckoview.GeckoRuntimeSettings
+import org.mozilla.geckoview.ContentBlocking.SafeBrowsingProvider
 
 object GeckoProvider {
     var testConfig: Bundle? = null
     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(
@@ -63,6 +69,28 @@ object GeckoProvider {
             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)
         geckoRuntime.loginStorageDelegate = GeckoLoginDelegateWrapper(loginStorageDelegate)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index efb94c3c0..b1b84e842 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -23,7 +23,7 @@
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:requestLegacyExternalStorage="true"
+        android:requestLegacyExternalStorage="${requestLegacyExternalStorage}"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/NormalTheme"
@@ -119,6 +119,9 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".home.mozonline.PrivacyContentDisplayActivity"
+                android:exported="false"/>
+
         <activity
             android:name=".customtabs.ExternalAppBrowserActivity"
             android:autoRemoveFromRecents="false"
@@ -229,9 +232,6 @@
         <activity android:name=".settings.account.AuthIntentReceiverActivity"
             android:exported="false" />
 
-        <service android:name=".media.MediaService"
-            android:exported="false" />
-
         <service android:name=".media.MediaSessionService"
             android:exported="false" />
 
diff --git a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
index 1a9871792..ef40ffc3f 100644
--- a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
+++ b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
@@ -15,33 +15,17 @@ object FeatureFlags {
     const val pullToRefreshEnabled = true
 
     /**
-     * Shows Synced Tabs in the tabs tray.
-     *
-     * Tracking issue: https://github.com/mozilla-mobile/fenix/issues/13892
+     * Enables the Nimbus experiments library.
      */
-    val syncedTabsInTabsTray = Config.channel.isNightlyOrDebug
+    val nimbusExperiments = Config.channel.isNightlyOrDebug
 
     /**
-     * Enables the Nimbus experiments library, especially the settings toggle to opt-out of
-     * all experiments.
+     * Enables WebAuthn support.
      */
-    // IMPORTANT: Only turn this back on once the following issues are resolved:
-    // - https://github.com/mozilla-mobile/fenix/issues/17086: Calls to
-    // getExperimentBranch seem to block on updateExperiments causing a
-    // large performance regression loading the home screen.
-    // - https://github.com/mozilla-mobile/fenix/issues/17143: Despite
-    // having wrapped getExperimentBranch/withExperiments in a catch-all
-    // users are still experiencing crashes.
-    const val nimbusExperiments = false
-
-    /**
-     * Enables the new MediaSession API.
-     */
-    @Suppress("MayBeConst")
-    val newMediaSessionApi = true
+    val webAuthFeature = Config.channel.isNightlyOrDebug
 
     /**
-     * Enables experimental WebAuthn support. This implementation should never reach release!
+     * Shows new three-dot toolbar menu design.
      */
-    val webAuthFeature = Config.channel.isNightlyOrDebug
+    val toolbarMenuFeature = Config.channel.isDebug
 }
diff --git a/app/src/main/java/org/mozilla/fenix/FenixApplication.kt b/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
index f76b5ffb3..0731fbb72 100644
--- a/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
+++ b/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
@@ -20,7 +20,6 @@ import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
 import mozilla.appservices.Megazord
-import mozilla.components.browser.session.Session
 import mozilla.components.browser.state.action.SystemAction
 import mozilla.components.browser.state.selector.selectedTab
 import mozilla.components.concept.base.crash.Breadcrumb
@@ -30,6 +29,7 @@ import mozilla.components.lib.crash.CrashReporter
 import mozilla.components.service.glean.Glean
 import mozilla.components.service.glean.config.Configuration
 import mozilla.components.service.glean.net.ConceptFetchHttpUploader
+import mozilla.components.support.base.facts.register
 import mozilla.components.support.base.log.Log
 import mozilla.components.support.base.log.logger.Logger
 import mozilla.components.support.ktx.android.content.isMainProcess
@@ -39,9 +39,12 @@ import mozilla.components.support.rusthttp.RustHttpConfig
 import mozilla.components.support.rustlog.RustLog
 import mozilla.components.support.utils.logElapsedTime
 import mozilla.components.support.webextensions.WebExtensionSupport
+import org.mozilla.fenix.GleanMetrics.PerfStartup
 import org.mozilla.fenix.components.Components
 import org.mozilla.fenix.components.metrics.MetricServiceType
+import org.mozilla.fenix.components.metrics.SecurePrefsTelemetry
 import org.mozilla.fenix.ext.settings
+import org.mozilla.fenix.perf.ProfilerMarkerFactProcessor
 import org.mozilla.fenix.perf.StartupTimeline
 import org.mozilla.fenix.perf.StorageStatsMetrics
 import org.mozilla.fenix.perf.runBlockingIncrement
@@ -70,6 +73,7 @@ open class FenixApplication : LocaleAwareApplication(), Provider {
         private set
 
     override fun onCreate() {
+        val methodDurationTimerId = PerfStartup.applicationOnCreate.start() // DO NOT MOVE ANYTHING ABOVE HERE.
         super.onCreate()
 
         setupInAllProcesses()
@@ -91,6 +95,9 @@ open class FenixApplication : LocaleAwareApplication(), Provider {
         }
 
         setupInMainProcessOnly()
+
+        // We use start/stop instead of measure so we don't measure outside the main process.
+        PerfStartup.applicationOnCreate.stopAndAccumulate(methodDurationTimerId) // DO NOT MOVE ANYTHING BELOW HERE.
     }
 
     protected open fun initializeGlean() {
@@ -119,6 +126,8 @@ open class FenixApplication : LocaleAwareApplication(), Provider {
 
     @CallSuper
     open fun setupInMainProcessOnly() {
+        ProfilerMarkerFactProcessor.create { components.core.engine.profiler }.register()
+
         run {
             // Attention: Do not invoke any code from a-s in this scope.
             val megazordSetup = setupMegazord()
@@ -195,6 +204,8 @@ open class FenixApplication : LocaleAwareApplication(), Provider {
                         components.core.bookmarksStorage.warmUp()
                         components.core.passwordsStorage.warmUp()
                     }
+
+                    SecurePrefsTelemetry(this@FenixApplication, components.analytics.experiments).startTests()
                 }
                 // Account manager initialization needs to happen on the main thread.
                 GlobalScope.launch(Dispatchers.Main) {
@@ -307,6 +318,10 @@ open class FenixApplication : LocaleAwareApplication(), Provider {
             // ... but RustHttpConfig.setClient() and RustLog.enable() can be called later.
             RustHttpConfig.setClient(lazy { components.core.client })
             RustLog.enable(components.analytics.crashReporter)
+            // We want to ensure Nimbus is initialized as early as possible so we can
+            // experiment on features close to startup.
+            // But we need viaduct (the RustHttp client) to be ready before we do.
+            components.analytics.experiments.initialize()
         }
     }
 
@@ -417,9 +432,19 @@ open class FenixApplication : LocaleAwareApplication(), Provider {
                             components.core.store.state.selectedTab?.content?.private
                                 ?: components.settings.openLinksInAPrivateTab
 
-                        val session = Session(url, shouldCreatePrivateSession)
-                        components.core.sessionManager.add(session, true, engineSession)
-                        session.id
+                        if (shouldCreatePrivateSession) {
+                            components.useCases.tabsUseCases.addPrivateTab(
+                                url = url,
+                                selectTab = true,
+                                engineSession = engineSession
+                            )
+                        } else {
+                            components.useCases.tabsUseCases.addTab(
+                                url = url,
+                                selectTab = true,
+                                engineSession = engineSession
+                            )
+                        }
                 },
                 onCloseTabOverride = {
                     _, sessionId -> components.useCases.tabsUseCases.removeTab(sessionId)
diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
index 64cfb7740..a648c64a7 100644
--- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
+++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
@@ -17,7 +17,7 @@ import android.view.KeyEvent
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewConfiguration
-import android.view.WindowManager
+import android.view.WindowManager.LayoutParams.FLAG_SECURE
 import androidx.annotation.CallSuper
 import androidx.annotation.IdRes
 import androidx.annotation.VisibleForTesting
@@ -52,6 +52,7 @@ import mozilla.components.feature.privatemode.notification.PrivateNotificationFe
 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
 import mozilla.components.support.ktx.android.arch.lifecycle.addObservers
 import mozilla.components.support.ktx.android.content.call
@@ -64,6 +65,7 @@ import mozilla.components.support.utils.SafeIntent
 import mozilla.components.support.utils.toSafeIntent
 import mozilla.components.support.webextensions.WebExtensionPopupFeature
 import org.mozilla.fenix.GleanMetrics.Metrics
+import org.mozilla.fenix.GleanMetrics.PerfStartup
 import org.mozilla.fenix.addons.AddonDetailsFragmentDirections
 import org.mozilla.fenix.addons.AddonPermissionsDetailsFragmentDirections
 import org.mozilla.fenix.browser.browsingmode.BrowsingMode
@@ -91,6 +93,7 @@ import org.mozilla.fenix.library.history.HistoryFragmentDirections
 import org.mozilla.fenix.library.recentlyclosed.RecentlyClosedFragmentDirections
 import org.mozilla.fenix.perf.Performance
 import org.mozilla.fenix.perf.PerformanceInflater
+import org.mozilla.fenix.perf.ProfilerMarkers
 import org.mozilla.fenix.perf.StartupTimeline
 import org.mozilla.fenix.search.SearchDialogFragmentDirections
 import org.mozilla.fenix.session.PrivateNotificationService
@@ -161,7 +164,10 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
 
     private lateinit var navigationToolbar: Toolbar
 
-    final override fun onCreate(savedInstanceState: Bundle?) {
+    final override fun onCreate(savedInstanceState: Bundle?): Unit = PerfStartup.homeActivityOnCreate.measure {
+        // DO NOT MOVE ANYTHING ABOVE THIS addMarker CALL.
+        components.core.engine.profiler?.addMarker("Activity.onCreate", "HomeActivity")
+
         components.strictMode.attachListenerToDisablePenaltyDeath(supportFragmentManager)
         // There is disk read violations on some devices such as samsung and pixel for android 9/10
         components.strictMode.resetAfter(StrictMode.allowThreadDiskReads()) {
@@ -277,6 +283,11 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
     override fun onResume() {
         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
+        // See https://github.com/mozilla-mobile/fenix/issues/11153
+        updateSecureWindowFlags(settings().lastKnownMode)
+
         // Diagnostic breadcrumb for "Display already aquired" crash:
         // https://github.com/mozilla-mobile/android-components/issues/7960
         breadcrumb(
@@ -318,6 +329,8 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
         breadcrumb(
             message = "onStart()"
         )
+
+        ProfilerMarkers.homeActivityOnStart(rootContainer, components.core.engine.profiler)
     }
 
     override fun onStop() {
@@ -340,8 +353,10 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
         settings().shouldReturnToBrowser =
             components.core.store.state.getNormalOrPrivateTabs(private = false).isNotEmpty()
 
+        // Even if screenshots are allowed, we want to hide private content in the recents screen
+        // See https://github.com/mozilla-mobile/fenix/issues/11153
         if (settings().lastKnownMode.isPrivate) {
-            window.addFlags(WindowManager.LayoutParams.FLAG_SECURE)
+            window.addFlags(FLAG_SECURE)
         }
 
         // We will remove this when AC code lands to emit a fact on getTopSites in DefaultTopSitesStorage
@@ -536,6 +551,15 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
         super.onBackPressed()
     }
 
+    final override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        supportFragmentManager.primaryNavigationFragment?.childFragmentManager?.fragments?.forEach {
+            if (it is ActivityResultHandler && it.onActivityResult(requestCode, data, resultCode)) {
+                return
+            }
+        }
+        super.onActivityResult(requestCode, resultCode, data)
+    }
+
     private fun shouldUseCustomBackLongPress(): Boolean {
         val isAndroidN =
             Build.VERSION.SDK_INT == Build.VERSION_CODES.N || Build.VERSION.SDK_INT == Build.VERSION_CODES.N_MR1
@@ -840,7 +864,18 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
 
     protected open fun createBrowsingModeManager(initialMode: BrowsingMode): BrowsingModeManager {
         return DefaultBrowsingModeManager(initialMode, components.settings) { newMode ->
+            updateSecureWindowFlags(newMode)
             themeManager.currentTheme = newMode
+        }.also {
+            updateSecureWindowFlags(initialMode)
+        }
+    }
+
+    fun updateSecureWindowFlags(mode: BrowsingMode = browsingModeManager.mode) {
+        if (mode == BrowsingMode.Private && !settings().allowScreenshotsInPrivateMode) {
+            window.addFlags(FLAG_SECURE)
+        } else {
+            window.clearFlags(FLAG_SECURE)
         }
     }
 
diff --git a/app/src/main/java/org/mozilla/fenix/IntentReceiverActivity.kt b/app/src/main/java/org/mozilla/fenix/IntentReceiverActivity.kt
index 3e84fa22a..0c995371e 100644
--- a/app/src/main/java/org/mozilla/fenix/IntentReceiverActivity.kt
+++ b/app/src/main/java/org/mozilla/fenix/IntentReceiverActivity.kt
@@ -26,6 +26,9 @@ class IntentReceiverActivity : Activity() {
 
     @VisibleForTesting
     override fun onCreate(savedInstanceState: Bundle?) {
+        // DO NOT MOVE ANYTHING ABOVE THIS addMarker CALL.
+        components.core.engine.profiler?.addMarker("Activity.onCreate", "IntentReceiverActivity")
+
         // StrictMode violation on certain devices such as Samsung
         components.strictMode.resetAfter(StrictMode.allowThreadDiskReads()) {
             super.onCreate(savedInstanceState)
diff --git a/app/src/main/java/org/mozilla/fenix/TelemetryMiddleware.kt b/app/src/main/java/org/mozilla/fenix/TelemetryMiddleware.kt
index c5c64df0a..53a55bdfd 100644
--- a/app/src/main/java/org/mozilla/fenix/TelemetryMiddleware.kt
+++ b/app/src/main/java/org/mozilla/fenix/TelemetryMiddleware.kt
@@ -8,17 +8,23 @@ import androidx.annotation.VisibleForTesting
 import mozilla.components.browser.state.action.BrowserAction
 import mozilla.components.browser.state.action.ContentAction
 import mozilla.components.browser.state.action.DownloadAction
+import mozilla.components.browser.state.action.EngineAction
 import mozilla.components.browser.state.action.TabListAction
 import mozilla.components.browser.state.selector.findTab
+import mozilla.components.browser.state.selector.findTabOrCustomTab
 import mozilla.components.browser.state.selector.normalTabs
 import mozilla.components.browser.state.state.BrowserState
+import mozilla.components.browser.state.state.EngineState
+import mozilla.components.browser.state.state.SessionState
 import mozilla.components.lib.state.Middleware
 import mozilla.components.lib.state.MiddlewareContext
+import mozilla.components.support.base.android.Clock
 import mozilla.components.support.base.log.logger.Logger
 import org.mozilla.fenix.components.metrics.Event
 import org.mozilla.fenix.components.metrics.MetricController
 import org.mozilla.fenix.search.telemetry.ads.AdsTelemetry
 import org.mozilla.fenix.utils.Settings
+import org.mozilla.fenix.GleanMetrics.Engine as EngineMetrics
 
 /**
  * [Middleware] to record telemetry in response to [BrowserAction]s.
@@ -49,7 +55,7 @@ class TelemetryMiddleware(
         }
     }
 
-    @Suppress("TooGenericExceptionCaught", "ComplexMethod")
+    @Suppress("TooGenericExceptionCaught", "ComplexMethod", "NestedBlockDepth")
     override fun invoke(
         context: MiddlewareContext<BrowserState, BrowserAction>,
         next: (BrowserAction) -> Unit,
@@ -60,8 +66,12 @@ class TelemetryMiddleware(
             is ContentAction.UpdateLoadingStateAction -> {
                 context.state.findTab(action.sessionId)?.let { tab ->
                     // Record UriOpened event when a non-private page finishes loading
-                    if (tab.content.loading && !action.loading && !tab.content.private) {
-                        metrics.track(Event.UriOpened)
+                    if (tab.content.loading && !action.loading) {
+                        if (!tab.content.private) {
+                            metrics.track(Event.UriOpened)
+                        }
+
+                        metrics.track(Event.NormalAndPrivateUriOpened)
                     }
                 }
             }
@@ -90,6 +100,10 @@ class TelemetryMiddleware(
             is DownloadAction.AddDownloadAction -> {
                 metrics.track(Event.DownloadAdded)
             }
+            is EngineAction.KillEngineSessionAction -> {
+                val tab = context.state.findTabOrCustomTab(action.sessionId)
+                onEngineSessionKilled(context.state, tab)
+            }
         }
 
         next(action)
@@ -104,7 +118,44 @@ class TelemetryMiddleware(
             is TabListAction.RestoreAction -> {
                 // Update/Persist tabs count whenever it changes
                 settings.openTabsCount = context.state.normalTabs.count()
+                if (context.state.normalTabs.count() > 0) {
+                    metrics.track(Event.HaveOpenTabs)
+                } else {
+                    metrics.track(Event.HaveNoOpenTabs)
+                }
             }
         }
     }
+
+    /**
+     * Collecting some engine-specific (GeckoView) telemetry.
+     * https://github.com/mozilla-mobile/android-components/issues/9366
+     */
+    private fun onEngineSessionKilled(state: BrowserState, tab: SessionState?) {
+        if (tab == null) {
+            logger.debug("Could not find tab for killed engine session")
+            return
+        }
+
+        val isSelected = tab.id == state.selectedTabId
+        val ageNanos = tab.engineState.ageNanos()
+
+        // Increment the counter of killed foreground/background tabs
+        val tabKillLabel = if (isSelected) { "foreground" } else { "background" }
+        EngineMetrics.tabKills[tabKillLabel].add()
+
+        // Record the age of the engine session of the killed foreground/background tab.
+        if (isSelected && ageNanos != null) {
+            EngineMetrics.killForegroundAge.setRawNanos(ageNanos)
+        } else if (ageNanos != null) {
+            EngineMetrics.killBackgroundAge.setRawNanos(ageNanos)
+        }
+    }
+}
+
+@Suppress("MagicNumber")
+private fun EngineState.ageNanos(): Long? {
+    val timestamp = (timestamp ?: return null)
+    val now = Clock.elapsedRealtime()
+    return (now - timestamp) * 1_000_000
 }
diff --git a/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt b/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt
index a98a767a9..64c77733d 100644
--- a/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt
@@ -38,6 +38,7 @@ import mozilla.components.feature.addons.ui.PermissionsDialogFragment
 import mozilla.components.feature.addons.ui.translateName
 import io.github.forkmaintainers.iceraven.components.PagedAddonInstallationDialogFragment
 import io.github.forkmaintainers.iceraven.components.PagedAddonsManagerAdapter
+import org.mozilla.fenix.GleanMetrics.Addons
 import org.mozilla.fenix.R
 import org.mozilla.fenix.components.FenixSnackbar
 import org.mozilla.fenix.components.metrics.Event
@@ -357,6 +358,7 @@ class AddonsManagementFragment : Fragment(R.layout.fragment_add_ons_management)
                     adapter?.updateAddon(it)
                     addonProgressOverlay?.visibility = View.GONE
                     showInstallationDialog(it)
+                    Addons.hasInstalledAddons.set(true)
                 }
             },
             onError = { _, e ->
diff --git a/app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt b/app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt
index c3fbcce10..c154aa4f9 100644
--- a/app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt
@@ -21,6 +21,7 @@ import kotlinx.coroutines.launch
 import mozilla.components.feature.addons.Addon
 import mozilla.components.feature.addons.AddonManagerException
 import mozilla.components.feature.addons.ui.translateName
+import org.mozilla.fenix.GleanMetrics.Addons
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
 import org.mozilla.fenix.ext.components
@@ -127,6 +128,7 @@ class InstalledAddonDetailsFragment : Fragment() {
                                     )
                                 )
                             }
+                            Addons.hasEnabledAddons.set(true)
                         }
                     },
                     onError = {
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 60dfe78f3..ecc49681e 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
@@ -6,6 +6,7 @@ package org.mozilla.fenix.browser
 
 import android.content.Context
 import android.content.Intent
+import android.content.res.Configuration
 import android.os.Build
 import android.os.Bundle
 import android.view.Gravity
@@ -37,13 +38,15 @@ import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import mozilla.appservices.places.BookmarkRoot
-import mozilla.components.browser.session.Session
 import mozilla.components.browser.state.action.ContentAction
+import mozilla.components.browser.state.selector.findCustomTab
 import mozilla.components.browser.state.selector.findCustomTabOrSelectedTab
 import mozilla.components.browser.state.selector.findTab
+import mozilla.components.browser.state.selector.findTabOrCustomTab
 import mozilla.components.browser.state.selector.findTabOrCustomTabOrSelectedTab
 import mozilla.components.browser.state.selector.getNormalOrPrivateTabs
 import mozilla.components.browser.state.selector.selectedTab
+import mozilla.components.browser.state.state.CustomTabSessionState
 import mozilla.components.browser.state.state.SessionState
 import mozilla.components.browser.state.state.TabSessionState
 import mozilla.components.browser.state.state.content.DownloadState
@@ -57,6 +60,7 @@ import mozilla.components.feature.contextmenu.ContextMenuCandidate
 import mozilla.components.feature.contextmenu.ContextMenuFeature
 import mozilla.components.feature.downloads.DownloadsFeature
 import mozilla.components.feature.downloads.manager.FetchDownloadManager
+import mozilla.components.feature.downloads.share.ShareDownloadFeature
 import mozilla.components.feature.intent.ext.EXTRA_SESSION_ID
 import mozilla.components.feature.media.fullscreen.MediaSessionFullscreenFeature
 import mozilla.components.feature.privatemode.feature.SecureWindowFeature
@@ -68,7 +72,6 @@ import mozilla.components.feature.session.FullScreenFeature
 import mozilla.components.feature.session.PictureInPictureFeature
 import mozilla.components.feature.session.SessionFeature
 import mozilla.components.feature.session.SwipeRefreshFeature
-import mozilla.components.feature.session.behavior.EngineViewBottomBehavior
 import mozilla.components.feature.sitepermissions.SitePermissions
 import mozilla.components.feature.sitepermissions.SitePermissionsFeature
 import mozilla.components.lib.state.ext.consumeFlow
@@ -81,6 +84,7 @@ import mozilla.components.support.ktx.android.view.exitImmersiveModeIfNeeded
 import mozilla.components.support.ktx.android.view.hideKeyboard
 import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifAnyChanged
 import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifChanged
+import org.mozilla.fenix.BuildConfig
 import org.mozilla.fenix.FeatureFlags
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.IntentReceiverActivity
@@ -100,9 +104,7 @@ import org.mozilla.fenix.components.toolbar.BrowserToolbarView
 import org.mozilla.fenix.components.toolbar.BrowserToolbarViewInteractor
 import org.mozilla.fenix.components.toolbar.DefaultBrowserToolbarController
 import org.mozilla.fenix.components.toolbar.DefaultBrowserToolbarMenuController
-import org.mozilla.fenix.components.toolbar.SwipeRefreshScrollingViewBehavior
 import org.mozilla.fenix.components.toolbar.ToolbarIntegration
-import org.mozilla.fenix.components.toolbar.ToolbarPosition
 import org.mozilla.fenix.downloads.DownloadService
 import org.mozilla.fenix.downloads.DynamicDownloadDialog
 import org.mozilla.fenix.ext.accessibilityManager
@@ -124,8 +126,10 @@ import org.mozilla.fenix.theme.ThemeManager
 import org.mozilla.fenix.utils.allowUndo
 import org.mozilla.fenix.wifi.SitePermissionsWifiIntegration
 import java.lang.ref.WeakReference
-import mozilla.components.feature.media.fullscreen.MediaFullscreenOrientationFeature
-import org.mozilla.fenix.FeatureFlags.newMediaSessionApi
+import mozilla.components.feature.session.behavior.EngineViewBrowserToolbarBehavior
+import mozilla.components.feature.webauthn.WebAuthnFeature
+import mozilla.components.support.base.feature.ActivityResultHandler
+import mozilla.components.feature.session.behavior.ToolbarPosition as MozacToolbarPosition
 
 /**
  * Base fragment extended by [BrowserFragment].
@@ -134,7 +138,7 @@ import org.mozilla.fenix.FeatureFlags.newMediaSessionApi
  */
 @ExperimentalCoroutinesApi
 @Suppress("TooManyFunctions", "LargeClass")
-abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler,
+abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, ActivityResultHandler,
     OnBackLongPressedListener, AccessibilityManager.AccessibilityStateChangeListener {
 
     private lateinit var browserFragmentStore: BrowserFragmentStore
@@ -157,6 +161,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler,
     private val sessionFeature = ViewBoundFeatureWrapper<SessionFeature>()
     private val contextMenuFeature = ViewBoundFeatureWrapper<ContextMenuFeature>()
     private val downloadsFeature = ViewBoundFeatureWrapper<DownloadsFeature>()
+    private val shareDownloadsFeature = ViewBoundFeatureWrapper<ShareDownloadFeature>()
     private val appLinksFeature = ViewBoundFeatureWrapper<AppLinksFeature>()
     private val promptsFeature = ViewBoundFeatureWrapper<PromptFeature>()
     private val findInPageIntegration = ViewBoundFeatureWrapper<FindInPageIntegration>()
@@ -168,8 +173,6 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler,
     private val sitePermissionWifiIntegration =
         ViewBoundFeatureWrapper<SitePermissionsWifiIntegration>()
     private val secureWindowFeature = ViewBoundFeatureWrapper<SecureWindowFeature>()
-    private var fullScreenMediaFeature =
-        ViewBoundFeatureWrapper<MediaFullscreenOrientationFeature>()
     private var fullScreenMediaSessionFeature =
         ViewBoundFeatureWrapper<MediaSessionFullscreenFeature>()
     private val searchFeature = ViewBoundFeatureWrapper<SearchFeature>()
@@ -253,7 +256,6 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler,
     @CallSuper
     internal open fun initializeUI(view: View, tab: SessionState) {
         val context = requireContext()
-        val sessionManager = context.components.core.sessionManager
         val store = context.components.core.store
         val activity = requireActivity() as HomeActivity
 
@@ -280,14 +282,14 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler,
         )
         val browserToolbarController = DefaultBrowserToolbarController(
             store = store,
+            tabsUseCases = requireComponents.useCases.tabsUseCases,
             activity = activity,
             navController = findNavController(),
             metrics = requireComponents.analytics.metrics,
             readerModeController = readerMenuController,
-            sessionManager = requireComponents.core.sessionManager,
             engineView = engineView,
             homeViewModel = homeViewModel,
-            customTabSession = customTabSessionId?.let { sessionManager.findSessionById(it) },
+            customTabSessionId = customTabSessionId,
             onTabCounterClicked = {
                 thumbnailsFeature.get()?.requestScreenshot()
                 findNavController().nav(
@@ -317,17 +319,17 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler,
             }
         )
         val browserToolbarMenuController = DefaultBrowserToolbarMenuController(
+            store = store,
             activity = activity,
             navController = findNavController(),
             metrics = requireComponents.analytics.metrics,
             settings = context.settings(),
             readerModeController = readerMenuController,
-            sessionManager = requireComponents.core.sessionManager,
             sessionFeature = sessionFeature,
             findInPageLauncher = { findInPageIntegration.withFeature { it.launch() } },
             swipeRefresh = swipeRefresh,
             browserAnimator = browserAnimator,
-            customTabSession = customTabSessionId?.let { sessionManager.findSessionById(it) },
+            customTabSessionId = customTabSessionId,
             openInFenixIntent = openInFenixIntent,
             bookmarkTapped = { url: String, title: String ->
                 viewLifecycleOwner.lifecycleScope.launch {
@@ -349,7 +351,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler,
             container = view.browserLayout,
             toolbarPosition = context.settings().toolbarPosition,
             interactor = browserInteractor,
-            customTabSession = customTabSessionId?.let { sessionManager.findSessionById(it) },
+            customTabSession = customTabSessionId?.let { store.state.findCustomTab(it) },
             lifecycleOwner = viewLifecycleOwner
         )
 
@@ -405,25 +407,21 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler,
             view = view
         )
 
-        if (newMediaSessionApi) {
-            fullScreenMediaSessionFeature.set(
-                feature = MediaSessionFullscreenFeature(
-                    requireActivity(),
-                    context.components.core.store
-                ),
-                owner = this,
-                view = view
-            )
-        } else {
-            fullScreenMediaFeature.set(
-                feature = MediaFullscreenOrientationFeature(
-                    requireActivity(),
-                    context.components.core.store
-                ),
-                owner = this,
-                view = view
-            )
-        }
+        fullScreenMediaSessionFeature.set(
+            feature = MediaSessionFullscreenFeature(
+                requireActivity(),
+                context.components.core.store
+            ),
+            owner = this,
+            view = view
+        )
+
+        val shareDownloadFeature = ShareDownloadFeature(
+            context = context.applicationContext,
+            httpClient = context.components.core.client,
+            store = store,
+            tabId = customTabSessionId
+        )
 
         val downloadFeature = DownloadsFeature(
             context.applicationContext,
@@ -461,9 +459,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler,
 
         downloadFeature.onDownloadStopped = { downloadState, _, downloadJobStatus ->
             // If the download is just paused, don't show any in-app notification
-            if (downloadJobStatus == DownloadState.Status.COMPLETED ||
-                downloadJobStatus == DownloadState.Status.FAILED
-            ) {
+            if (shouldShowCompletedDownloadDialog(downloadState, downloadJobStatus)) {
 
                 saveDownloadDialogState(
                     downloadState.sessionId,
@@ -491,19 +487,22 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler,
                     onDismiss = { sharedViewModel.downloadDialogState.remove(downloadState.sessionId) }
                 )
 
-                // Don't show the dialog if we aren't in the tab that started the download
-                if (downloadState.sessionId == sessionManager.selectedSession?.id) {
-                    dynamicDownloadDialog.show()
-                    browserToolbarView.expand()
-                }
+                dynamicDownloadDialog.show()
+                browserToolbarView.expand()
             }
         }
 
         resumeDownloadDialogState(
-            sessionManager.selectedSession?.id,
+            getCurrentTab()?.id,
             store, view, context, toolbarHeight
         )
 
+        shareDownloadsFeature.set(
+            shareDownloadFeature,
+            owner = this,
+            view = view
+        )
+
         downloadsFeature.set(
             downloadFeature,
             owner = this,
@@ -532,7 +531,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler,
 
         promptsFeature.set(
             feature = PromptFeature(
-                fragment = this,
+                activity = activity,
                 store = store,
                 customTabId = customTabSessionId,
                 fragmentManager = parentFragmentManager,
@@ -553,7 +552,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler,
                         val directions = NavGraphDirections.actionGlobalShareFragment(
                             data = arrayOf(shareData),
                             showPage = true,
-                            sessionId = getSessionById()?.id
+                            sessionId = getCurrentTab()?.id
                         )
                         findNavController().navigate(directions)
                     }
@@ -587,14 +586,14 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler,
 
         searchFeature.set(
             feature = SearchFeature(store, customTabSessionId) { request, tabId ->
-                val parentSession = sessionManager.findSessionById(tabId)
+                val parentSession = store.state.findTabOrCustomTab(tabId)
                 val useCase = if (request.isPrivate) {
                     requireComponents.useCases.searchUseCases.newPrivateTabSearch
                 } else {
                     requireComponents.useCases.searchUseCases.newTabSearch
                 }
 
-                if (parentSession?.isCustomTabSession() == true) {
+                if (parentSession is CustomTabSessionState) {
                     useCase.invoke(request.query)
                     requireActivity().startActivity(openInFenixIntent)
                 } else {
@@ -643,7 +642,8 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler,
             view = view
         )
 
-        if (FeatureFlags.webAuthFeature) {
+        // This component feature only works on Fenix when built on Mozilla infrastructure.
+        if (FeatureFlags.webAuthFeature && BuildConfig.MOZILLA_OFFICIAL) {
             webAuthnFeature.set(
                 feature = WebAuthnFeature(
                     engine = requireComponents.core.engine,
@@ -818,34 +818,37 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler,
                 !inFullScreen
     }
 
-    private fun initializeEngineView(toolbarHeight: Int) {
+    @VisibleForTesting
+    internal fun initializeEngineView(toolbarHeight: Int) {
         val context = requireContext()
 
-        if (context.settings().isDynamicToolbarEnabled) {
-            engineView.setDynamicToolbarMaxHeight(toolbarHeight)
+        if (!context.settings().shouldUseFixedTopToolbar && context.settings().isDynamicToolbarEnabled) {
+            getEngineView().setDynamicToolbarMaxHeight(toolbarHeight)
 
-            val behavior = when (context.settings().toolbarPosition) {
-                // Set engineView dynamic vertical clipping depending on the toolbar position.
-                ToolbarPosition.BOTTOM -> EngineViewBottomBehavior(context, null)
-                // Set scroll flags depending on if if the browser or the website is doing the scroll.
-                ToolbarPosition.TOP -> SwipeRefreshScrollingViewBehavior(
+            val toolbarPosition = if (context.settings().shouldUseBottomToolbar) {
+                MozacToolbarPosition.BOTTOM
+            } else {
+                MozacToolbarPosition.TOP
+            }
+            (getSwipeRefreshLayout().layoutParams as CoordinatorLayout.LayoutParams).behavior =
+                EngineViewBrowserToolbarBehavior(
                     context,
                     null,
-                    engineView,
-                    browserToolbarView
+                    getSwipeRefreshLayout(),
+                    toolbarHeight,
+                    toolbarPosition
                 )
-            }
-
-            (swipeRefresh.layoutParams as CoordinatorLayout.LayoutParams).behavior = behavior
         } else {
             // Ensure webpage's bottom elements are aligned to the very bottom of the engineView.
-            engineView.setDynamicToolbarMaxHeight(0)
+            getEngineView().setDynamicToolbarMaxHeight(0)
 
-            // Effectively place the engineView on top of the toolbar if that is not dynamic.
+            // Effectively place the engineView on top/below of the toolbar if that is not dynamic.
+            val swipeRefreshParams =
+                getSwipeRefreshLayout().layoutParams as CoordinatorLayout.LayoutParams
             if (context.settings().shouldUseBottomToolbar) {
-                val browserEngine = swipeRefresh.layoutParams as CoordinatorLayout.LayoutParams
-                browserEngine.bottomMargin =
-                    requireContext().resources.getDimensionPixelSize(R.dimen.browser_toolbar_height)
+                swipeRefreshParams.bottomMargin = toolbarHeight
+            } else {
+                swipeRefreshParams.topMargin = toolbarHeight
             }
         }
     }
@@ -1009,7 +1012,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler,
     final override fun onViewStateRestored(savedInstanceState: Bundle?) {
         super.onViewStateRestored(savedInstanceState)
         savedInstanceState?.getString(KEY_CUSTOM_TAB_SESSION_ID)?.let {
-            if (requireComponents.core.sessionManager.findSessionById(it)?.customTabConfig != null) {
+            if (requireComponents.core.store.state.findCustomTab(it) != null) {
                 customTabSessionId = it
             }
         }
@@ -1033,10 +1036,10 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler,
     }
 
     /**
-     * Forwards activity results to the prompt feature.
+     * Forwards activity results to the [ActivityResultHandler] features.
      */
-    final override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        listOf(
+    override fun onActivityResult(requestCode: Int, data: Intent?, resultCode: Int): Boolean {
+        return listOf(
             promptsFeature,
             webAuthnFeature
         ).any { it.onActivityResult(requestCode, data, resultCode) }
@@ -1047,22 +1050,18 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler,
      * or if it has a parent session and no more history
      */
     protected open fun removeSessionIfNeeded(): Boolean {
-        getSessionById()?.let { session ->
+        getCurrentTab()?.let { session ->
             return if (session.source == SessionState.Source.ACTION_VIEW) {
                 activity?.finish()
-                requireComponents.useCases.tabsUseCases.removeTab(session)
+                requireComponents.useCases.tabsUseCases.removeTab(session.id)
                 true
             } else {
-                if (session.hasParentSession) {
-                    // The removeTab use case does not currently select a parent session, so
-                    // we are using sessionManager.remove
-                    requireComponents.core.sessionManager.remove(
-                        session,
-                        selectParentIfExists = true
-                    )
+                val hasParentSession = session is TabSessionState && session.parentId != null
+                if (hasParentSession) {
+                    requireComponents.useCases.tabsUseCases.removeTab(session.id, selectParentIfExists = true)
                 }
                 // We want to return to home if this session didn't have a parent session to select.
-                val goToOverview = !session.hasParentSession
+                val goToOverview = !hasParentSession
                 !goToOverview
             }
         }
@@ -1127,20 +1126,8 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler,
         (activity as HomeActivity).browsingModeManager.mode = sessionMode
     }
 
-    /**
-     * Returns the current session.
-     */
-    protected fun getSessionById(): Session? {
-        val sessionManager = requireComponents.core.sessionManager
-        val localCustomTabId = customTabSessionId
-        return if (localCustomTabId != null) {
-            sessionManager.findSessionById(localCustomTabId)
-        } else {
-            sessionManager.selectedSession
-        }
-    }
-
-    private fun getCurrentTab(): SessionState? {
+    @VisibleForTesting
+    internal fun getCurrentTab(): SessionState? {
         return requireComponents.core.store.state.findCustomTabOrSelectedTab(customTabSessionId)
     }
 
@@ -1228,12 +1215,14 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler,
                 .setText(getString(R.string.full_screen_notification))
                 .show()
             activity?.enterToImmersiveMode()
+            browserToolbarView.collapse()
             browserToolbarView.view.isVisible = false
             val browserEngine = swipeRefresh.layoutParams as CoordinatorLayout.LayoutParams
             browserEngine.bottomMargin = 0
+            browserEngine.topMargin = 0
+            swipeRefresh.translationY = 0f
 
             engineView.setDynamicToolbarMaxHeight(0)
-            browserToolbarView.expand()
             // Without this, fullscreen has a margin at the top.
             engineView.setVerticalClipping(0)
 
@@ -1247,6 +1236,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler,
                 browserToolbarView.view.isVisible = true
                 val toolbarHeight = resources.getDimensionPixelSize(R.dimen.browser_toolbar_height)
                 initializeEngineView(toolbarHeight)
+                browserToolbarView.expand()
             }
         }
 
@@ -1310,10 +1300,16 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler,
 
     override fun onAccessibilityStateChanged(enabled: Boolean) {
         if (_browserToolbarView != null) {
-            browserToolbarView.setScrollFlags(enabled)
+            browserToolbarView.setToolbarBehavior(enabled)
         }
     }
 
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+
+        _browserToolbarView?.dismissMenu()
+    }
+
     // This method is called in response to native web extension messages from
     // content scripts (e.g the reader view extension). By the time these
     // messages are processed the fragment/view may no longer be attached.
@@ -1326,4 +1322,28 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler,
             }
         }
     }
+
+    /**
+     * Convenience method for replacing EngineView (id/engineView) in unit tests.
+     */
+    @VisibleForTesting
+    internal fun getEngineView() = engineView
+
+    /**
+     * Convenience method for replacing SwipeRefreshLayout (id/swipeRefresh) in unit tests.
+     */
+    @VisibleForTesting
+    internal fun getSwipeRefreshLayout() = swipeRefresh
+
+    @VisibleForTesting
+    internal fun shouldShowCompletedDownloadDialog(
+        downloadState: DownloadState,
+        status: DownloadState.Status
+    ): Boolean {
+
+        val isValidStatus = status in listOf(DownloadState.Status.COMPLETED, DownloadState.Status.FAILED)
+        val isSameTab = downloadState.sessionId == getCurrentTab()?.id ?: false
+
+        return isValidStatus && isSameTab
+    }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
index 042d33a3b..58515a908 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
@@ -69,7 +69,7 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
                     tabPreview = tabPreview,
                     toolbarLayout = browserToolbarView.view,
                     store = components.core.store,
-                    sessionManager = components.core.sessionManager
+                    selectTabUseCase = components.useCases.tabsUseCases.selectTab
                 )
             )
         }
@@ -84,7 +84,7 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
                 visible = {
                     readerModeAvailable
                 },
-                selected = getSessionById()?.let {
+                selected = getCurrentTab()?.let {
                         activity?.components?.core?.store?.state?.findTab(it.id)?.readerState?.active
                     } ?: false,
                 listener = browserInteractor::onReaderModePressed
@@ -137,7 +137,8 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
                     navController = findNavController(),
                     settings = context.settings(),
                     appLinksUseCases = context.components.useCases.appLinksUseCases,
-                    container = browserLayout as ViewGroup
+                    container = browserLayout as ViewGroup,
+                    shouldScrollWithTopToolbar = !context.settings().shouldUseBottomToolbar
                 ),
                 owner = this,
                 view = view
diff --git a/app/src/main/java/org/mozilla/fenix/browser/CustomTabContextMenuCandidate.kt b/app/src/main/java/org/mozilla/fenix/browser/CustomTabContextMenuCandidate.kt
index ed96a50cd..4753360c3 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/CustomTabContextMenuCandidate.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/CustomTabContextMenuCandidate.kt
@@ -29,6 +29,7 @@ class CustomTabContextMenuCandidate {
             ),
             ContextMenuCandidate.createShareLinkCandidate(context),
             ContextMenuCandidate.createSaveImageCandidate(context, contextMenuUseCases),
+            ContextMenuCandidate.createSaveVideoAudioCandidate(context, contextMenuUseCases),
             ContextMenuCandidate.createCopyImageLocationCandidate(
                 context,
                 snackBarParentView,
diff --git a/app/src/main/java/org/mozilla/fenix/browser/OpenInAppOnboardingObserver.kt b/app/src/main/java/org/mozilla/fenix/browser/OpenInAppOnboardingObserver.kt
index 1d129a027..9205a26bd 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/OpenInAppOnboardingObserver.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/OpenInAppOnboardingObserver.kt
@@ -22,6 +22,11 @@ import mozilla.components.support.base.feature.LifecycleAwareFeature
 import mozilla.components.support.ktx.kotlin.tryGetHostFromUrl
 import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifAnyChanged
 import org.mozilla.fenix.R
+import org.mozilla.fenix.browser.infobanner.DynamicInfoBanner
+import org.mozilla.fenix.browser.infobanner.InfoBanner
+import org.mozilla.fenix.components.metrics.Event
+import org.mozilla.fenix.components.metrics.Event.BannerOpenInAppGoToSettings
+import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.nav
 import org.mozilla.fenix.utils.Settings
 
@@ -37,7 +42,9 @@ class OpenInAppOnboardingObserver(
     private val navController: NavController,
     private val settings: Settings,
     private val appLinksUseCases: AppLinksUseCases,
-    private val container: ViewGroup
+    private val container: ViewGroup,
+    @VisibleForTesting
+    internal val shouldScrollWithTopToolbar: Boolean = false
 ) : LifecycleAwareFeature {
     private var scope: CoroutineScope? = null
     private var currentUrl: String? = null
@@ -85,22 +92,30 @@ class OpenInAppOnboardingObserver(
             infoBanner?.showBanner()
             sessionDomainForDisplayedBanner = url.tryGetHostFromUrl()
             settings.shouldShowOpenInAppBanner = false
+            context.components.analytics.metrics.track(Event.BannerOpenInAppDisplayed)
         }
     }
 
     @VisibleForTesting
-    internal fun createInfoBanner(): InfoBanner {
-        return InfoBanner(
+    internal fun createInfoBanner(): DynamicInfoBanner {
+        return DynamicInfoBanner(
             context = context,
             message = context.getString(R.string.open_in_app_cfr_info_message),
             dismissText = context.getString(R.string.open_in_app_cfr_negative_button_text),
             actionText = context.getString(R.string.open_in_app_cfr_positive_button_text),
-            container = container
+            container = container,
+            shouldScrollWithTopToolbar = shouldScrollWithTopToolbar,
+            dismissAction = ::dismissAction
         ) {
             val directions = BrowserFragmentDirections.actionBrowserFragmentToSettingsFragment(
                 preferenceToScrollTo = context.getString(R.string.pref_key_open_links_in_external_app)
             )
+            context.components.analytics.metrics.track(BannerOpenInAppGoToSettings)
             navController.nav(R.id.browserFragment, directions)
         }
     }
+
+    private fun dismissAction() {
+        context.components.analytics.metrics.track(Event.BannerOpenInAppDismissed)
+    }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/browser/ToolbarGestureHandler.kt b/app/src/main/java/org/mozilla/fenix/browser/ToolbarGestureHandler.kt
index da19ec785..d6284bc4b 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/ToolbarGestureHandler.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/ToolbarGestureHandler.kt
@@ -17,16 +17,16 @@ import androidx.core.graphics.contains
 import androidx.core.graphics.toPoint
 import androidx.core.view.isVisible
 import androidx.interpolator.view.animation.LinearOutSlowInInterpolator
-import mozilla.components.browser.session.Session
-import mozilla.components.browser.session.SessionManager
+import mozilla.components.browser.state.selector.getNormalOrPrivateTabs
 import mozilla.components.browser.state.selector.selectedTab
+import mozilla.components.browser.state.state.TabSessionState
 import mozilla.components.browser.state.store.BrowserStore
+import mozilla.components.feature.tabs.TabsUseCases
 import mozilla.components.support.ktx.android.view.getRectWithViewLocation
 import org.mozilla.fenix.R
 import org.mozilla.fenix.ext.getRectWithScreenLocation
 import org.mozilla.fenix.ext.getWindowInsets
 import org.mozilla.fenix.ext.isKeyboardVisible
-import org.mozilla.fenix.ext.sessionsOfType
 import org.mozilla.fenix.ext.settings
 import kotlin.math.abs
 import kotlin.math.max
@@ -43,7 +43,7 @@ class ToolbarGestureHandler(
     private val tabPreview: TabPreview,
     private val toolbarLayout: View,
     private val store: BrowserStore,
-    private val sessionManager: SessionManager
+    private val selectTabUseCase: TabsUseCases.SelectTabUseCase
 ) : SwipeGestureListener {
 
     private enum class GestureDirection {
@@ -51,7 +51,7 @@ class ToolbarGestureHandler(
     }
 
     private sealed class Destination {
-        data class Tab(val session: Session) : Destination()
+        data class Tab(val tab: TabSessionState) : Destination()
         object None : Destination()
     }
 
@@ -140,7 +140,7 @@ class ToolbarGestureHandler(
     ) {
         val destination = getDestination()
         if (destination is Destination.Tab && isGestureComplete(velocityX)) {
-            animateToNextTab(destination.session)
+            animateToNextTab(destination.tab)
         } else {
             animateCanceledGesture(velocityX)
         }
@@ -149,14 +149,14 @@ class ToolbarGestureHandler(
     private fun getDestination(): Destination {
         val isLtr = activity.resources.configuration.layoutDirection == View.LAYOUT_DIRECTION_LTR
         val currentTab = store.state.selectedTab ?: return Destination.None
-        val currentIndex = sessionManager.sessionsOfType(currentTab.content.private).indexOfFirst {
+        val currentIndex = store.state.getNormalOrPrivateTabs(currentTab.content.private).indexOfFirst {
             it.id == currentTab.id
         }
 
         return if (currentIndex == -1) {
             Destination.None
         } else {
-            val sessions = sessionManager.sessionsOfType(currentTab.content.private)
+            val tabs = store.state.getNormalOrPrivateTabs(currentTab.content.private)
             val index = when (gestureDirection) {
                 GestureDirection.RIGHT_TO_LEFT -> if (isLtr) {
                     currentIndex + 1
@@ -170,8 +170,8 @@ class ToolbarGestureHandler(
                 }
             }
 
-            if (index < sessions.count() && index >= 0) {
-                Destination.Tab(sessions.elementAt(index))
+            if (index < tabs.count() && index >= 0) {
+                Destination.Tab(tabs.elementAt(index))
             } else {
                 Destination.None
             }
@@ -180,7 +180,7 @@ class ToolbarGestureHandler(
 
     private fun preparePreview(destination: Destination) {
         val thumbnailId = when (destination) {
-            is Destination.Tab -> destination.session.id
+            is Destination.Tab -> destination.tab.id
             is Destination.None -> return
         }
 
@@ -233,7 +233,7 @@ class ToolbarGestureHandler(
         }
     }
 
-    private fun animateToNextTab(session: Session) {
+    private fun animateToNextTab(tab: TabSessionState) {
         val browserFinalXCoordinate: Float = when (gestureDirection) {
             GestureDirection.RIGHT_TO_LEFT -> -windowWidth.toFloat() - previewOffset
             GestureDirection.LEFT_TO_RIGHT -> windowWidth.toFloat() + previewOffset
@@ -243,7 +243,7 @@ class ToolbarGestureHandler(
         getAnimator(browserFinalXCoordinate, FINISHED_GESTURE_ANIMATION_DURATION).apply {
             doOnEnd {
                 contentLayout.translationX = 0f
-                sessionManager.select(session)
+                selectTabUseCase(tab.id)
 
                 // Fade out the tab preview to prevent flickering
                 val shortAnimationDuration =
diff --git a/app/src/main/java/org/mozilla/fenix/browser/WebAuthnFeature.kt b/app/src/main/java/org/mozilla/fenix/browser/WebAuthnFeature.kt
deleted file mode 100644
index 24576f932..000000000
--- a/app/src/main/java/org/mozilla/fenix/browser/WebAuthnFeature.kt
+++ /dev/null
@@ -1,62 +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.browser
-
-import android.app.Activity
-import android.content.Intent
-import android.content.IntentSender
-import mozilla.components.concept.engine.Engine
-import mozilla.components.concept.engine.activity.ActivityDelegate
-import mozilla.components.support.base.feature.ActivityResultHandler
-import mozilla.components.support.base.feature.LifecycleAwareFeature
-import mozilla.components.support.base.log.logger.Logger
-import org.mozilla.fenix.FeatureFlags
-
-/**
- * This implementation of the WebAuthnFeature is only for testing in a nightly signed build.
- *
- * ⚠️ This should always be behind the [FeatureFlags.webAuthFeature] nightly flag.
- */
-class WebAuthnFeature(
-    private val engine: Engine,
-    private val activity: Activity
-) : LifecycleAwareFeature, ActivityResultHandler {
-    val logger = Logger("WebAuthnFeature")
-    var requestCode = ACTIVITY_REQUEST_CODE
-    var resultCallback: ((Intent?) -> Unit)? = null
-    private val delegate = object : ActivityDelegate {
-        override fun startIntentSenderForResult(intent: IntentSender, onResult: (Intent?) -> Unit) {
-            val code = requestCode++
-            logger.info("Received activity delegate request with code: $code intent: $intent")
-            activity.startIntentSenderForResult(intent, code, null, 0, 0, 0)
-            resultCallback = onResult
-        }
-    }
-
-    override fun start() {
-        logger.info("Feature started.")
-        engine.registerActivityDelegate(delegate)
-    }
-
-    override fun stop() {
-        logger.info("Feature stopped.")
-        engine.unregisterActivityDelegate()
-    }
-
-    override fun onActivityResult(requestCode: Int, data: Intent?, resultCode: Int): Boolean {
-        logger.info("Received activity result with code: $requestCode\ndata: $data")
-        if (this.requestCode == requestCode) {
-            logger.info("Invoking callback!")
-            resultCallback?.invoke(data)
-            return true
-        }
-
-        return false
-    }
-
-    companion object {
-        const val ACTIVITY_REQUEST_CODE = 10
-    }
-}
diff --git a/app/src/main/java/org/mozilla/fenix/browser/infobanner/DynamicInfoBanner.kt b/app/src/main/java/org/mozilla/fenix/browser/infobanner/DynamicInfoBanner.kt
new file mode 100644
index 000000000..83e11465c
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/browser/infobanner/DynamicInfoBanner.kt
@@ -0,0 +1,42 @@
+/* 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.browser.infobanner
+
+import android.content.Context
+import android.view.ViewGroup
+import androidx.annotation.VisibleForTesting
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+
+/**
+ * [InfoBanner] that will automatically scroll with the top [BrowserToolbar].
+ * Only to be used with [BrowserToolbar]s placed at the top of the screen.
+ *
+ * @param shouldScrollWithTopToolbar whether to follow the Y translation of the top toolbar or not
+ */
+@Suppress("LongParameterList")
+class DynamicInfoBanner(
+    private val context: Context,
+    container: ViewGroup,
+    @VisibleForTesting
+    internal val shouldScrollWithTopToolbar: Boolean = false,
+    message: String,
+    dismissText: String,
+    actionText: String? = null,
+    dismissByHiding: Boolean = false,
+    dismissAction: (() -> Unit)? = null,
+    actionToPerform: (() -> Unit)? = null
+) : InfoBanner(
+    context, container, message, dismissText, actionText, dismissByHiding, dismissAction, actionToPerform
+) {
+    override fun showBanner() {
+        super.showBanner()
+
+        if (shouldScrollWithTopToolbar) {
+            (bannerLayout.layoutParams as CoordinatorLayout.LayoutParams).behavior = DynamicInfoBannerBehavior(
+                context, null
+            )
+        }
+    }
+}
diff --git a/app/src/main/java/org/mozilla/fenix/browser/infobanner/DynamicInfoBannerBehavior.kt b/app/src/main/java/org/mozilla/fenix/browser/infobanner/DynamicInfoBannerBehavior.kt
new file mode 100644
index 000000000..752826248
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/browser/infobanner/DynamicInfoBannerBehavior.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.browser.infobanner
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import androidx.annotation.VisibleForTesting
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import mozilla.components.browser.toolbar.BrowserToolbar
+
+/**
+ * A [CoordinatorLayout.Behavior] implementation to be used when placing [InfoBanner]
+ * below the BrowserToolbar with which is has to scroll.
+ *
+ * This Behavior will keep the Y translations of [InfoBanner] and the top [BrowserToolbar] in sync
+ * so that the banner will be shown between:
+ * - the top of the container, being translated over the initial toolbar height (toolbar fully collapsed)
+ * - immediately below the toolbar (toolbar fully expanded).
+ */
+class DynamicInfoBannerBehavior(
+    context: Context?,
+    attrs: AttributeSet?
+) : CoordinatorLayout.Behavior<View>(context, attrs) {
+    @VisibleForTesting
+    internal var toolbarHeight: Int = 0
+
+    override fun layoutDependsOn(parent: CoordinatorLayout, child: View, dependency: View): Boolean {
+        if (dependency::class == BrowserToolbar::class) {
+            toolbarHeight = dependency.height
+            setBannerYTranslation(child, dependency.translationY)
+            return true
+        }
+
+        return super.layoutDependsOn(parent, child, dependency)
+    }
+
+    override fun onDependentViewChanged(parent: CoordinatorLayout, child: View, dependency: View): Boolean {
+        setBannerYTranslation(child, dependency.translationY)
+
+        return true
+    }
+
+    @VisibleForTesting
+    internal fun setBannerYTranslation(banner: View, newYTranslation: Float) {
+        banner.translationY = toolbarHeight + newYTranslation
+    }
+}
diff --git a/app/src/main/java/org/mozilla/fenix/browser/InfoBanner.kt b/app/src/main/java/org/mozilla/fenix/browser/infobanner/InfoBanner.kt
similarity index 85%
rename from app/src/main/java/org/mozilla/fenix/browser/InfoBanner.kt
rename to app/src/main/java/org/mozilla/fenix/browser/infobanner/InfoBanner.kt
index d7f4187cc..1d1ba4041 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/InfoBanner.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/infobanner/InfoBanner.kt
@@ -2,15 +2,14 @@
  * 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.browser
+package org.mozilla.fenix.browser.infobanner
 
 import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View.GONE
 import android.view.ViewGroup
-import android.view.ViewGroup.LayoutParams.MATCH_PARENT
-import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
+import androidx.annotation.VisibleForTesting
 import kotlinx.android.synthetic.main.info_banner.view.*
 import org.mozilla.fenix.R
 import org.mozilla.fenix.ext.settings
@@ -27,7 +26,7 @@ import org.mozilla.fenix.ext.settings
  * @param actionToPerform - The action to be performed on action button press
  */
 @SuppressWarnings("LongParameterList")
-class InfoBanner(
+open class InfoBanner(
     private val context: Context,
     private val container: ViewGroup,
     private val message: String,
@@ -38,10 +37,11 @@ class InfoBanner(
     private val actionToPerform: (() -> Unit)? = null
 ) {
     @SuppressLint("InflateParams")
-    private val bannerLayout = LayoutInflater.from(context)
+    @VisibleForTesting
+    internal val bannerLayout = LayoutInflater.from(context)
         .inflate(R.layout.info_banner, null)
 
-    internal fun showBanner() {
+    internal open fun showBanner() {
         bannerLayout.banner_info_message.text = message
         bannerLayout.dismiss.text = dismissText
 
@@ -53,10 +53,6 @@ class InfoBanner(
 
         container.addView(bannerLayout)
 
-        val params = bannerLayout.layoutParams as ViewGroup.LayoutParams
-        params.height = WRAP_CONTENT
-        params.width = MATCH_PARENT
-
         bannerLayout.dismiss.setOnClickListener {
             dismissAction?.invoke()
             if (dismissByHiding) { bannerLayout.visibility = GONE } else { dismiss() }
diff --git a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationStore.kt b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationStore.kt
index c9fffedb8..8e45a1d72 100644
--- a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationStore.kt
+++ b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationStore.kt
@@ -15,7 +15,6 @@ import mozilla.components.lib.state.State
 import mozilla.components.lib.state.Store
 import org.mozilla.fenix.collections.CollectionCreationAction.StepChanged
 import org.mozilla.fenix.components.TabCollectionStorage
-import org.mozilla.fenix.ext.getMediaStateForSession
 import org.mozilla.fenix.ext.toShortUrl
 import org.mozilla.fenix.home.Tab
 
@@ -87,12 +86,11 @@ internal fun BrowserState.getTabs(
 ): List<Tab> {
     return tabIds
         ?.mapNotNull { id -> findTab(id) }
-        ?.map { it.toTab(this, publicSuffixList) }
+        ?.map { it.toTab(publicSuffixList) }
         .orEmpty()
 }
 
 private fun TabSessionState.toTab(
-    state: BrowserState,
     publicSuffixList: PublicSuffixList
 ): Tab {
     val url = readerState.activeUrl ?: content.url
@@ -102,8 +100,7 @@ private fun TabSessionState.toTab(
         hostname = url.toShortUrl(publicSuffixList),
         title = content.title,
         selected = null,
-        icon = content.icon,
-        mediaState = state.getMediaStateForSession(this.id)
+        icon = content.icon
     )
 }
 
diff --git a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationView.kt b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationView.kt
index 0edcb6c29..7b23249a9 100644
--- a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationView.kt
+++ b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationView.kt
@@ -5,6 +5,7 @@
 package org.mozilla.fenix.collections
 
 import android.os.Handler
+import android.os.Looper
 import android.text.InputFilter
 import android.view.KeyEvent
 import android.view.LayoutInflater
@@ -19,7 +20,6 @@ import androidx.transition.Transition
 import androidx.transition.TransitionManager
 import kotlinx.android.extensions.LayoutContainer
 import kotlinx.android.synthetic.main.component_collection_creation.*
-import mozilla.components.browser.state.state.MediaState
 import mozilla.components.feature.tab.collections.TabCollection
 import mozilla.components.support.ktx.android.view.hideKeyboard
 import mozilla.components.support.ktx.android.view.showKeyboard
@@ -169,7 +169,7 @@ class CollectionCreationView(
             text = context.getString(R.string.create_collection_name_collection)
             setOnClickListener {
                 name_collection_edittext.hideKeyboard()
-                val handler = Handler()
+                val handler = Handler(Looper.getMainLooper())
                 handler.postDelayed({
                     interactor.onBackPressed(SaveCollectionStep.NameCollection)
                 }, TRANSITION_DURATION)
@@ -197,8 +197,7 @@ class CollectionCreationView(
                     sessionId = tab.id.toString(),
                     url = tab.url,
                     hostname = tab.url.toShortUrl(publicSuffixList),
-                    title = tab.title,
-                    mediaState = MediaState.State.NONE
+                    title = tab.title
                 )
             }.let { tabs ->
                 collectionCreationTabListAdapter.updateData(tabs, tabs.toSet(), true)
@@ -216,7 +215,7 @@ class CollectionCreationView(
             text = context.getString(R.string.collection_rename)
             setOnClickListener {
                 name_collection_edittext.hideKeyboard()
-                val handler = Handler()
+                val handler = Handler(Looper.getMainLooper())
                 handler.postDelayed({
                     interactor.onBackPressed(SaveCollectionStep.RenameCollection)
                 }, TRANSITION_DURATION)
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 e0d49dd17..9197287b8 100644
--- a/app/src/main/java/org/mozilla/fenix/components/Analytics.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/Analytics.kt
@@ -24,6 +24,7 @@ import org.mozilla.fenix.components.metrics.AdjustMetricsService
 import org.mozilla.fenix.components.metrics.GleanMetricsService
 import org.mozilla.fenix.components.metrics.LeanplumMetricsService
 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
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 73c8038a6..52ba15e31 100644
--- a/app/src/main/java/org/mozilla/fenix/components/Components.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/Components.kt
@@ -56,6 +56,7 @@ class Components(private val context: Context) {
     }
     val services by lazyMonitored { Services(context, backgroundServices.accountManager) }
     val core by lazyMonitored { Core(context, analytics.crashReporter, strictMode) }
+    @Suppress("Deprecation")
     val useCases by lazyMonitored {
         UseCases(
             context,
@@ -66,6 +67,7 @@ class Components(private val context: Context) {
             core.topSitesStorage
         )
     }
+    @Suppress("Deprecation")
     val intentProcessors by lazyMonitored {
         IntentProcessors(
             context,
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 96b6b504a..41dfa2543 100644
--- a/app/src/main/java/org/mozilla/fenix/components/Core.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/Core.kt
@@ -18,7 +18,6 @@ import mozilla.components.browser.session.Session
 import mozilla.components.browser.session.SessionManager
 import mozilla.components.browser.session.engine.EngineMiddleware
 import mozilla.components.browser.session.storage.SessionStorage
-import mozilla.components.browser.session.undo.UndoMiddleware
 import mozilla.components.browser.state.state.BrowserState
 import mozilla.components.browser.state.store.BrowserStore
 import mozilla.components.browser.storage.sync.PlacesBookmarksStorage
@@ -35,7 +34,6 @@ import mozilla.components.feature.customtabs.store.CustomTabsServiceStore
 import mozilla.components.feature.downloads.DownloadMiddleware
 import mozilla.components.feature.logins.exceptions.LoginExceptionStorage
 import mozilla.components.feature.media.MediaSessionFeature
-import mozilla.components.feature.media.middleware.MediaMiddleware
 import mozilla.components.feature.media.middleware.RecordingDevicesMiddleware
 import mozilla.components.feature.pwa.ManifestStorage
 import mozilla.components.feature.pwa.WebAppShortcutManager
@@ -44,6 +42,8 @@ import mozilla.components.feature.recentlyclosed.RecentlyClosedMiddleware
 import mozilla.components.feature.search.middleware.SearchMiddleware
 import mozilla.components.feature.search.region.RegionMiddleware
 import mozilla.components.feature.session.HistoryDelegate
+import mozilla.components.feature.session.middleware.LastAccessMiddleware
+import mozilla.components.feature.session.middleware.undo.UndoMiddleware
 import mozilla.components.feature.top.sites.DefaultTopSitesStorage
 import mozilla.components.feature.top.sites.PinnedSiteStorage
 import mozilla.components.feature.webcompat.WebCompatFeature
@@ -61,7 +61,6 @@ import mozilla.components.support.locale.LocaleManager
 import org.mozilla.fenix.AppRequestInterceptor
 import org.mozilla.fenix.BuildConfig
 import org.mozilla.fenix.Config
-import org.mozilla.fenix.FeatureFlags.newMediaSessionApi
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
 import org.mozilla.fenix.TelemetryMiddleware
@@ -69,7 +68,6 @@ import org.mozilla.fenix.components.search.SearchMigration
 import org.mozilla.fenix.downloads.DownloadService
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.settings
-import org.mozilla.fenix.media.MediaService
 import org.mozilla.fenix.media.MediaSessionService
 import org.mozilla.fenix.perf.StrictModeManager
 import org.mozilla.fenix.perf.lazyMonitored
@@ -178,6 +176,7 @@ class Core(
     val store by lazyMonitored {
         val middlewareList =
             mutableListOf(
+                LastAccessMiddleware(),
                 RecentlyClosedMiddleware(context, RECENTLY_CLOSED_MAX, engine),
                 DownloadMiddleware(context, DownloadService::class.java),
                 ReaderViewMiddleware(),
@@ -197,19 +196,17 @@ class Core(
                 RecordingDevicesMiddleware(context)
             )
 
-        if (!newMediaSessionApi) {
-            middlewareList.add(MediaMiddleware(context, MediaService::class.java))
-        }
-
         BrowserStore(
             middleware = middlewareList + EngineMiddleware.create(engine, ::findSessionById)
         )
     }
 
+    @Suppress("Deprecation")
     private fun lookupSessionManager(): SessionManager {
         return sessionManager
     }
 
+    @Suppress("Deprecation")
     private fun findSessionById(tabId: String): Session? {
         return sessionManager.findSessionById(tabId)
     }
@@ -232,6 +229,7 @@ class Core(
      * sessions from the [SessionStorage], and with a default session (about:blank) in
      * case all sessions/tabs are closed.
      */
+    @Deprecated("Use browser store (for reading) and use cases (for writing) instead")
     val sessionManager by lazyMonitored {
         SessionManager(engine, store).also {
             // Install the "icons" WebExtension to automatically load icons for every visited website.
@@ -248,9 +246,7 @@ class Core(
                 permissionStorage.permissionsStorage, HomeActivity::class.java
             )
 
-            if (newMediaSessionApi) {
-                MediaSessionFeature(context, MediaSessionService::class.java, store).start()
-            }
+            MediaSessionFeature(context, MediaSessionService::class.java, store).start()
         }
     }
 
diff --git a/app/src/main/java/org/mozilla/fenix/components/metrics/Event.kt b/app/src/main/java/org/mozilla/fenix/components/metrics/Event.kt
index cb475e7e5..1f0b41d4c 100644
--- a/app/src/main/java/org/mozilla/fenix/components/metrics/Event.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/metrics/Event.kt
@@ -9,6 +9,7 @@ import mozilla.components.browser.errorpages.ErrorType
 import mozilla.components.browser.state.search.SearchEngine
 import mozilla.components.feature.top.sites.TopSite
 import org.mozilla.fenix.GleanMetrics.Addons
+import org.mozilla.fenix.GleanMetrics.AndroidKeystoreExperiment
 import org.mozilla.fenix.GleanMetrics.AppTheme
 import org.mozilla.fenix.GleanMetrics.Autoplay
 import org.mozilla.fenix.GleanMetrics.Collections
@@ -52,6 +53,7 @@ sealed class Event {
     object CustomTabsActionTapped : Event()
     object CustomTabsMenuOpened : Event()
     object UriOpened : Event()
+    object NormalAndPrivateUriOpened : Event()
     object SyncAuthOpened : Event()
     object SyncAuthClosed : Event()
     object SyncAuthSignUp : Event()
@@ -198,12 +200,21 @@ sealed class Event {
     object SyncedTabOpened : Event()
 
     object RecentlyClosedTabsOpened : Event()
+    object HaveOpenTabs : Event()
+    object HaveNoOpenTabs : Event()
+
+    object BannerOpenInAppDisplayed : Event()
+    object BannerOpenInAppDismissed : Event()
+    object BannerOpenInAppGoToSettings : Event()
 
     object ContextMenuCopyTapped : Event()
     object ContextMenuSearchTapped : Event()
     object ContextMenuSelectAllTapped : Event()
     object ContextMenuShareTapped : Event()
 
+    object HaveTopSites : Event()
+    object HaveNoTopSites : Event()
+
     // Interaction events with extras
 
     data class TopSiteSwipeCarousel(val page: Int) : Event() {
@@ -211,6 +222,25 @@ sealed class Event {
             get() = hashMapOf(TopSites.swipeCarouselKeys.page to page.toString())
     }
 
+    data class SecurePrefsExperimentFailure(val failureException: String) : Event() {
+        override val extras =
+            mapOf(AndroidKeystoreExperiment.experimentFailureKeys.failureException to failureException)
+    }
+    data class SecurePrefsGetFailure(val failureException: String) : Event() {
+        override val extras =
+            mapOf(AndroidKeystoreExperiment.getFailureKeys.failureException to failureException)
+    }
+    data class SecurePrefsGetSuccess(val successCode: String) : Event() {
+        override val extras =
+            mapOf(AndroidKeystoreExperiment.getResultKeys.result to successCode)
+    }
+    data class SecurePrefsWriteFailure(val failureException: String) : Event() {
+        override val extras =
+            mapOf(AndroidKeystoreExperiment.writeFailureKeys.failureException to failureException)
+    }
+    object SecurePrefsWriteSuccess : Event()
+    object SecurePrefsReset : Event()
+
     data class TopSiteLongPress(val type: TopSite.Type) : Event() {
         override val extras: Map<TopSites.longPressKeys, String>?
             get() = hashMapOf(TopSites.longPressKeys.type to type.name)
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 af9cb5a4a..d28e40d21 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
@@ -15,8 +15,10 @@ import mozilla.components.support.base.log.logger.Logger
 import org.mozilla.fenix.Config
 import org.mozilla.fenix.GleanMetrics.AboutPage
 import org.mozilla.fenix.GleanMetrics.Addons
+import org.mozilla.fenix.GleanMetrics.AndroidKeystoreExperiment
 import org.mozilla.fenix.GleanMetrics.AppTheme
 import org.mozilla.fenix.GleanMetrics.Autoplay
+import org.mozilla.fenix.GleanMetrics.BannerOpenInApp
 import org.mozilla.fenix.GleanMetrics.BookmarksManagement
 import org.mozilla.fenix.GleanMetrics.BrowserSearch
 import org.mozilla.fenix.GleanMetrics.Collections
@@ -236,6 +238,9 @@ private val Event.wrapper: EventWrapper<*>?
         is Event.UriOpened -> EventWrapper<NoExtraKeys>(
             { Events.totalUriCount.add(1) }
         )
+        is Event.NormalAndPrivateUriOpened -> EventWrapper<NoExtraKeys>(
+            { Events.normalAndPrivateUriCount.add(1) }
+        )
         is Event.ErrorPageVisited -> EventWrapper(
             { ErrorPage.visitedError.record(it) },
             { ErrorPage.visitedErrorKeys.valueOf(it) }
@@ -723,6 +728,51 @@ private val Event.wrapper: EventWrapper<*>?
         is Event.ContextMenuShareTapped -> EventWrapper<NoExtraKeys>(
             { ContextualMenu.shareTapped.record(it) }
         )
+        Event.HaveOpenTabs -> EventWrapper<NoExtraKeys>(
+            { Metrics.hasOpenTabs.set(true) }
+        )
+        Event.HaveNoOpenTabs -> EventWrapper<NoExtraKeys>(
+            { Metrics.hasOpenTabs.set(false) }
+        )
+        Event.HaveTopSites -> EventWrapper<NoExtraKeys>(
+            { Metrics.hasTopSites.set(true) }
+        )
+        Event.HaveNoTopSites -> EventWrapper<NoExtraKeys>(
+            { Metrics.hasTopSites.set(false) }
+        )
+
+        is Event.BannerOpenInAppDisplayed -> EventWrapper<NoExtraKeys>(
+            { BannerOpenInApp.displayed.record(it) }
+        )
+        is Event.BannerOpenInAppDismissed -> EventWrapper<NoExtraKeys>(
+            { BannerOpenInApp.dismissed.record(it) }
+        )
+        is Event.BannerOpenInAppGoToSettings -> EventWrapper<NoExtraKeys>(
+            { BannerOpenInApp.goToSettings.record(it) }
+        )
+
+        is Event.SecurePrefsExperimentFailure -> EventWrapper(
+            { AndroidKeystoreExperiment.experimentFailure.record(it) },
+            { AndroidKeystoreExperiment.experimentFailureKeys.valueOf(it) }
+        )
+        is Event.SecurePrefsGetFailure -> EventWrapper(
+            { AndroidKeystoreExperiment.getFailure.record(it) },
+            { AndroidKeystoreExperiment.getFailureKeys.valueOf(it) }
+        )
+        is Event.SecurePrefsGetSuccess -> EventWrapper(
+            { AndroidKeystoreExperiment.getResult.record(it) },
+            { AndroidKeystoreExperiment.getResultKeys.valueOf(it) }
+        )
+        is Event.SecurePrefsWriteFailure -> EventWrapper(
+            { AndroidKeystoreExperiment.writeFailure.record(it) },
+            { AndroidKeystoreExperiment.writeFailureKeys.valueOf(it) }
+        )
+        is Event.SecurePrefsWriteSuccess -> EventWrapper<NoExtraKeys>(
+            { AndroidKeystoreExperiment.writeSuccess.record(it) }
+        )
+        is Event.SecurePrefsReset -> EventWrapper<NoExtraKeys>(
+            { AndroidKeystoreExperiment.reset.record(it) }
+        )
 
         // Don't record other events in Glean:
         is Event.AddBookmark -> null
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 3b31385c2..7f9aed10a 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
@@ -22,6 +22,8 @@ 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.pwa.ProgressiveWebAppFacts
+import mozilla.components.feature.top.sites.facts.TopSitesFacts
+import mozilla.components.lib.dataprotect.SecurePrefsReliabilityExperiment
 import mozilla.components.support.base.Component
 import mozilla.components.support.base.facts.Action
 import mozilla.components.support.base.facts.Fact
@@ -75,6 +77,7 @@ internal class DebugMetricController(
 }
 
 @VisibleForTesting
+@Suppress("LargeClass")
 internal class ReleaseMetricController(
     private val services: List<MetricsService>,
     private val isDataTelemetryEnabled: () -> Boolean,
@@ -134,6 +137,13 @@ internal class ReleaseMetricController(
             }
     }
 
+    @VisibleForTesting
+    internal fun factToEvent(
+        fact: Fact
+    ): Event? {
+        return fact.toEvent()
+    }
+
     private fun isInitialized(type: MetricServiceType): Boolean = initialized.contains(type)
 
     private fun isTelemetryEnabled(type: MetricServiceType): Boolean = when (type) {
@@ -242,6 +252,43 @@ internal class ReleaseMetricController(
         Component.FEATURE_PWA to ProgressiveWebAppFacts.Items.INSTALL_SHORTCUT -> {
             Event.ProgressiveWebAppInstallAsShortcut
         }
+        Component.FEATURE_TOP_SITES to TopSitesFacts.Items.COUNT -> {
+            value?.let {
+                var count = 0
+                try {
+                    count = it.toInt()
+                } catch (e: NumberFormatException) {
+                    // Do nothing
+                }
+
+                return if (count > 0) {
+                    Event.HaveTopSites
+                } else {
+                    Event.HaveNoTopSites
+                }
+            }
+            null
+        }
+        Component.LIB_DATAPROTECT to SecurePrefsReliabilityExperiment.Companion.Actions.EXPERIMENT -> {
+            Event.SecurePrefsExperimentFailure(metadata?.get("javaClass") as String? ?: "null")
+        }
+        Component.LIB_DATAPROTECT to SecurePrefsReliabilityExperiment.Companion.Actions.GET -> {
+            if (SecurePrefsReliabilityExperiment.Companion.Values.FAIL.v == value?.toInt()) {
+                Event.SecurePrefsGetFailure(metadata?.get("javaClass") as String? ?: "null")
+            } else {
+                Event.SecurePrefsGetSuccess(value ?: "")
+            }
+        }
+        Component.LIB_DATAPROTECT to SecurePrefsReliabilityExperiment.Companion.Actions.WRITE -> {
+            if (SecurePrefsReliabilityExperiment.Companion.Values.FAIL.v == value?.toInt()) {
+                Event.SecurePrefsWriteFailure(metadata?.get("javaClass") as String? ?: "null")
+            } else {
+                Event.SecurePrefsWriteSuccess
+            }
+        }
+        Component.LIB_DATAPROTECT to SecurePrefsReliabilityExperiment.Companion.Actions.RESET -> {
+            Event.SecurePrefsReset
+        }
         else -> null
     }
 
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
new file mode 100644
index 000000000..47a34497a
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/components/metrics/SecurePrefsTelemetry.kt
@@ -0,0 +1,35 @@
+/* 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.metrics
+
+import android.content.Context
+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.ext.withExperiment
+
+/**
+ * Allows starting a quick test of ACs SecureAbove22Preferences that will emit Facts
+ * for the basic operations and allow us to log them for later evaluation of APIs stability.
+ */
+class SecurePrefsTelemetry(
+    private val appContext: Context,
+    private val experiments: NimbusApi
+) {
+    suspend fun startTests() {
+        // 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 ->
+                // .. 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/toolbar/BrowserToolbarController.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
index 69c384865..942390abd 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
@@ -5,11 +5,14 @@
 package org.mozilla.fenix.components.toolbar
 
 import androidx.navigation.NavController
-import mozilla.components.browser.session.Session
-import mozilla.components.browser.session.SessionManager
 import mozilla.components.browser.state.action.ContentAction
+import mozilla.components.browser.state.selector.findCustomTabOrSelectedTab
+import mozilla.components.browser.state.selector.getNormalOrPrivateTabs
+import mozilla.components.browser.state.selector.selectedTab
+import mozilla.components.browser.state.state.SessionState
 import mozilla.components.browser.state.store.BrowserStore
 import mozilla.components.concept.engine.EngineView
+import mozilla.components.feature.tabs.TabsUseCases
 import mozilla.components.support.ktx.kotlin.isUrl
 import mozilla.components.ui.tabcounter.TabCounterMenu
 import org.mozilla.fenix.HomeActivity
@@ -22,7 +25,6 @@ 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.nav
-import org.mozilla.fenix.ext.sessionsOfType
 import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.home.HomeScreenViewModel
 
@@ -41,20 +43,20 @@ interface BrowserToolbarController {
 
 class DefaultBrowserToolbarController(
     private val store: BrowserStore,
+    private val tabsUseCases: TabsUseCases,
     private val activity: HomeActivity,
     private val navController: NavController,
     private val metrics: MetricController,
     private val readerModeController: ReaderModeController,
-    private val sessionManager: SessionManager,
     private val engineView: EngineView,
     private val homeViewModel: HomeScreenViewModel,
-    private val customTabSession: Session?,
+    private val customTabSessionId: String?,
     private val onTabCounterClicked: () -> Unit,
-    private val onCloseTab: (Session) -> Unit
+    private val onCloseTab: (SessionState) -> Unit
 ) : BrowserToolbarController {
 
     private val currentSession
-        get() = customTabSession ?: sessionManager.selectedSession
+        get() = store.state.findCustomTabOrSelectedTab(customTabSessionId)
 
     override fun handleToolbarPaste(text: String) {
         navController.nav(
@@ -112,18 +114,16 @@ class DefaultBrowserToolbarController(
                 metrics.track(
                     Event.TabCounterMenuItemTapped(Event.TabCounterMenuItemTapped.Item.CLOSE_TAB)
                 )
-                sessionManager.selectedSession?.let {
+                store.state.selectedTab?.let {
                     // When closing the last tab we must show the undo snackbar in the home fragment
-                    if (sessionManager.sessionsOfType(it.private).count() == 1) {
+                    if (store.state.getNormalOrPrivateTabs(it.content.private).count() == 1) {
                         homeViewModel.sessionToDelete = it.id
                         navController.navigate(
                             BrowserFragmentDirections.actionGlobalHome()
                         )
                     } else {
                         onCloseTab.invoke(it)
-                        // The removeTab use case does not currently select a parent session, so
-                        // we are using sessionManager.remove
-                        sessionManager.remove(it, selectParentIfExists = true)
+                        tabsUseCases.removeTab(it.id, selectParentIfExists = true)
                     }
                 }
             }
diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMenuController.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMenuController.kt
index fae8e867a..d72f9b133 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMenuController.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMenuController.kt
@@ -15,9 +15,10 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
 import mozilla.appservices.places.BookmarkRoot
-import mozilla.components.browser.session.Session
-import mozilla.components.browser.session.SessionManager
+import mozilla.components.browser.state.selector.findCustomTabOrSelectedTab
 import mozilla.components.browser.state.selector.findTab
+import mozilla.components.browser.state.selector.selectedTab
+import mozilla.components.browser.state.state.SessionState
 import mozilla.components.browser.state.store.BrowserStore
 import mozilla.components.concept.engine.EngineSession.LoadUrlFlags
 import mozilla.components.concept.engine.prompt.ShareData
@@ -51,19 +52,19 @@ interface BrowserToolbarMenuController {
     fun handleToolbarItemInteraction(item: ToolbarMenu.Item)
 }
 
-@Suppress("LargeClass")
+@Suppress("LargeClass", "ForbiddenComment")
 class DefaultBrowserToolbarMenuController(
+    private val store: BrowserStore,
     private val activity: HomeActivity,
     private val navController: NavController,
     private val metrics: MetricController,
     private val settings: Settings,
     private val readerModeController: ReaderModeController,
     private val sessionFeature: ViewBoundFeatureWrapper<SessionFeature>,
-    private val sessionManager: SessionManager,
     private val findInPageLauncher: () -> Unit,
     private val browserAnimator: BrowserAnimator,
     private val swipeRefresh: SwipeRefreshLayout,
-    private val customTabSession: Session?,
+    private val customTabSessionId: String?,
     private val openInFenixIntent: Intent,
     private val bookmarkTapped: (String, String) -> Unit,
     private val scope: CoroutineScope,
@@ -73,7 +74,7 @@ class DefaultBrowserToolbarMenuController(
 ) : BrowserToolbarMenuController {
 
     private val currentSession
-        get() = customTabSession ?: sessionManager.selectedSession
+        get() = store.state.findCustomTabOrSelectedTab(customTabSessionId)
 
     // We hold onto a reference of the inner scope so that we can override this with the
     // TestCoroutineScope to ensure sequential execution. If we didn't have this, our tests
@@ -84,29 +85,105 @@ class DefaultBrowserToolbarMenuController(
     @Suppress("ComplexMethod", "LongMethod")
     override fun handleToolbarItemInteraction(item: ToolbarMenu.Item) {
         val sessionUseCases = activity.components.useCases.sessionUseCases
+        val customTabUseCases = activity.components.useCases.customTabsUseCases
         trackToolbarItemInteraction(item)
 
         Do exhaustive when (item) {
+            // TODO: These can be removed for https://github.com/mozilla-mobile/fenix/issues/17870
+            // todo === Start ===
+            is ToolbarMenu.Item.InstallToHomeScreen -> {
+                settings.installPwaOpened = true
+                MainScope().launch {
+                    with(activity.components.useCases.webAppUseCases) {
+                        if (isInstallable()) {
+                            addToHomescreen()
+                        } else {
+                            val directions =
+                                BrowserFragmentDirections.actionBrowserFragmentToCreateShortcutFragment()
+                            navController.navigateSafe(R.id.browserFragment, directions)
+                        }
+                    }
+                }
+            }
+            is ToolbarMenu.Item.OpenInFenix -> {
+                customTabSessionId?.let {
+                    // Stop the SessionFeature from updating the EngineView and let it release the session
+                    // from the EngineView so that it can immediately be rendered by a different view once
+                    // we switch to the actual browser.
+                    sessionFeature.get()?.release()
+
+                    // Turn this Session into a regular tab and then select it
+                    customTabUseCases.migrate(customTabSessionId, select = true)
+
+                    // Switch to the actual browser which should now display our new selected session
+                    activity.startActivity(openInFenixIntent.apply {
+                        // We never want to launch the browser in the same task as the external app
+                        // activity. So we force a new task here. IntentReceiverActivity will do the
+                        // right thing and take care of routing to an already existing browser and avoid
+                        // cloning a new one.
+                        flags = flags or Intent.FLAG_ACTIVITY_NEW_TASK
+                    })
+
+                    // Close this activity (and the task) since it is no longer displaying any session
+                    activity.finishAndRemoveTask()
+                }
+            }
+            is ToolbarMenu.Item.Quit -> {
+                // We need to show the snackbar while the browsing data is deleting (if "Delete
+                // browsing data on quit" is activated). After the deletion is over, the snackbar
+                // is dismissed.
+                val snackbar: FenixSnackbar? = activity.getRootView()?.let { v ->
+                    FenixSnackbar.make(
+                        view = v,
+                        duration = Snackbar.LENGTH_LONG,
+                        isDisplayedWithBrowserToolbar = true
+                    )
+                        .setText(v.context.getString(R.string.deleting_browsing_data_in_progress))
+                }
+
+                deleteAndQuit(activity, scope, snackbar)
+            }
+            is ToolbarMenu.Item.ReaderModeAppearance -> {
+                readerModeController.showControls()
+                metrics.track(Event.ReaderModeAppearanceOpened)
+            }
+            is ToolbarMenu.Item.OpenInApp -> {
+                settings.openInAppOpened = true
+
+                val appLinksUseCases = activity.components.useCases.appLinksUseCases
+                val getRedirect = appLinksUseCases.appLinkRedirect
+                currentSession?.let {
+                    val redirect = getRedirect.invoke(it.content.url)
+                    redirect.appIntent?.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+                    appLinksUseCases.openAppLink.invoke(redirect.appIntent)
+                }
+            }
+            // todo === End ===
+
             is ToolbarMenu.Item.Back -> {
                 if (item.viewHistory) {
                     navController.navigate(
                         BrowserFragmentDirections.actionGlobalTabHistoryDialogFragment(
-                            activeSessionId = customTabSession?.id
+                            activeSessionId = customTabSessionId
                         )
                     )
                 } else {
-                    sessionUseCases.goBack.invoke(currentSession)
+                    currentSession?.let {
+                        sessionUseCases.goBack.invoke(it.id)
+                    }
                 }
             }
             is ToolbarMenu.Item.Forward -> {
                 if (item.viewHistory) {
                     navController.navigate(
                         BrowserFragmentDirections.actionGlobalTabHistoryDialogFragment(
-                            activeSessionId = customTabSession?.id
+                            activeSessionId = customTabSessionId
                         )
                     )
                 } else {
-                    sessionUseCases.goForward.invoke(currentSession)
+                    currentSession?.let {
+                        sessionUseCases.goForward.invoke(it.id)
+                    }
                 }
             }
             is ToolbarMenu.Item.Reload -> {
@@ -116,24 +193,46 @@ class DefaultBrowserToolbarMenuController(
                     LoadUrlFlags.none()
                 }
 
-                sessionUseCases.reload.invoke(currentSession, flags = flags)
+                currentSession?.let {
+                    sessionUseCases.reload.invoke(it.id, flags = flags)
+                }
+            }
+            is ToolbarMenu.Item.Stop -> {
+                currentSession?.let {
+                    sessionUseCases.stopLoading.invoke(it.id)
+                }
             }
-            ToolbarMenu.Item.Stop -> sessionUseCases.stopLoading.invoke(currentSession)
-            ToolbarMenu.Item.Settings -> browserAnimator.captureEngineViewAndDrawStatically {
+            is ToolbarMenu.Item.Share -> {
+                val directions = NavGraphDirections.actionGlobalShareFragment(
+                    data = arrayOf(
+                        ShareData(
+                            url = getProperUrl(currentSession),
+                            title = currentSession?.content?.title
+                        )
+                    ),
+                    showPage = true
+                )
+                navController.navigate(directions)
+            }
+            is ToolbarMenu.Item.Settings -> browserAnimator.captureEngineViewAndDrawStatically {
                 val directions = BrowserFragmentDirections.actionBrowserFragmentToSettingsFragment()
                 navController.nav(R.id.browserFragment, directions)
             }
-            ToolbarMenu.Item.SyncedTabs -> browserAnimator.captureEngineViewAndDrawStatically {
+            is ToolbarMenu.Item.SyncedTabs -> browserAnimator.captureEngineViewAndDrawStatically {
                 navController.nav(
                     R.id.browserFragment,
                     BrowserFragmentDirections.actionBrowserFragmentToSyncedTabsFragment()
                 )
             }
-            is ToolbarMenu.Item.RequestDesktop -> sessionUseCases.requestDesktopSite.invoke(
-                item.isChecked,
-                currentSession
-            )
-            ToolbarMenu.Item.AddToTopSites -> {
+            is ToolbarMenu.Item.RequestDesktop -> {
+                currentSession?.let {
+                    sessionUseCases.requestDesktopSite.invoke(
+                        item.isChecked,
+                        it.id
+                    )
+                }
+            }
+            is ToolbarMenu.Item.AddToTopSites -> {
                 scope.launch {
                     val context = swipeRefresh.context
                     val numPinnedSites =
@@ -152,7 +251,7 @@ class DefaultBrowserToolbarMenuController(
                         ioScope.launch {
                             currentSession?.let {
                                 with(activity.components.useCases.topSitesUseCase) {
-                                    addPinnedSites(it.title, it.url)
+                                    addPinnedSites(it.content.title, it.content.url)
                                 }
                             }
                         }.join()
@@ -169,7 +268,7 @@ class DefaultBrowserToolbarMenuController(
                     }
                 }
             }
-            ToolbarMenu.Item.AddToHomeScreen, ToolbarMenu.Item.InstallToHomeScreen -> {
+            is ToolbarMenu.Item.AddToHomeScreen -> {
                 settings.installPwaOpened = true
                 MainScope().launch {
                     with(activity.components.useCases.webAppUseCases) {
@@ -183,31 +282,17 @@ class DefaultBrowserToolbarMenuController(
                     }
                 }
             }
-            ToolbarMenu.Item.Share -> {
-                val directions = NavGraphDirections.actionGlobalShareFragment(
-                    data = arrayOf(
-                        ShareData(
-                            url = getProperUrl(currentSession),
-                            title = currentSession?.title
-                        )
-                    ),
-                    showPage = true
-                )
-                navController.navigate(directions)
-            }
-
-            ToolbarMenu.Item.FindInPage -> {
+            is ToolbarMenu.Item.FindInPage -> {
                 findInPageLauncher()
                 metrics.track(Event.FindInPageOpened)
             }
-
-            ToolbarMenu.Item.AddonsManager -> browserAnimator.captureEngineViewAndDrawStatically {
+            is ToolbarMenu.Item.AddonsManager -> browserAnimator.captureEngineViewAndDrawStatically {
                 navController.nav(
                     R.id.browserFragment,
                     BrowserFragmentDirections.actionGlobalAddonsManagementFragment()
                 )
             }
-            ToolbarMenu.Item.SaveToCollection -> {
+            is ToolbarMenu.Item.SaveToCollection -> {
                 metrics
                     .track(Event.CollectionSaveButtonPressed(TELEMETRY_BROWSER_IDENTIFIER))
 
@@ -225,92 +310,45 @@ class DefaultBrowserToolbarMenuController(
                     navController.nav(R.id.browserFragment, directions)
                 }
             }
-            ToolbarMenu.Item.OpenInFenix -> {
-                // Stop the SessionFeature from updating the EngineView and let it release the session
-                // from the EngineView so that it can immediately be rendered by a different view once
-                // we switch to the actual browser.
-                sessionFeature.get()?.release()
-
-                // Strip the CustomTabConfig to turn this Session into a regular tab and then select it
-                customTabSession!!.customTabConfig = null
-                sessionManager.select(customTabSession)
-
-                // Switch to the actual browser which should now display our new selected session
-                activity.startActivity(openInFenixIntent.apply {
-                    // We never want to launch the browser in the same task as the external app
-                    // activity. So we force a new task here. IntentReceiverActivity will do the
-                    // right thing and take care of routing to an already existing browser and avoid
-                    // cloning a new one.
-                    flags = flags or Intent.FLAG_ACTIVITY_NEW_TASK
-                })
-
-                // Close this activity (and the task) since it is no longer displaying any session
-                activity.finishAndRemoveTask()
-            }
-            ToolbarMenu.Item.Quit -> {
-                // We need to show the snackbar while the browsing data is deleting (if "Delete
-                // browsing data on quit" is activated). After the deletion is over, the snackbar
-                // is dismissed.
-                val snackbar: FenixSnackbar? = activity.getRootView()?.let { v ->
-                    FenixSnackbar.make(
-                        view = v,
-                        duration = Snackbar.LENGTH_LONG,
-                        isDisplayedWithBrowserToolbar = true
-                    )
-                        .setText(v.context.getString(R.string.deleting_browsing_data_in_progress))
-                }
-
-                deleteAndQuit(activity, scope, snackbar)
-            }
-            ToolbarMenu.Item.ReaderModeAppearance -> {
-                readerModeController.showControls()
-                metrics.track(Event.ReaderModeAppearanceOpened)
-            }
-            ToolbarMenu.Item.OpenInApp -> {
-                settings.openInAppOpened = true
-
-                val appLinksUseCases = activity.components.useCases.appLinksUseCases
-                val getRedirect = appLinksUseCases.appLinkRedirect
-                currentSession?.let {
-                    val redirect = getRedirect.invoke(it.url)
-                    redirect.appIntent?.flags = Intent.FLAG_ACTIVITY_NEW_TASK
-                    appLinksUseCases.openAppLink.invoke(redirect.appIntent)
-                }
-            }
-            ToolbarMenu.Item.Bookmark -> {
-                sessionManager.selectedSession?.let {
-                    getProperUrl(it)?.let { url -> bookmarkTapped(url, it.title) }
+            is ToolbarMenu.Item.Bookmark -> {
+                store.state.selectedTab?.let {
+                    getProperUrl(it)?.let { url -> bookmarkTapped(url, it.content.title) }
                 }
             }
-            ToolbarMenu.Item.Bookmarks -> browserAnimator.captureEngineViewAndDrawStatically {
+            is ToolbarMenu.Item.Bookmarks -> browserAnimator.captureEngineViewAndDrawStatically {
                 navController.nav(
                     R.id.browserFragment,
                     BrowserFragmentDirections.actionGlobalBookmarkFragment(BookmarkRoot.Mobile.id)
                 )
             }
-            ToolbarMenu.Item.History -> browserAnimator.captureEngineViewAndDrawStatically {
+            is ToolbarMenu.Item.History -> browserAnimator.captureEngineViewAndDrawStatically {
                 navController.nav(
                     R.id.browserFragment,
                     BrowserFragmentDirections.actionGlobalHistoryFragment()
                 )
             }
 
-            ToolbarMenu.Item.Downloads -> browserAnimator.captureEngineViewAndDrawStatically {
+            is ToolbarMenu.Item.Downloads -> browserAnimator.captureEngineViewAndDrawStatically {
                 navController.nav(
                     R.id.browserFragment,
                     BrowserFragmentDirections.actionGlobalDownloadsFragment()
                 )
             }
+            is ToolbarMenu.Item.NewTab -> {
+                navController.navigate(
+                    BrowserFragmentDirections.actionGlobalHome(focusOnAddressBar = true)
+                )
+            }
         }
     }
 
-    private fun getProperUrl(currentSession: Session?): String? {
+    private fun getProperUrl(currentSession: SessionState?): String? {
         return currentSession?.id?.let {
             val currentTab = browserStore.state.findTab(it)
             if (currentTab?.readerState?.active == true) {
                 currentTab.readerState.activeUrl
             } else {
-                currentSession.url
+                currentSession.content.url
             }
         }
     }
@@ -318,35 +356,38 @@ class DefaultBrowserToolbarMenuController(
     @Suppress("ComplexMethod")
     private fun trackToolbarItemInteraction(item: ToolbarMenu.Item) {
         val eventItem = when (item) {
+            // TODO: These can be removed for https://github.com/mozilla-mobile/fenix/issues/17870
+            // todo === Start ===
+            is ToolbarMenu.Item.OpenInFenix -> Event.BrowserMenuItemTapped.Item.OPEN_IN_FENIX
+            is ToolbarMenu.Item.InstallToHomeScreen -> Event.BrowserMenuItemTapped.Item.ADD_TO_HOMESCREEN
+            is ToolbarMenu.Item.Quit -> Event.BrowserMenuItemTapped.Item.QUIT
+            is ToolbarMenu.Item.ReaderModeAppearance ->
+                Event.BrowserMenuItemTapped.Item.READER_MODE_APPEARANCE
+            is ToolbarMenu.Item.OpenInApp -> Event.BrowserMenuItemTapped.Item.OPEN_IN_APP
+            // todo === End ===
             is ToolbarMenu.Item.Back -> Event.BrowserMenuItemTapped.Item.BACK
             is ToolbarMenu.Item.Forward -> Event.BrowserMenuItemTapped.Item.FORWARD
             is ToolbarMenu.Item.Reload -> Event.BrowserMenuItemTapped.Item.RELOAD
-            ToolbarMenu.Item.Stop -> Event.BrowserMenuItemTapped.Item.STOP
-            ToolbarMenu.Item.Settings -> Event.BrowserMenuItemTapped.Item.SETTINGS
+            is ToolbarMenu.Item.Stop -> Event.BrowserMenuItemTapped.Item.STOP
+            is ToolbarMenu.Item.Share -> Event.BrowserMenuItemTapped.Item.SHARE
+            is ToolbarMenu.Item.Settings -> Event.BrowserMenuItemTapped.Item.SETTINGS
             is ToolbarMenu.Item.RequestDesktop ->
                 if (item.isChecked) {
                     Event.BrowserMenuItemTapped.Item.DESKTOP_VIEW_ON
                 } else {
                     Event.BrowserMenuItemTapped.Item.DESKTOP_VIEW_OFF
                 }
-
-            ToolbarMenu.Item.FindInPage -> Event.BrowserMenuItemTapped.Item.FIND_IN_PAGE
-            ToolbarMenu.Item.OpenInFenix -> Event.BrowserMenuItemTapped.Item.OPEN_IN_FENIX
-            ToolbarMenu.Item.Share -> Event.BrowserMenuItemTapped.Item.SHARE
-            ToolbarMenu.Item.SaveToCollection -> Event.BrowserMenuItemTapped.Item.SAVE_TO_COLLECTION
-            ToolbarMenu.Item.AddToTopSites -> Event.BrowserMenuItemTapped.Item.ADD_TO_TOP_SITES
-            ToolbarMenu.Item.AddToHomeScreen -> Event.BrowserMenuItemTapped.Item.ADD_TO_HOMESCREEN
-            ToolbarMenu.Item.SyncedTabs -> Event.BrowserMenuItemTapped.Item.SYNC_TABS
-            ToolbarMenu.Item.InstallToHomeScreen -> Event.BrowserMenuItemTapped.Item.ADD_TO_HOMESCREEN
-            ToolbarMenu.Item.Quit -> Event.BrowserMenuItemTapped.Item.QUIT
-            ToolbarMenu.Item.ReaderModeAppearance ->
-                Event.BrowserMenuItemTapped.Item.READER_MODE_APPEARANCE
-            ToolbarMenu.Item.OpenInApp -> Event.BrowserMenuItemTapped.Item.OPEN_IN_APP
-            ToolbarMenu.Item.Bookmark -> Event.BrowserMenuItemTapped.Item.BOOKMARK
-            ToolbarMenu.Item.AddonsManager -> Event.BrowserMenuItemTapped.Item.ADDONS_MANAGER
-            ToolbarMenu.Item.Bookmarks -> Event.BrowserMenuItemTapped.Item.BOOKMARKS
-            ToolbarMenu.Item.History -> Event.BrowserMenuItemTapped.Item.HISTORY
-            ToolbarMenu.Item.Downloads -> Event.BrowserMenuItemTapped.Item.DOWNLOADS
+            is ToolbarMenu.Item.FindInPage -> Event.BrowserMenuItemTapped.Item.FIND_IN_PAGE
+            is ToolbarMenu.Item.SaveToCollection -> Event.BrowserMenuItemTapped.Item.SAVE_TO_COLLECTION
+            is ToolbarMenu.Item.AddToTopSites -> Event.BrowserMenuItemTapped.Item.ADD_TO_TOP_SITES
+            is ToolbarMenu.Item.AddToHomeScreen -> Event.BrowserMenuItemTapped.Item.ADD_TO_HOMESCREEN
+            is ToolbarMenu.Item.SyncedTabs -> Event.BrowserMenuItemTapped.Item.SYNC_TABS
+            is ToolbarMenu.Item.Bookmark -> Event.BrowserMenuItemTapped.Item.BOOKMARK
+            is ToolbarMenu.Item.AddonsManager -> Event.BrowserMenuItemTapped.Item.ADDONS_MANAGER
+            is ToolbarMenu.Item.Bookmarks -> Event.BrowserMenuItemTapped.Item.BOOKMARKS
+            is ToolbarMenu.Item.History -> Event.BrowserMenuItemTapped.Item.HISTORY
+            is ToolbarMenu.Item.Downloads -> Event.BrowserMenuItemTapped.Item.DOWNLOADS
+            is ToolbarMenu.Item.NewTab -> Event.BrowserMenuItemTapped.Item.NEW_TAB
         }
 
         metrics.track(Event.BrowserMenuItemTapped(eventItem))
diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt
index 54f91e70f..f50a9595f 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt
@@ -9,25 +9,18 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.LayoutRes
+import androidx.annotation.VisibleForTesting
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.content.ContextCompat
-import androidx.core.view.updateLayoutParams
 import androidx.lifecycle.LifecycleOwner
-import com.google.android.material.appbar.AppBarLayout
-import com.google.android.material.appbar.AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS
-import com.google.android.material.appbar.AppBarLayout.LayoutParams.SCROLL_FLAG_EXIT_UNTIL_COLLAPSED
-import com.google.android.material.appbar.AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL
-import com.google.android.material.appbar.AppBarLayout.LayoutParams.SCROLL_FLAG_SNAP
 import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.component_browser_top_toolbar.*
-import kotlinx.android.synthetic.main.component_browser_top_toolbar.view.*
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import mozilla.components.browser.domains.autocomplete.ShippedDomainsProvider
-import mozilla.components.browser.session.Session
 import mozilla.components.browser.state.selector.selectedTab
+import mozilla.components.browser.state.state.CustomTabSessionState
 import mozilla.components.browser.state.state.ExternalAppType
 import mozilla.components.browser.toolbar.BrowserToolbar
-import mozilla.components.browser.toolbar.behavior.BrowserToolbarBottomBehavior
+import mozilla.components.browser.toolbar.behavior.BrowserToolbarBehavior
 import mozilla.components.browser.toolbar.display.DisplayToolbar
 import mozilla.components.support.utils.URLStringUtils
 import mozilla.components.ui.tabcounter.TabCounterMenu
@@ -40,6 +33,7 @@ import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.theme.ThemeManager
 import org.mozilla.fenix.utils.ToolbarPopupWindow
 import java.lang.ref.WeakReference
+import mozilla.components.browser.toolbar.behavior.ToolbarPosition as MozacToolbarPosition
 
 interface BrowserToolbarViewInteractor {
     fun onBrowserToolbarPaste(text: String)
@@ -58,7 +52,7 @@ class BrowserToolbarView(
     private val container: ViewGroup,
     private val toolbarPosition: ToolbarPosition,
     private val interactor: BrowserToolbarViewInteractor,
-    private val customTabSession: Session?,
+    private val customTabSession: CustomTabSessionState?,
     private val lifecycleOwner: LifecycleOwner
 ) : LayoutContainer {
 
@@ -76,14 +70,16 @@ class BrowserToolbarView(
     private val layout = LayoutInflater.from(container.context)
         .inflate(toolbarLayout, container, true)
 
-    val view: BrowserToolbar = layout
+    @VisibleForTesting
+    internal var view: BrowserToolbar = layout
         .findViewById(R.id.toolbar)
 
     val toolbarIntegration: ToolbarIntegration
 
-    private val isPwaTabOrTwaTab: Boolean
-        get() = customTabSession?.customTabConfig?.externalAppType == ExternalAppType.PROGRESSIVE_WEB_APP ||
-                customTabSession?.customTabConfig?.externalAppType == ExternalAppType.TRUSTED_WEB_ACTIVITY
+    @VisibleForTesting
+    internal val isPwaTabOrTwaTab: Boolean
+        get() = customTabSession?.config?.externalAppType == ExternalAppType.PROGRESSIVE_WEB_APP ||
+                customTabSession?.config?.externalAppType == ExternalAppType.TRUSTED_WEB_ACTIVITY
 
     init {
         val isCustomTabSession = customTabSession != null
@@ -101,17 +97,8 @@ class BrowserToolbarView(
         with(container.context) {
             val isPinningSupported = components.useCases.webAppUseCases.isPinningSupported()
 
-            if (toolbarPosition == ToolbarPosition.TOP) {
-                val offsetChangedListener =
-                    AppBarLayout.OnOffsetChangedListener { _: AppBarLayout?, verticalOffset: Int ->
-                        interactor.onScrolled(verticalOffset)
-                    }
-
-                app_bar.addOnOffsetChangedListener(offsetChangedListener)
-            }
-
             view.apply {
-                setScrollFlags()
+                setToolbarBehavior()
 
                 elevation = resources.getDimension(R.dimen.browser_fragment_toolbar_elevation)
 
@@ -203,7 +190,7 @@ class BrowserToolbarView(
                     view,
                     menuToolbar,
                     customTabSession.id,
-                    isPrivate = customTabSession.private
+                    isPrivate = customTabSession.content.private
                 )
             } else {
                 DefaultToolbarIntegration(
@@ -227,55 +214,76 @@ class BrowserToolbarView(
         if (isPwaTabOrTwaTab) {
             return
         }
-        when (settings.toolbarPosition) {
-            ToolbarPosition.BOTTOM -> {
-                (view.layoutParams as? CoordinatorLayout.LayoutParams)?.apply {
-                    // behavior can be null if the "Scroll to hide toolbar" setting is toggled off.
-                    (behavior as? BrowserToolbarBottomBehavior)?.forceExpand(view)
-                }
-            }
-            ToolbarPosition.TOP -> {
-                layout.app_bar?.setExpanded(true)
-            }
+
+        (view.layoutParams as? CoordinatorLayout.LayoutParams)?.apply {
+            (behavior as? BrowserToolbarBehavior)?.forceExpand(view)
+        }
+    }
+
+    fun collapse() {
+        // collapse only for normal tabs and custom tabs not for PWA or TWA. Mirror expand()
+        if (isPwaTabOrTwaTab) {
+            return
+        }
+
+        (view.layoutParams as? CoordinatorLayout.LayoutParams)?.apply {
+            (behavior as? BrowserToolbarBehavior)?.forceCollapse(view)
         }
     }
 
+    fun dismissMenu() {
+        view.dismissMenu()
+    }
+
     /**
-     * Dynamically sets scroll flags for the toolbar when the user does not have a screen reader enabled
-     * Note that the toolbar will have the flags set and be able to be hidden
-     * only if the user didn't disabled this behavior in app's settings.
+     * Sets whether the toolbar will have a dynamic behavior (to be scrolled) or not.
+     *
+     * This will intrinsically check and disable the dynamic behavior if
+     *  - this is disabled in app settings
+     *  - toolbar is placed at the bottom and tab shows a PWA or TWA
+     *
+     *  Also if the user has not explicitly set a toolbar position and has a screen reader enabled
+     *  the toolbar will be placed at the top and in a fixed position.
+     *
+     * @param shouldDisableScroll force disable of the dynamic behavior irrespective of the intrinsic checks.
      */
-    fun setScrollFlags(shouldDisableScroll: Boolean = false) {
+    fun setToolbarBehavior(shouldDisableScroll: Boolean = false) {
         when (settings.toolbarPosition) {
             ToolbarPosition.BOTTOM -> {
-                if (settings.isDynamicToolbarEnabled && !isPwaTabOrTwaTab) {
-                    (view.layoutParams as? CoordinatorLayout.LayoutParams)?.apply {
-                        behavior = BrowserToolbarBottomBehavior(view.context, null)
-                    }
+                if (settings.isDynamicToolbarEnabled && !isPwaTabOrTwaTab && !settings.shouldUseFixedTopToolbar) {
+                    setDynamicToolbarBehavior(MozacToolbarPosition.BOTTOM)
                 } else {
-                    expand()
+                    expandToolbarAndMakeItFixed()
                 }
             }
             ToolbarPosition.TOP -> {
-                view.updateLayoutParams<AppBarLayout.LayoutParams> {
-                    scrollFlags =
-                        if (settings.shouldUseFixedTopToolbar ||
-                            !settings.isDynamicToolbarEnabled ||
-                            shouldDisableScroll) {
-                        // Force expand the toolbar so the user is not stuck with a hidden toolbar
-                        expand()
-                        0
-                    } else {
-                        SCROLL_FLAG_SCROLL or
-                                SCROLL_FLAG_ENTER_ALWAYS or
-                                SCROLL_FLAG_SNAP or
-                                SCROLL_FLAG_EXIT_UNTIL_COLLAPSED
-                    }
+                if (settings.shouldUseFixedTopToolbar ||
+                    !settings.isDynamicToolbarEnabled ||
+                    shouldDisableScroll
+                ) {
+                    expandToolbarAndMakeItFixed()
+                } else {
+                    setDynamicToolbarBehavior(MozacToolbarPosition.TOP)
                 }
             }
         }
     }
 
+    @VisibleForTesting
+    internal fun expandToolbarAndMakeItFixed() {
+        expand()
+        (view.layoutParams as? CoordinatorLayout.LayoutParams)?.apply {
+            behavior = null
+        }
+    }
+
+    @VisibleForTesting
+    internal fun setDynamicToolbarBehavior(toolbarPosition: MozacToolbarPosition) {
+        (view.layoutParams as? CoordinatorLayout.LayoutParams)?.apply {
+            behavior = BrowserToolbarBehavior(view.context, null, toolbarPosition)
+        }
+    }
+
     @Suppress("ComplexCondition")
     private fun ToolbarMenu.Item.performHapticIfNeeded(view: View) {
         if (this is ToolbarMenu.Item.Reload && this.bypassCache ||
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 0fc1a3544..10018c227 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
@@ -32,6 +32,7 @@ import mozilla.components.feature.webcompat.reporter.WebCompatReporterFeature
 import mozilla.components.lib.state.ext.flowScoped
 import mozilla.components.support.ktx.android.content.getColorFromAttr
 import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifAnyChanged
+import org.mozilla.fenix.FeatureFlags
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
 import org.mozilla.fenix.browser.browsingmode.BrowsingMode
@@ -69,7 +70,12 @@ class DefaultToolbarMenu(
 
     override val menuBuilder by lazy {
         WebExtensionBrowserMenuBuilder(
-            menuItems,
+            items =
+                if (FeatureFlags.toolbarMenuFeature) {
+                    newCoreMenuItems
+                } else {
+                    oldCoreMenuItems
+                },
             endOfMenuAlwaysVisible = !shouldReverseItems,
             store = store,
             webExtIconTintColorResource = primaryTextColor(),
@@ -179,20 +185,159 @@ class DefaultToolbarMenu(
     } ?: false
     // End of predicates //
 
-    private val menuItems by lazy {
+    private val oldCoreMenuItems by lazy {
+        val settings = BrowserMenuHighlightableItem(
+            label = context.getString(R.string.browser_menu_settings),
+            startImageResource = R.drawable.ic_settings,
+            iconTintColorResource = if (hasAccountProblem)
+                ThemeManager.resolveAttribute(R.attr.syncDisconnected, context) else
+                primaryTextColor(),
+            textColorResource = if (hasAccountProblem)
+                ThemeManager.resolveAttribute(R.attr.primaryText, context) else
+                primaryTextColor(),
+            highlight = BrowserMenuHighlight.HighPriority(
+                endImageResource = R.drawable.ic_sync_disconnected,
+                backgroundTint = context.getColorFromAttr(R.attr.syncDisconnectedBackground),
+                canPropagate = false
+            ),
+            isHighlighted = { hasAccountProblem }
+        ) {
+            onItemTapped.invoke(ToolbarMenu.Item.Settings)
+        }
+
+        val desktopMode = BrowserMenuImageSwitch(
+            imageResource = R.drawable.ic_desktop,
+            label = context.getString(R.string.browser_menu_desktop_site),
+            initialState = {
+                selectedSession?.content?.desktopMode ?: false
+            }
+        ) { checked ->
+            onItemTapped.invoke(ToolbarMenu.Item.RequestDesktop(checked))
+        }
+
+        val addToTopSites = BrowserMenuImageText(
+            label = context.getString(R.string.browser_menu_add_to_top_sites),
+            imageResource = R.drawable.ic_top_sites,
+            iconTintColorResource = primaryTextColor()
+        ) {
+            onItemTapped.invoke(ToolbarMenu.Item.AddToTopSites)
+        }
+
+        val addToHomescreen = BrowserMenuImageText(
+            label = context.getString(R.string.browser_menu_add_to_homescreen),
+            imageResource = R.drawable.ic_add_to_homescreen,
+            iconTintColorResource = primaryTextColor()
+        ) {
+            onItemTapped.invoke(ToolbarMenu.Item.AddToHomeScreen)
+        }
+
+        val syncedTabs = BrowserMenuImageText(
+            label = context.getString(R.string.synced_tabs),
+            imageResource = R.drawable.ic_synced_tabs,
+            iconTintColorResource = primaryTextColor()
+        ) {
+            onItemTapped.invoke(ToolbarMenu.Item.SyncedTabs)
+        }
+
+        val installToHomescreen = BrowserMenuHighlightableItem(
+            label = context.getString(R.string.browser_menu_install_on_homescreen),
+            startImageResource = R.drawable.ic_add_to_homescreen,
+            iconTintColorResource = primaryTextColor(),
+            highlight = BrowserMenuHighlight.LowPriority(
+                label = context.getString(R.string.browser_menu_install_on_homescreen),
+                notificationTint = getColor(context, R.color.whats_new_notification_color)
+            ),
+            isHighlighted = {
+                !context.settings().installPwaOpened
+            }
+        ) {
+            onItemTapped.invoke(ToolbarMenu.Item.InstallToHomeScreen)
+        }
+
+        val findInPage = BrowserMenuImageText(
+            label = context.getString(R.string.browser_menu_find_in_page),
+            imageResource = R.drawable.mozac_ic_search,
+            iconTintColorResource = primaryTextColor()
+        ) {
+            onItemTapped.invoke(ToolbarMenu.Item.FindInPage)
+        }
+
+        val reportSiteIssuePlaceholder = WebExtensionPlaceholderMenuItem(
+            id = WebCompatReporterFeature.WEBCOMPAT_REPORTER_EXTENSION_ID
+        )
+
+        val saveToCollection = BrowserMenuImageText(
+            label = context.getString(R.string.browser_menu_save_to_collection_2),
+            imageResource = R.drawable.ic_tab_collection,
+            iconTintColorResource = primaryTextColor()
+        ) {
+            onItemTapped.invoke(ToolbarMenu.Item.SaveToCollection)
+        }
+
+        val deleteDataOnQuit = BrowserMenuImageText(
+            label = context.getString(R.string.delete_browsing_data_on_quit_action),
+            imageResource = R.drawable.ic_exit,
+            iconTintColorResource = primaryTextColor()
+        ) {
+            onItemTapped.invoke(ToolbarMenu.Item.Quit)
+        }
+
+        val readerAppearance = BrowserMenuImageText(
+            label = context.getString(R.string.browser_menu_read_appearance),
+            imageResource = R.drawable.ic_readermode_appearance,
+            iconTintColorResource = primaryTextColor()
+        ) {
+            onItemTapped.invoke(ToolbarMenu.Item.ReaderModeAppearance)
+        }
+
+        val openInApp = BrowserMenuHighlightableItem(
+            label = context.getString(R.string.browser_menu_open_app_link),
+            startImageResource = R.drawable.ic_open_in_app,
+            iconTintColorResource = primaryTextColor(),
+            highlight = BrowserMenuHighlight.LowPriority(
+                label = context.getString(R.string.browser_menu_open_app_link),
+                notificationTint = getColor(context, R.color.whats_new_notification_color)
+            ),
+            isHighlighted = { !context.settings().openInAppOpened }
+        ) {
+            onItemTapped.invoke(ToolbarMenu.Item.OpenInApp)
+        }
+
+        val historyItem = BrowserMenuImageText(
+            context.getString(R.string.library_history),
+            R.drawable.ic_history,
+            primaryTextColor()
+        ) {
+            onItemTapped.invoke(ToolbarMenu.Item.History)
+        }
+
+        val bookmarksItem = BrowserMenuImageText(
+            context.getString(R.string.library_bookmarks),
+            R.drawable.ic_bookmark_filled,
+            primaryTextColor()
+        ) {
+            onItemTapped.invoke(ToolbarMenu.Item.Bookmarks)
+        }
+
+        val downloadsItem = BrowserMenuImageText(
+            context.getString(R.string.library_downloads),
+            R.drawable.ic_download,
+            primaryTextColor()
+        ) {
+            onItemTapped.invoke(ToolbarMenu.Item.Downloads)
+        }
+
         // Predicates that are called once, during screen init
         val shouldShowSaveToCollection = (context.asActivity() as? HomeActivity)
             ?.browsingModeManager?.mode == BrowsingMode.Normal
         val shouldDeleteDataOnQuit = context.components.settings
             .shouldDeleteBrowsingDataOnQuit
-        val syncedTabsInTabsTray = context.components.settings
-            .syncedTabsInTabsTray
 
         val menuItems = listOfNotNull(
             downloadsItem,
             historyItem,
             bookmarksItem,
-            if (syncedTabsInTabsTray) null else syncedTabs,
+            syncedTabs,
             settings,
             if (shouldDeleteDataOnQuit) deleteDataOnQuit else null,
             BrowserMenuDivider(),
@@ -216,151 +361,146 @@ class DefaultToolbarMenu(
         }
     }
 
-    private val settings = BrowserMenuHighlightableItem(
-        label = context.getString(R.string.browser_menu_settings),
-        startImageResource = R.drawable.ic_settings,
-        iconTintColorResource = if (hasAccountProblem)
-            ThemeManager.resolveAttribute(R.attr.syncDisconnected, context) else
-            primaryTextColor(),
-        textColorResource = if (hasAccountProblem)
-            ThemeManager.resolveAttribute(R.attr.primaryText, context) else
-            primaryTextColor(),
-        highlight = BrowserMenuHighlight.HighPriority(
-            endImageResource = R.drawable.ic_sync_disconnected,
-            backgroundTint = context.getColorFromAttr(R.attr.syncDisconnectedBackground),
-            canPropagate = false
-        ),
-        isHighlighted = { hasAccountProblem }
-    ) {
-        onItemTapped.invoke(ToolbarMenu.Item.Settings)
-    }
-
-    private val desktopMode = BrowserMenuImageSwitch(
-        imageResource = R.drawable.ic_desktop,
-        label = context.getString(R.string.browser_menu_desktop_site),
-        initialState = {
-            selectedSession?.content?.desktopMode ?: false
+    private val newCoreMenuItems by lazy {
+        val newTabItem = BrowserMenuImageText(
+            context.getString(R.string.library_new_tab),
+            R.drawable.ic_bookmark_filled,
+            disabledTextColor()
+        ) {
+            onItemTapped.invoke(ToolbarMenu.Item.NewTab)
         }
-    ) { checked ->
-        onItemTapped.invoke(ToolbarMenu.Item.RequestDesktop(checked))
-    }
 
-    private val addToTopSites = BrowserMenuImageText(
-        label = context.getString(R.string.browser_menu_add_to_top_sites),
-        imageResource = R.drawable.ic_top_sites,
-        iconTintColorResource = primaryTextColor()
-    ) {
-        onItemTapped.invoke(ToolbarMenu.Item.AddToTopSites)
-    }
+        val bookmarksItem = BrowserMenuImageText(
+            context.getString(R.string.library_bookmarks),
+            R.drawable.ic_bookmark_filled,
+            disabledTextColor()
+        ) {
+            onItemTapped.invoke(ToolbarMenu.Item.Bookmarks)
+        }
 
-    private val addToHomescreen = BrowserMenuImageText(
-        label = context.getString(R.string.browser_menu_add_to_homescreen),
-        imageResource = R.drawable.ic_add_to_homescreen,
-        iconTintColorResource = primaryTextColor()
-    ) {
-        onItemTapped.invoke(ToolbarMenu.Item.AddToHomeScreen)
-    }
+        val historyItem = BrowserMenuImageText(
+            context.getString(R.string.library_history),
+            R.drawable.ic_history,
+            disabledTextColor()
+        ) {
+            onItemTapped.invoke(ToolbarMenu.Item.History)
+        }
 
-    private val syncedTabs = BrowserMenuImageText(
-        label = context.getString(R.string.synced_tabs),
-        imageResource = R.drawable.ic_synced_tabs,
-        iconTintColorResource = primaryTextColor()
-    ) {
-        onItemTapped.invoke(ToolbarMenu.Item.SyncedTabs)
-    }
+        val downloadsItem = BrowserMenuImageText(
+            context.getString(R.string.library_downloads),
+            R.drawable.ic_download,
+            disabledTextColor()
+        ) {
+            onItemTapped.invoke(ToolbarMenu.Item.Downloads)
+        }
 
-    private val installToHomescreen = BrowserMenuHighlightableItem(
-        label = context.getString(R.string.browser_menu_install_on_homescreen),
-        startImageResource = R.drawable.ic_add_to_homescreen,
-        iconTintColorResource = primaryTextColor(),
-        highlight = BrowserMenuHighlight.LowPriority(
-            label = context.getString(R.string.browser_menu_install_on_homescreen),
-            notificationTint = getColor(context, R.color.whats_new_notification_color)
-        ),
-        isHighlighted = {
-            !context.settings().installPwaOpened
+        val extensionsItem = BrowserMenuImageText(
+            context.getString(R.string.browser_menu_extensions),
+            R.drawable.ic_addons_extensions,
+            disabledTextColor()
+        ) {
+            onItemTapped.invoke(ToolbarMenu.Item.AddonsManager)
         }
-    ) {
-        onItemTapped.invoke(ToolbarMenu.Item.InstallToHomeScreen)
-    }
 
-    private val findInPage = BrowserMenuImageText(
-        label = context.getString(R.string.browser_menu_find_in_page),
-        imageResource = R.drawable.mozac_ic_search,
-        iconTintColorResource = primaryTextColor()
-    ) {
-        onItemTapped.invoke(ToolbarMenu.Item.FindInPage)
-    }
+        val syncedTabsItem = BrowserMenuImageText(
+            context.getString(R.string.library_synced_tabs),
+            R.drawable.ic_synced_tabs,
+            disabledTextColor()
+        ) {
+            onItemTapped.invoke(ToolbarMenu.Item.SyncedTabs)
+        }
 
-    private val reportSiteIssuePlaceholder = WebExtensionPlaceholderMenuItem(
-        id = WebCompatReporterFeature.WEBCOMPAT_REPORTER_EXTENSION_ID
-    )
+        val findInPageItem = BrowserMenuImageText(
+            label = context.getString(R.string.browser_menu_find_in_page),
+            imageResource = R.drawable.mozac_ic_search,
+            iconTintColorResource = disabledTextColor()
+        ) {
+            onItemTapped.invoke(ToolbarMenu.Item.FindInPage)
+        }
 
-    private val saveToCollection = BrowserMenuImageText(
-        label = context.getString(R.string.browser_menu_save_to_collection_2),
-        imageResource = R.drawable.ic_tab_collection,
-        iconTintColorResource = primaryTextColor()
-    ) {
-        onItemTapped.invoke(ToolbarMenu.Item.SaveToCollection)
-    }
+        val desktopSiteItem = BrowserMenuImageSwitch(
+            imageResource = R.drawable.ic_desktop,
+            label = context.getString(R.string.browser_menu_desktop_site),
+            initialState = {
+                selectedSession?.content?.desktopMode ?: false
+            }
+        ) { checked ->
+            onItemTapped.invoke(ToolbarMenu.Item.RequestDesktop(checked))
+        }
 
-    private val deleteDataOnQuit = BrowserMenuImageText(
-        label = context.getString(R.string.delete_browsing_data_on_quit_action),
-        imageResource = R.drawable.ic_exit,
-        iconTintColorResource = primaryTextColor()
-    ) {
-        onItemTapped.invoke(ToolbarMenu.Item.Quit)
-    }
+        val addToHomeScreenItem = BrowserMenuImageText(
+            label = context.getString(R.string.browser_menu_add_to_homescreen),
+            imageResource = R.drawable.ic_add_to_homescreen,
+            iconTintColorResource = disabledTextColor()
+        ) {
+            onItemTapped.invoke(ToolbarMenu.Item.AddToHomeScreen)
+        }
 
-    private val readerAppearance = BrowserMenuImageText(
-        label = context.getString(R.string.browser_menu_read_appearance),
-        imageResource = R.drawable.ic_readermode_appearance,
-        iconTintColorResource = primaryTextColor()
-    ) {
-        onItemTapped.invoke(ToolbarMenu.Item.ReaderModeAppearance)
-    }
+        val addToTopSitesItem = BrowserMenuImageText(
+            label = context.getString(R.string.browser_menu_add_to_top_sites),
+            imageResource = R.drawable.ic_top_sites,
+            iconTintColorResource = disabledTextColor()
+        ) {
+            onItemTapped.invoke(ToolbarMenu.Item.AddToTopSites)
+        }
 
-    private val openInApp = BrowserMenuHighlightableItem(
-        label = context.getString(R.string.browser_menu_open_app_link),
-        startImageResource = R.drawable.ic_open_in_app,
-        iconTintColorResource = primaryTextColor(),
-        highlight = BrowserMenuHighlight.LowPriority(
-            label = context.getString(R.string.browser_menu_open_app_link),
-            notificationTint = getColor(context, R.color.whats_new_notification_color)
-        ),
-        isHighlighted = { !context.settings().openInAppOpened }
-    ) {
-        onItemTapped.invoke(ToolbarMenu.Item.OpenInApp)
-    }
+        val saveToCollectionItem = BrowserMenuImageText(
+            label = context.getString(R.string.browser_menu_save_to_collection_2),
+            imageResource = R.drawable.ic_tab_collection,
+            iconTintColorResource = disabledTextColor()
+        ) {
+            onItemTapped.invoke(ToolbarMenu.Item.SaveToCollection)
+        }
 
-    val historyItem = BrowserMenuImageText(
-        context.getString(R.string.library_history),
-        R.drawable.ic_history,
-        primaryTextColor()
-    ) {
-        onItemTapped.invoke(ToolbarMenu.Item.History)
-    }
+        val settingsItem = BrowserMenuHighlightableItem(
+            label = context.getString(R.string.browser_menu_settings),
+            startImageResource = R.drawable.ic_settings,
+            iconTintColorResource = disabledTextColor(),
+            textColorResource = if (hasAccountProblem)
+                ThemeManager.resolveAttribute(R.attr.primaryText, context) else
+                primaryTextColor(),
+            highlight = BrowserMenuHighlight.HighPriority(
+                endImageResource = R.drawable.ic_sync_disconnected,
+                backgroundTint = context.getColorFromAttr(R.attr.syncDisconnectedBackground),
+                canPropagate = false
+            ),
+            isHighlighted = { hasAccountProblem }
+        ) {
+            onItemTapped.invoke(ToolbarMenu.Item.Settings)
+        }
 
-    val bookmarksItem = BrowserMenuImageText(
-        context.getString(R.string.library_bookmarks),
-        R.drawable.ic_bookmark_filled,
-        primaryTextColor()
-    ) {
-        onItemTapped.invoke(ToolbarMenu.Item.Bookmarks)
-    }
+        val menuItems = listOfNotNull(
+            newTabItem,
+            BrowserMenuDivider(),
+            bookmarksItem,
+            historyItem,
+            downloadsItem,
+            extensionsItem,
+            syncedTabsItem,
+            BrowserMenuDivider(),
+            findInPageItem,
+            desktopSiteItem,
+            BrowserMenuDivider(),
+            addToHomeScreenItem.apply { visible = ::canAddToHomescreen },
+            addToTopSitesItem,
+            saveToCollectionItem,
+            BrowserMenuDivider(),
+            settingsItem,
+            BrowserMenuDivider(),
+            menuToolbar
+        )
 
-    val downloadsItem = BrowserMenuImageText(
-        context.getString(R.string.library_downloads),
-        R.drawable.ic_download,
-        primaryTextColor()
-    ) {
-        onItemTapped.invoke(ToolbarMenu.Item.Downloads)
+        menuItems
     }
 
     @ColorRes
     @VisibleForTesting
     internal fun primaryTextColor() = ThemeManager.resolveAttribute(R.attr.primaryText, context)
 
+    @ColorRes
+    @VisibleForTesting
+    internal fun disabledTextColor() = R.color.toolbar_menu_transparent
+
     @VisibleForTesting
     internal fun registerForIsBookmarkedUpdates() {
         store.flowScoped(lifecycleOwner) { flow ->
diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/SwipeRefreshScrollingViewBehavior.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/SwipeRefreshScrollingViewBehavior.kt
deleted file mode 100644
index b69bc0f94..000000000
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/SwipeRefreshScrollingViewBehavior.kt
+++ /dev/null
@@ -1,50 +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.toolbar
-
-import android.content.Context
-import android.util.AttributeSet
-import android.view.View
-import androidx.coordinatorlayout.widget.CoordinatorLayout
-import com.google.android.material.appbar.AppBarLayout
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import mozilla.components.concept.engine.EngineView
-import mozilla.components.concept.engine.EngineView.InputResult.INPUT_RESULT_UNHANDLED
-import org.mozilla.fenix.ext.settings
-
-/**
- * ScrollingViewBehavior that will setScrollFlags on BrowserToolbar based on EngineView touch handling
- */
-@ExperimentalCoroutinesApi
-class SwipeRefreshScrollingViewBehavior(
-    context: Context,
-    attrs: AttributeSet?,
-    private val engineView: EngineView,
-    private val browserToolbarView: BrowserToolbarView
-) : AppBarLayout.ScrollingViewBehavior(context, attrs) {
-    override fun onStartNestedScroll(
-        coordinatorLayout: CoordinatorLayout,
-        child: View,
-        directTargetChild: View,
-        target: View,
-        axes: Int,
-        type: Int
-    ): Boolean {
-
-        if (!browserToolbarView.view.context.settings().shouldUseBottomToolbar) {
-            val shouldDisable = engineView.getInputResult() == INPUT_RESULT_UNHANDLED
-            browserToolbarView.setScrollFlags(shouldDisable)
-        }
-
-        return super.onStartNestedScroll(
-            coordinatorLayout,
-            child,
-            directTargetChild,
-            target,
-            axes,
-            type
-        )
-    }
-}
diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt
index 018bf6efb..fca3accc6 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt
@@ -21,7 +21,6 @@ import mozilla.components.feature.tabs.toolbar.TabCounterToolbarButton
 import mozilla.components.feature.toolbar.ToolbarAutocompleteFeature
 import mozilla.components.feature.toolbar.ToolbarFeature
 import mozilla.components.feature.toolbar.ToolbarPresenter
-import mozilla.components.lib.publicsuffixlist.PublicSuffixList
 import mozilla.components.support.base.feature.LifecycleAwareFeature
 import mozilla.components.support.ktx.android.view.hideKeyboard
 import org.mozilla.fenix.R
@@ -45,7 +44,7 @@ abstract class ToolbarIntegration(
         store,
         sessionId,
         ToolbarFeature.UrlRenderConfiguration(
-            PublicSuffixList(context),
+            context.components.publicSuffixList,
             ThemeManager.resolveAttribute(R.attr.primaryText, context),
             renderStyle = renderStyle
         )
diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarMenu.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarMenu.kt
index 27b47c309..87cb80ae3 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarMenu.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarMenu.kt
@@ -31,6 +31,7 @@ interface ToolbarMenu {
         object Bookmarks : Item()
         object History : Item()
         object Downloads : Item()
+        object NewTab : Item()
     }
 
     val menuBuilder: BrowserMenuBuilder
diff --git a/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabsIntegration.kt b/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabsIntegration.kt
index 04e902d51..0d5a6fb0f 100644
--- a/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabsIntegration.kt
+++ b/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabsIntegration.kt
@@ -6,7 +6,6 @@ package org.mozilla.fenix.customtabs
 
 import android.app.Activity
 import androidx.appcompat.content.res.AppCompatResources.getDrawable
-import mozilla.components.browser.session.SessionManager
 import mozilla.components.browser.state.store.BrowserStore
 import mozilla.components.browser.toolbar.BrowserToolbar
 import mozilla.components.browser.toolbar.display.DisplayToolbar
@@ -19,7 +18,6 @@ import org.mozilla.fenix.components.toolbar.ToolbarMenu
 import org.mozilla.fenix.ext.settings
 
 class CustomTabsIntegration(
-    sessionManager: SessionManager,
     store: BrowserStore,
     useCases: CustomTabsUseCases,
     toolbar: BrowserToolbar,
@@ -61,16 +59,6 @@ class CustomTabsIntegration(
         // If in private mode, override toolbar background to use private color
         // See #5334
         if (isPrivate) {
-            sessionManager.findSessionById(sessionId)?.apply {
-                val config = customTabConfig
-                customTabConfig = config?.copy(
-                    // Don't set toolbar background automatically
-                    toolbarColor = null,
-                    // Force tinting the action button
-                    actionButtonConfig = config.actionButtonConfig?.copy(tint = true)
-                )
-            }
-
             toolbar.background = getDrawable(activity, R.drawable.toolbar_background)
         }
     }
@@ -94,7 +82,9 @@ class CustomTabsIntegration(
         menuItemIndex = START_OF_MENU_ITEMS_INDEX,
         window = activity.window,
         shareListener = { onItemTapped.invoke(ToolbarMenu.Item.Share) },
-        closeListener = { activity.finishAndRemoveTask() }
+        closeListener = { activity.finishAndRemoveTask() },
+        updateToolbarBackground = !isPrivate,
+        forceActionButtonTinting = isPrivate
     )
 
     override fun start() = feature.start()
diff --git a/app/src/main/java/org/mozilla/fenix/customtabs/ExternalAppBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/customtabs/ExternalAppBrowserFragment.kt
index 016f220c0..dd6eeda75 100644
--- a/app/src/main/java/org/mozilla/fenix/customtabs/ExternalAppBrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/customtabs/ExternalAppBrowserFragment.kt
@@ -61,7 +61,6 @@ class ExternalAppBrowserFragment : BaseBrowserFragment(), UserInteractionHandler
 
         customTabsIntegration.set(
             feature = CustomTabsIntegration(
-                sessionManager = requireComponents.core.sessionManager,
                 store = requireComponents.core.store,
                 useCases = requireComponents.useCases.customTabsUseCases,
                 toolbar = toolbar,
@@ -139,7 +138,7 @@ class ExternalAppBrowserFragment : BaseBrowserFragment(), UserInteractionHandler
                     customTabSessionId,
                     manifest,
                     WebAppSiteControlsBuilder(
-                        requireComponents.core.sessionManager,
+                        requireComponents.core.store,
                         requireComponents.useCases.sessionUseCases.reload,
                         customTabSessionId,
                         manifest
diff --git a/app/src/main/java/org/mozilla/fenix/customtabs/WebAppSiteControlsBuilder.kt b/app/src/main/java/org/mozilla/fenix/customtabs/WebAppSiteControlsBuilder.kt
index f592ea839..1244b7a11 100644
--- a/app/src/main/java/org/mozilla/fenix/customtabs/WebAppSiteControlsBuilder.kt
+++ b/app/src/main/java/org/mozilla/fenix/customtabs/WebAppSiteControlsBuilder.kt
@@ -7,15 +7,16 @@ package org.mozilla.fenix.customtabs
 import android.app.Notification
 import android.content.Context
 import android.content.Intent
-import mozilla.components.browser.session.SessionManager
+import mozilla.components.browser.state.selector.findCustomTab
 import mozilla.components.browser.state.state.CustomTabSessionState
+import mozilla.components.browser.state.store.BrowserStore
 import mozilla.components.concept.engine.manifest.WebAppManifest
 import mozilla.components.feature.pwa.feature.SiteControlsBuilder
 import mozilla.components.feature.session.SessionUseCases
 import org.mozilla.fenix.R
 
 class WebAppSiteControlsBuilder(
-    private val sessionManager: SessionManager,
+    private val store: BrowserStore,
     reloadUrlUseCase: SessionUseCases.ReloadUrlUseCase,
     private val sessionId: String,
     private val manifest: WebAppManifest
@@ -26,9 +27,9 @@ class WebAppSiteControlsBuilder(
     override fun buildNotification(context: Context, builder: Notification.Builder) {
         inner.buildNotification(context, builder)
 
-        val isPrivateSession = sessionManager.findSessionById(sessionId)?.private ?: false
-
-        if (!isPrivateSession) { return }
+        if (store.state.findCustomTab(sessionId)?.content?.private != true) {
+            return
+        }
 
         builder.setSmallIcon(R.drawable.ic_private_browsing)
         builder.setContentTitle(context.getString(R.string.pwa_site_controls_title_private, manifest.name))
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 5b5f67b34..9a9a39036 100644
--- a/app/src/main/java/org/mozilla/fenix/experiments/Experiments.kt
+++ b/app/src/main/java/org/mozilla/fenix/experiments/Experiments.kt
@@ -6,8 +6,9 @@ package org.mozilla.fenix.experiments
 
 class Experiments {
     companion object {
-        const val A_A_NIMBUS_VALIDATION = "fenix-nimbus-validation"
+        const val A_A_NIMBUS_VALIDATION = "fenix-nimbus-validation-v3"
         const val BOOKMARK_ICON = "fenix-bookmark-list-icon"
+        const val ANDROID_KEYSTORE = "fenix-android-keystore"
     }
 }
 
@@ -15,7 +16,7 @@ class ExperimentBranch {
     companion object {
         const val TREATMENT = "treatment"
         const val CONTROL = "control"
-        const val A1 = "A1"
-        const val A2 = "A2"
+        const val A1 = "a1"
+        const val A2 = "a2"
     }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/experiments/NimbusSetup.kt b/app/src/main/java/org/mozilla/fenix/experiments/NimbusSetup.kt
new file mode 100644
index 000000000..1622e79da
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/experiments/NimbusSetup.kt
@@ -0,0 +1,72 @@
+/* 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.experiments
+
+import android.content.Context
+import android.net.Uri
+import android.os.StrictMode
+import io.sentry.Sentry
+import mozilla.components.service.nimbus.NimbusApi
+import mozilla.components.service.nimbus.Nimbus
+import mozilla.components.service.nimbus.NimbusDisabled
+import mozilla.components.service.nimbus.NimbusServerSettings
+import mozilla.components.support.base.log.logger.Logger
+import org.mozilla.fenix.components.isSentryEnabled
+import org.mozilla.fenix.ext.components
+import org.mozilla.fenix.ext.settings
+
+@Suppress("TooGenericExceptionCaught")
+fun createNimbus(context: Context, url: String?): NimbusApi =
+    try {
+        // Eventually we'll want to use `NimbusDisabled` when we have no NIMBUS_ENDPOINT.
+        // but we keep this here to not mix feature flags and how we configure Nimbus.
+        val serverSettings = if (!url.isNullOrBlank()) {
+            NimbusServerSettings(url = Uri.parse(url))
+        } else {
+            null
+        }
+
+        // Global opt out state is stored in Nimbus, and shouldn't be toggled to `true`
+        // from the app unless the user does so from a UI control.
+        // However, the user may have opt-ed out of mako experiments already, so
+        // we should respect that setting here.
+        val enabled =
+            context.components.strictMode.resetAfter(StrictMode.allowThreadDiskReads()) {
+                context.settings().isExperimentationEnabled
+            }
+
+        Nimbus(context, serverSettings).apply {
+            // This performs the minimal amount of work required to load branch and enrolment data
+            // into memory. If `getExperimentBranch` is called from another thread between here
+            // and the next nimbus disk write (setting `globalUserParticipation` or
+            // `applyPendingExperiments()`) then this has you covered.
+            // This call does its work on the db thread.
+            initialize()
+
+            if (!enabled) {
+                // This opts out of nimbus experiments. It involves writing to disk, so does its
+                // work on the db thread.
+                globalUserParticipation = enabled
+            }
+
+            // 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.
+            applyPendingExperiments()
+
+            // Now fetch the experiments from the server. These will be available for feature
+            // configuration on the next run of the app. This call launches on the fetch thread.
+            fetchExperiments()
+        }
+    } catch (e: Throwable) {
+        // Something went wrong. We'd like not to, but stability of the app is more important than
+        // failing fast here.
+        if (isSentryEnabled()) {
+            Sentry.capture(e)
+        } else {
+            Logger.error("Failed to initialize Nimbus", e)
+        }
+        NimbusDisabled()
+    }
diff --git a/app/src/main/java/org/mozilla/fenix/ext/BookmarkNode.kt b/app/src/main/java/org/mozilla/fenix/ext/BookmarkNode.kt
index 2152f3fb8..1d6f5388f 100644
--- a/app/src/main/java/org/mozilla/fenix/ext/BookmarkNode.kt
+++ b/app/src/main/java/org/mozilla/fenix/ext/BookmarkNode.kt
@@ -15,6 +15,6 @@ val Context.bookmarkStorage: PlacesBookmarksStorage
  * Removes [children] from [BookmarkNode.children] and returns the new modified [BookmarkNode].
  */
 operator fun BookmarkNode.minus(children: Set<BookmarkNode>): BookmarkNode {
-    val removedChildrenGuids = children.map { it.guid }.toSet()
+    val removedChildrenGuids = children.map { it.guid }
     return this.copy(children = this.children?.filterNot { removedChildrenGuids.contains(it.guid) })
 }
diff --git a/app/src/main/java/org/mozilla/fenix/ext/BrowserState.kt b/app/src/main/java/org/mozilla/fenix/ext/BrowserState.kt
deleted file mode 100644
index 3339b01b1..000000000
--- a/app/src/main/java/org/mozilla/fenix/ext/BrowserState.kt
+++ /dev/null
@@ -1,16 +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.ext
-
-import mozilla.components.browser.state.state.BrowserState
-import mozilla.components.browser.state.state.MediaState
-
-fun BrowserState.getMediaStateForSession(sessionId: String): MediaState.State {
-    return if (media.aggregate.activeTabId == sessionId) {
-        media.aggregate.state
-    } else {
-        MediaState.State.NONE
-    }
-}
diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
index 49cf69cd5..52d7389bc 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@@ -7,11 +7,11 @@ package org.mozilla.fenix.home
 import android.animation.Animator
 import android.content.Context
 import android.content.DialogInterface
+import android.content.res.Configuration
 import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
 import android.os.StrictMode
-import android.view.Display.FLAG_SECURE
 import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
@@ -84,6 +84,7 @@ import mozilla.components.support.ktx.android.content.res.resolveAttribute
 import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifChanged
 import mozilla.components.ui.tabcounter.TabCounterMenu
 import org.mozilla.fenix.BrowserDirection
+import org.mozilla.fenix.Config
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
 import org.mozilla.fenix.browser.BrowserAnimator.Companion.getToolbarNavOptions
@@ -103,8 +104,9 @@ import org.mozilla.fenix.ext.hideToolbar
 import org.mozilla.fenix.ext.metrics
 import org.mozilla.fenix.ext.nav
 import org.mozilla.fenix.ext.requireComponents
-import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.ext.runIfFragmentIsAttached
+import org.mozilla.fenix.ext.settings
+import org.mozilla.fenix.home.mozonline.showPrivacyPopWindow
 import org.mozilla.fenix.home.sessioncontrol.DefaultSessionControlController
 import org.mozilla.fenix.home.sessioncontrol.SessionControlInteractor
 import org.mozilla.fenix.home.sessioncontrol.SessionControlView
@@ -166,6 +168,9 @@ class HomeFragment : Fragment() {
 
     private val topSitesFeature = ViewBoundFeatureWrapper<TopSitesFeature>()
 
+    @VisibleForTesting
+    internal var getMenuButton: () -> MenuButton? = { menuButton }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -175,6 +180,12 @@ class HomeFragment : Fragment() {
                 requireComponents.analytics.metrics.track(Event.OpenedAppFirstRun)
             }
         }
+
+        if (!onboarding.userHasBeenOnboarded() &&
+            requireContext().settings().shouldShowPrivacyPopWindow &&
+            Config.channel.isMozillaOnline) {
+            showPrivacyPopWindow(requireContext(), requireActivity())
+        }
     }
 
     @Suppress("LongMethod")
@@ -223,7 +234,7 @@ class HomeFragment : Fragment() {
                 storage = components.core.topSitesStorage,
                 config = ::getTopSitesConfig
             ),
-            owner = this,
+            owner = viewLifecycleOwner,
             view = view
         )
 
@@ -266,6 +277,12 @@ class HomeFragment : Fragment() {
         return view
     }
 
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+
+        getMenuButton()?.dismissMenu()
+    }
+
     private fun dismissTip(tip: Tip) {
         sessionControlInteractor.onCloseTip(tip)
     }
@@ -389,12 +406,6 @@ class HomeFragment : Fragment() {
             }
         }
 
-        if (browsingModeManager.mode.isPrivate) {
-            requireActivity().window.addFlags(FLAG_SECURE)
-        } else {
-            requireActivity().window.clearFlags(FLAG_SECURE)
-        }
-
         consumeFrom(requireComponents.core.store) {
             updateTabCounter(it)
         }
@@ -533,7 +544,6 @@ class HomeFragment : Fragment() {
         sessionControlView = null
         appBarLayout = null
         bundleArgs.clear()
-        requireActivity().window.clearFlags(FLAG_SECURE)
     }
 
     override fun onStart() {
diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragmentStore.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragmentStore.kt
index dc6b78d7d..f1284ee6a 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeFragmentStore.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragmentStore.kt
@@ -5,7 +5,6 @@
 package org.mozilla.fenix.home
 
 import android.graphics.Bitmap
-import mozilla.components.browser.state.state.MediaState
 import mozilla.components.feature.tab.collections.TabCollection
 import mozilla.components.feature.top.sites.TopSite
 import mozilla.components.lib.state.Action
@@ -28,8 +27,7 @@ data class Tab(
     val hostname: String,
     val title: String,
     val selected: Boolean? = null,
-    val icon: Bitmap? = null,
-    val mediaState: MediaState.State
+    val icon: Bitmap? = null
 )
 
 /**
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 027e6cb26..6c1a32760 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt
@@ -190,7 +190,7 @@ class HomeMenu(
             if (settings.shouldDeleteBrowsingDataOnQuit) quitItem else null,
             settingsItem,
             BrowserMenuDivider(),
-            if (settings.syncedTabsInTabsTray) null else syncedTabsItem,
+            syncedTabsItem,
             bookmarksItem,
             historyItem,
             downloadsItem,
diff --git a/app/src/main/java/org/mozilla/fenix/home/intent/OpenSpecificTabIntentProcessor.kt b/app/src/main/java/org/mozilla/fenix/home/intent/OpenSpecificTabIntentProcessor.kt
index dec4cac01..5d59643ae 100644
--- a/app/src/main/java/org/mozilla/fenix/home/intent/OpenSpecificTabIntentProcessor.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/intent/OpenSpecificTabIntentProcessor.kt
@@ -7,10 +7,8 @@ package org.mozilla.fenix.home.intent
 import android.content.Intent
 import androidx.navigation.NavController
 import mozilla.components.browser.state.selector.findTab
-import mozilla.components.feature.media.service.AbstractMediaService
 import mozilla.components.feature.media.service.AbstractMediaSessionService
 import org.mozilla.fenix.BrowserDirection
-import org.mozilla.fenix.FeatureFlags.newMediaSessionApi
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.ext.components
 
@@ -44,17 +42,9 @@ class OpenSpecificTabIntentProcessor(
 }
 
 private fun getAction(): String {
-    return if (newMediaSessionApi) {
-        AbstractMediaSessionService.Companion.ACTION_SWITCH_TAB
-    } else {
-        AbstractMediaService.Companion.ACTION_SWITCH_TAB
-    }
+    return AbstractMediaSessionService.Companion.ACTION_SWITCH_TAB
 }
 
 private fun getTabId(): String {
-    return if (newMediaSessionApi) {
-        AbstractMediaSessionService.Companion.EXTRA_TAB_ID
-    } else {
-        AbstractMediaService.Companion.EXTRA_TAB_ID
-    }
+    return AbstractMediaSessionService.Companion.EXTRA_TAB_ID
 }
diff --git a/app/src/main/java/org/mozilla/fenix/home/mozonline/PrivacyContentDisplayActivity.kt b/app/src/main/java/org/mozilla/fenix/home/mozonline/PrivacyContentDisplayActivity.kt
new file mode 100644
index 000000000..ad4d119cb
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/home/mozonline/PrivacyContentDisplayActivity.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.home.mozonline
+
+import android.app.Activity
+import android.content.Context
+import android.os.Bundle
+import android.util.AttributeSet
+import android.view.View
+import android.widget.ImageButton
+import mozilla.components.concept.engine.EngineSession
+import mozilla.components.concept.engine.EngineView
+import mozilla.components.feature.contextmenu.DefaultSelectionActionDelegate
+import mozilla.components.feature.search.BrowserStoreSearchAdapter
+import mozilla.components.support.ktx.android.content.call
+import mozilla.components.support.ktx.android.content.email
+import mozilla.components.support.ktx.android.content.share
+import org.mozilla.fenix.R
+import org.mozilla.fenix.ext.components
+
+/**
+ * A special activity for displaying the detail content about privacy hyperlinked in alert dialog.
+ */
+
+class PrivacyContentDisplayActivity : Activity(), EngineSession.Observer {
+    private lateinit var engineView: EngineView
+    private lateinit var closeButton: ImageButton
+    private lateinit var engineSession: EngineSession
+    private var url: String? = ""
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_privacy_content_display)
+        val addr = intent.extras
+        if (addr != null) {
+            url = addr.getString("url")
+        }
+
+        engineView = findViewById<View>(R.id.privacyContentEngineView) as EngineView
+        closeButton = findViewById<View>(R.id.privacyContentCloseButton) as ImageButton
+        engineSession = components.core.engine.createSession()
+    }
+
+    override fun onCreateView(
+        parent: View?,
+        name: String,
+        context: Context,
+        attrs: AttributeSet
+    ): View? = when (name) {
+        EngineView::class.java.name -> components.core.engine.createView(context, attrs).apply {
+            selectionActionDelegate = DefaultSelectionActionDelegate(
+                BrowserStoreSearchAdapter(
+                    components.core.store
+                ),
+                resources = context.resources,
+                shareTextClicked = { share(it) },
+                emailTextClicked = { email(it) },
+                callTextClicked = { call(it) }
+            )
+        }.asView()
+        else -> super.onCreateView(parent, name, context, attrs)
+    }
+
+    override fun onStart() {
+        super.onStart()
+        engineSession.register(this)
+        engineSession.let { engineSession ->
+            engineView.render(engineSession)
+            url?.let { engineSession.loadUrl(it) }
+        }
+        closeButton.setOnClickListener { finish() }
+    }
+
+    override fun onStop() {
+        super.onStop()
+        engineSession.unregister(this)
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        engineSession.close()
+    }
+}
diff --git a/app/src/main/java/org/mozilla/fenix/home/mozonline/PrivacyContentDisplayHelper.kt b/app/src/main/java/org/mozilla/fenix/home/mozonline/PrivacyContentDisplayHelper.kt
new file mode 100644
index 000000000..d34371a00
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/home/mozonline/PrivacyContentDisplayHelper.kt
@@ -0,0 +1,53 @@
+/* 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.home.mozonline
+
+import android.app.Activity
+import android.content.Context
+import android.content.DialogInterface
+import android.text.SpannableString
+import android.text.Spanned
+import android.text.method.LinkMovementMethod
+import android.widget.TextView
+import androidx.appcompat.app.AlertDialog
+import org.mozilla.fenix.R
+import org.mozilla.fenix.ext.settings
+import kotlin.system.exitProcess
+
+fun showPrivacyPopWindow(context: Context, activity: Activity) {
+    val content = context.getString(R.string.privacy_notice_content)
+
+    // Use hyperlinks to display details about privacy
+    val messageClickable1 = context.getString(R.string.privacy_notice_clickable1)
+    val messageClickable2 = context.getString(R.string.privacy_notice_clickable2)
+    val messageClickable3 = context.getString(R.string.privacy_notice_clickable3)
+    val messageSpannable = SpannableString(content)
+
+    val clickableSpan1 = PrivacyContentSpan(Position.POS1, context)
+    val clickableSpan2 = PrivacyContentSpan(Position.POS2, context)
+    val clickableSpan3 = PrivacyContentSpan(Position.POS3, context)
+
+    messageSpannable.setSpan(clickableSpan1, content.indexOf(messageClickable1),
+        content.indexOf(messageClickable1) + messageClickable1.length, Spanned.SPAN_INCLUSIVE_INCLUSIVE)
+    messageSpannable.setSpan(clickableSpan2, content.indexOf(messageClickable2),
+        content.indexOf(messageClickable2) + messageClickable2.length, Spanned.SPAN_INCLUSIVE_INCLUSIVE)
+    messageSpannable.setSpan(clickableSpan3, content.indexOf(messageClickable3),
+        content.indexOf(messageClickable3) + messageClickable3.length, Spanned.SPAN_INCLUSIVE_INCLUSIVE)
+
+    // Users can only use fenix after they agree with the privacy notice
+    val builder = AlertDialog.Builder(activity)
+        .setPositiveButton(context.getString(R.string.privacy_notice_positive_button),
+            DialogInterface.OnClickListener { _, _ ->
+                context.settings().shouldShowPrivacyPopWindow = false
+            })
+        .setNeutralButton(context.getString(R.string.privacy_notice_neutral_button),
+            DialogInterface.OnClickListener { _, _ -> exitProcess(0) })
+        .setTitle(context.getString(R.string.privacy_notice_title))
+        .setMessage(messageSpannable)
+        .setCancelable(false)
+    val alertDialog: AlertDialog = builder.create()
+    alertDialog.show()
+    alertDialog.findViewById<TextView>(android.R.id.message)?.movementMethod = LinkMovementMethod.getInstance()
+}
diff --git a/app/src/main/java/org/mozilla/fenix/home/mozonline/PrivacyContentSpan.kt b/app/src/main/java/org/mozilla/fenix/home/mozonline/PrivacyContentSpan.kt
new file mode 100644
index 000000000..c718a6654
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/home/mozonline/PrivacyContentSpan.kt
@@ -0,0 +1,44 @@
+/* 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.home.mozonline
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.text.style.ClickableSpan
+import android.view.View
+
+object Position {
+    const val POS1 = 1
+    const val POS2 = 2
+    const val POS3 = 3
+}
+
+object ADDR {
+    const val URL1 = "https://www.mozilla.org/en-US/MPL/"
+    const val URL2 = "https://www.mozilla.org/en-US/foundation/trademarks/policy/"
+    const val URL3 = "https://www.mozilla.org/zh-CN/privacy/firefox/"
+}
+
+class PrivacyContentSpan(var pos: Int, var context: Context) :
+    ClickableSpan() {
+    override fun onClick(widget: View) {
+        /**
+         *  To avoid users directly using fenix by clicking these urls before
+         *  they click positive button of privacy notice alert dialog, start
+         *  PrivacyContentDisplayActivity to display them.
+         */
+        val engineViewIntent = Intent(context, PrivacyContentDisplayActivity::class.java)
+        engineViewIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+        val addr = Bundle()
+        when (pos) {
+            Position.POS1 -> addr.putString("url", ADDR.URL1)
+            Position.POS2 -> addr.putString("url", ADDR.URL2)
+            Position.POS3 -> addr.putString("url", ADDR.URL3)
+        }
+        engineViewIntent.putExtras(addr)
+        context.startActivity(engineViewIntent)
+    }
+}
diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkAdapter.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkAdapter.kt
index f6f6a368d..e85ded68a 100644
--- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkAdapter.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkAdapter.kt
@@ -21,23 +21,25 @@ import org.mozilla.fenix.library.bookmarks.viewholders.BookmarkSeparatorViewHold
 class BookmarkAdapter(private val emptyView: View, private val interactor: BookmarkViewInteractor) :
     RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
-    private var tree: List<BookmarkNode> = listOf()
+    @VisibleForTesting var tree: List<BookmarkNode> = listOf()
     private var mode: BookmarkFragmentState.Mode = BookmarkFragmentState.Mode.Normal()
     private var isFirstRun = true
 
     fun updateData(tree: BookmarkNode?, mode: BookmarkFragmentState.Mode) {
-        // Display folders above all other bookmarks.
         val allNodes = tree?.children.orEmpty()
         val folders: MutableList<BookmarkNode> = mutableListOf()
         val notFolders: MutableList<BookmarkNode> = mutableListOf()
+        val separators: MutableList<BookmarkNode> = mutableListOf()
         allNodes.forEach {
-            if (it.type == BookmarkNodeType.FOLDER) {
-                folders.add(it)
-            } else {
-                notFolders.add(it)
+            when (it.type) {
+                BookmarkNodeType.SEPARATOR -> separators.add(it)
+                BookmarkNodeType.FOLDER -> folders.add(it)
+                else -> notFolders.add(it)
             }
         }
-        val newTree = folders + notFolders
+        // Display folders above all other bookmarks. Exclude separators.
+        // For separator removal, see discussion in https://github.com/mozilla-mobile/fenix/issues/15214
+        val newTree = folders + notFolders - separators
 
         val diffUtil = DiffUtil.calculateDiff(
             BookmarkDiffUtil(
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 d05b3bbc4..f9687e8ad 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
@@ -25,6 +25,7 @@ import mozilla.components.browser.state.state.BrowserState
 import kotlinx.coroutines.launch
 import mozilla.components.browser.state.state.content.DownloadState
 import mozilla.components.feature.downloads.AbstractFetchDownloadService
+import mozilla.components.feature.downloads.DownloadsUseCases
 import mozilla.components.lib.state.ext.consumeFrom
 import mozilla.components.support.base.feature.UserInteractionHandler
 import org.mozilla.fenix.HomeActivity
@@ -50,6 +51,7 @@ class DownloadFragment : LibraryPageFragment<DownloadItem>(), UserInteractionHan
     private lateinit var metrics: MetricController
     private var undoScope: CoroutineScope? = null
     private var pendingDownloadDeletionJob: (suspend () -> Unit)? = null
+    private lateinit var downloadsUseCases: DownloadsUseCases
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -59,6 +61,7 @@ class DownloadFragment : LibraryPageFragment<DownloadItem>(), UserInteractionHan
         val view = inflater.inflate(R.layout.fragment_downloads, container, false)
 
         val items = provideDownloads(requireComponents.core.store.state)
+        downloadsUseCases = requireContext().components.useCases.downloadUseCases
 
         downloadStore = StoreProvider.get(this) {
             DownloadFragmentStore(
@@ -85,6 +88,10 @@ class DownloadFragment : LibraryPageFragment<DownloadItem>(), UserInteractionHan
         return view
     }
 
+    /**
+     * Returns a list of available downloads to be displayed to the user.
+     * Downloads must be COMPLETED and existent on disk.
+     */
     @VisibleForTesting
     internal fun provideDownloads(state: BrowserState): List<DownloadItem> {
         return state.downloads.values
@@ -128,9 +135,7 @@ class DownloadFragment : LibraryPageFragment<DownloadItem>(), UserInteractionHan
                 setPositiveButton(R.string.delete_browsing_data_prompt_allow) { dialog: DialogInterface, _ ->
                     // Use fragment's lifecycle; the view may be gone by the time dialog is interacted with.
                     lifecycleScope.launch(IO) {
-                        context.let {
-                            it.components.useCases.downloadUseCases.removeAllDownloads()
-                        }
+                        downloadsUseCases.removeAllDownloads()
                         updatePendingDownloadToDelete(downloadStore.state.items.toSet())
                         launch(Dispatchers.Main) {
                             showSnackBar(
@@ -146,6 +151,11 @@ class DownloadFragment : LibraryPageFragment<DownloadItem>(), UserInteractionHan
         }
     }
 
+    /**
+     * Schedules [items] for deletion.
+     * Note: When tapping on a download item's "trash" button
+     * (itemView.overflow_menu) this [items].size() will be 1.
+     */
     private fun deleteDownloadItems(items: Set<DownloadItem>) {
         metrics.track(Event.DownloadsItemDeleted)
 
@@ -155,10 +165,10 @@ class DownloadFragment : LibraryPageFragment<DownloadItem>(), UserInteractionHan
             requireView(),
             getMultiSelectSnackBarMessage(items),
             getString(R.string.bookmark_undo_deletion),
-            {
+            onCancel = {
                 undoPendingDeletion(items)
             },
-            getDeleteDownloadItemsOperation(items)
+            operation = getDeleteDownloadItemsOperation(downloadsUseCases, items)
         )
     }
 
@@ -210,6 +220,9 @@ class DownloadFragment : LibraryPageFragment<DownloadItem>(), UserInteractionHan
         else -> super.onOptionsItemSelected(item)
     }
 
+    /**
+     * Provides a message to the Undo snackbar.
+     */
     private fun getMultiSelectSnackBarMessage(downloadItems: Set<DownloadItem>): String {
         return if (downloadItems.size > 1) {
             getString(R.string.download_delete_multiple_items_snackbar_1)
@@ -246,14 +259,18 @@ class DownloadFragment : LibraryPageFragment<DownloadItem>(), UserInteractionHan
         metrics.track(Event.DownloadsItemOpened)
     }
 
-    private fun getDeleteDownloadItemsOperation(items: Set<DownloadItem>): (suspend () -> Unit) {
+    /**
+     * Launches the coroutine to delete the provided [items].
+     */
+    private fun getDeleteDownloadItemsOperation(
+        downloadUseCases: DownloadsUseCases,
+        items: Set<DownloadItem>
+    ): (suspend () -> Unit) {
         return {
             CoroutineScope(IO).launch {
                 downloadStore.dispatch(DownloadFragmentAction.EnterDeletionMode)
-                context?.let {
-                    for (item in items) {
-                        it.components.useCases.downloadUseCases.removeDownload(item.id)
-                    }
+                for (item in items) {
+                    downloadUseCases.removeDownload(item.id)
                 }
                 downloadStore.dispatch(DownloadFragmentAction.ExitDeletionMode)
                 pendingDownloadDeletionJob = null
@@ -261,8 +278,14 @@ class DownloadFragment : LibraryPageFragment<DownloadItem>(), UserInteractionHan
         }
     }
 
+    /**
+     * Queues the [getDeleteDownloadItemsOperation] job in [pendingDownloadDeletionJob] in case
+     * the user exits the fragment and we need to quickly execute the queued deletion.
+     * And adds the [items] to be deleted to the list of [DownloadFragmentStore.pendingDeletionIds],
+     * which is used to determine what items to show and what items to hide from the user.
+     */
     private fun updatePendingDownloadToDelete(items: Set<DownloadItem>) {
-        pendingDownloadDeletionJob = getDeleteDownloadItemsOperation(items)
+        pendingDownloadDeletionJob = getDeleteDownloadItemsOperation(downloadsUseCases, items)
         val ids = items.map { item -> item.id }.toSet()
         downloadStore.dispatch(DownloadFragmentAction.AddPendingDeletionSet(ids))
     }
@@ -273,6 +296,9 @@ class DownloadFragment : LibraryPageFragment<DownloadItem>(), UserInteractionHan
         downloadStore.dispatch(DownloadFragmentAction.UndoPendingDeletionSet(ids))
     }
 
+    /**
+     * Executes pending job(s) when leaving [DownloadFragment].
+     */
     private fun invokePendingDeletion() {
         pendingDownloadDeletionJob?.let {
             viewLifecycleOwner.lifecycleScope.launch {
diff --git a/app/src/main/java/org/mozilla/fenix/media/MediaService.kt b/app/src/main/java/org/mozilla/fenix/media/MediaService.kt
deleted file mode 100644
index 32a1ce2da..000000000
--- a/app/src/main/java/org/mozilla/fenix/media/MediaService.kt
+++ /dev/null
@@ -1,16 +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.media
-
-import mozilla.components.browser.state.store.BrowserStore
-import mozilla.components.feature.media.service.AbstractMediaService
-import org.mozilla.fenix.ext.components
-
-/**
- * [AbstractMediaService] implementation for injecting [BrowserStore] singleton.
- */
-class MediaService : AbstractMediaService() {
-    override val store: BrowserStore by lazy { components.core.store }
-}
diff --git a/app/src/main/java/org/mozilla/fenix/perf/ProfilerMarkerFactProcessor.kt b/app/src/main/java/org/mozilla/fenix/perf/ProfilerMarkerFactProcessor.kt
new file mode 100644
index 000000000..2e493cb2b
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/perf/ProfilerMarkerFactProcessor.kt
@@ -0,0 +1,82 @@
+/* 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.perf
+
+import android.os.Handler
+import android.os.Looper
+import androidx.annotation.VisibleForTesting
+import androidx.annotation.VisibleForTesting.PRIVATE
+import mozilla.components.concept.base.profiler.Profiler
+import mozilla.components.support.base.facts.Action
+import mozilla.components.support.base.facts.Fact
+import mozilla.components.support.base.facts.FactProcessor
+
+/**
+ * A fact processor that adds Gecko profiler markers for [Fact]s matching a specific format.
+ * We look for the following format:
+ * ```
+ * Fact(
+ *     action = Action.IMPLEMENTATION_DETAIL
+ *     item = <marker name>
+ * )
+ * ```
+ *
+ * This allows us to add profiler markers from android-components code. Using the Fact API for this
+ * purpose, rather than calling [Profiler.addMarker] directly inside components, has trade-offs. Its
+ * downsides are that it is less explicit and tooling does not work as well on it. However, we felt
+ * it was worthwhile because:
+ *
+ * 1. we don't know what profiler markers are useful so we want to be able to iterate quickly.
+ * Adding dependencies on the Profiler and landing these changes across two repos hinders that
+ * 2. we want to instrument the code as close to specific method calls as possible (e.g.
+ * GeckoSession.loadUrl) but it's not always easy to do so (e.g. in the previous example, passing a
+ * Profiler reference to GeckoEngineSession is difficult because GES is not a global dependency)
+ * 3. we can only add Profiler markers from the main thread so adding markers will become more
+ * difficult if we have to understand the threading needs of each Profiler call site
+ *
+ * An additional benefit with having this infrastructure is that it's easy to add Profiler markers
+ * for local debugging.
+ *
+ * That being said, if we find a location where it would be valuable to have a long term Profiler
+ * marker, we should consider instrumenting it via the [Profiler] API.
+ */
+class ProfilerMarkerFactProcessor @VisibleForTesting(otherwise = PRIVATE) constructor(
+    // We use a provider to defer accessing the profiler until we need it, because the property is a
+    // child of the engine property and we don't want to initialize it earlier than we intend to.
+    private val profilerProvider: () -> Profiler?,
+    private val mainHandler: Handler = Handler(Looper.getMainLooper()),
+    private val getMyLooper: () -> Looper? = { Looper.myLooper() }
+) : FactProcessor {
+
+    override fun process(fact: Fact) {
+        if (fact.action != Action.IMPLEMENTATION_DETAIL) {
+            return
+        }
+
+        val markerName = fact.item
+
+        // Java profiler markers can only be added from the main thread so, for now, we push all
+        // markers to the the main thread (which also groups all the markers together,
+        // making it easier to read).
+        val profiler = profilerProvider()
+        if (getMyLooper() == mainHandler.looper) {
+            profiler?.addMarker(markerName)
+        } else {
+            // To reduce the performance burden, we could early return if the profiler isn't active.
+            // However, this would change the performance characteristics from when the profiler is
+            // active and when it's inactive so we always post instead.
+            val now = profiler?.getProfilerTime()
+            mainHandler.post {
+                // We set now to both start and end time because we want a marker of without duration
+                // and if end is omitted, the duration is created implicitly.
+                profiler?.addMarker(markerName, now, now, null)
+            }
+        }
+    }
+
+    companion object {
+        fun create(profilerProvider: () -> Profiler?) = ProfilerMarkerFactProcessor(profilerProvider)
+    }
+}
diff --git a/app/src/main/java/org/mozilla/fenix/perf/ProfilerMarkers.kt b/app/src/main/java/org/mozilla/fenix/perf/ProfilerMarkers.kt
new file mode 100644
index 000000000..783992303
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/perf/ProfilerMarkers.kt
@@ -0,0 +1,22 @@
+/* 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.perf
+
+import android.view.View
+import androidx.core.view.doOnPreDraw
+import mozilla.components.concept.base.profiler.Profiler
+
+/**
+ * A container for functions for when adding a profiler marker is less readable
+ * (e.g. multiple lines, more advanced logic).
+ */
+object ProfilerMarkers {
+
+    fun homeActivityOnStart(rootContainer: View, profiler: Profiler?) {
+        rootContainer.doOnPreDraw {
+            profiler?.addMarker("onPreDraw", "expected first frame via HomeActivity.onStart")
+        }
+    }
+}
diff --git a/app/src/main/java/org/mozilla/fenix/perf/StartupFrameworkStartMeasurement.kt b/app/src/main/java/org/mozilla/fenix/perf/StartupFrameworkStartMeasurement.kt
index dbc4d2c24..47953d9b7 100644
--- a/app/src/main/java/org/mozilla/fenix/perf/StartupFrameworkStartMeasurement.kt
+++ b/app/src/main/java/org/mozilla/fenix/perf/StartupFrameworkStartMeasurement.kt
@@ -54,20 +54,30 @@ internal class StartupFrameworkStartMeasurement(
         if (applicationInitNanos < 0) {
             telemetry.frameworkStartError.set(true)
         } else {
+            val clockTicksPerSecond = stat.clockTicksPerSecond.also {
+                // framework* is derived from the number of clock ticks per second. To ensure this
+                // value does not throw off our result, we capture it too.
+                telemetry.clockTicksPerSecond.add(it.toInt())
+            }
+
+            // In our brief analysis, clock ticks per second was overwhelmingly equal to 100. To make
+            // analysis easier in GLAM, we split the results into two separate metrics. See the
+            // metric descriptions for more details.
+            @Suppress("MagicNumber") // it's more confusing to separate the comment above from the value declaration.
+            val durationMetric =
+                if (clockTicksPerSecond == 100L) telemetry.frameworkPrimary else telemetry.frameworkSecondary
+
             try {
-                telemetry.frameworkStart.setRawNanos(getFrameworkStartNanos())
+                durationMetric.setRawNanos(getFrameworkStartNanos())
             } catch (e: FileNotFoundException) {
                 // Privacy managers can add hooks that block access to reading system /proc files.
                 // We want to catch these exception and report an error on accessing the file
                 // rather than an implementation error.
                 telemetry.frameworkStartReadError.set(true)
             }
-
-            // frameworkStart is derived from the number of clock ticks per second. To ensure this
-            // value does not throw off our result, we capture it too.
-            telemetry.clockTicksPerSecond.add(stat.clockTicksPerSecond.toInt())
         }
     }
+
     /**
      * @throws [java.io.FileNotFoundException]
      */
diff --git a/app/src/main/java/org/mozilla/fenix/perf/StrictModeManager.kt b/app/src/main/java/org/mozilla/fenix/perf/StrictModeManager.kt
index 391051707..845076d8c 100644
--- a/app/src/main/java/org/mozilla/fenix/perf/StrictModeManager.kt
+++ b/app/src/main/java/org/mozilla/fenix/perf/StrictModeManager.kt
@@ -10,6 +10,7 @@
 package org.mozilla.fenix.perf
 
 import android.os.Build
+import android.os.Handler
 import android.os.Looper
 import android.os.StrictMode
 import androidx.annotation.VisibleForTesting
@@ -19,11 +20,12 @@ import androidx.fragment.app.FragmentManager
 import mozilla.components.support.ktx.android.os.resetAfter
 import org.mozilla.fenix.Config
 import org.mozilla.fenix.components.Components
+import org.mozilla.fenix.utils.ManufacturerCodes
 import org.mozilla.fenix.utils.Mockable
+import java.util.concurrent.Executors
 import java.util.concurrent.atomic.AtomicLong
 
-private const val MANUFACTURE_HUAWEI: String = "HUAWEI"
-private const val MANUFACTURE_ONE_PLUS: String = "OnePlus"
+private const val DELAY_TO_REMOVE_STRICT_MODE_MILLIS = 1000L
 
 private val logger = Performance.logger
 private val mainLooper = Looper.getMainLooper()
@@ -65,8 +67,8 @@ class StrictModeManager(
             val threadPolicy = StrictMode.ThreadPolicy.Builder()
                 .detectAll()
                 .penaltyLog()
-            if (setPenaltyDeath && Build.MANUFACTURER !in strictModeExceptionList) {
-                threadPolicy.penaltyDeath()
+            if (setPenaltyDeath) {
+                threadPolicy.penaltyDeathWithIgnores()
             }
             StrictMode.setThreadPolicy(threadPolicy.build())
 
@@ -96,10 +98,18 @@ class StrictModeManager(
         fragmentManager.registerFragmentLifecycleCallbacks(object :
             FragmentManager.FragmentLifecycleCallbacks() {
             override fun onFragmentResumed(fm: FragmentManager, f: Fragment) {
-                enableStrictMode(setPenaltyDeath = false)
                 fm.unregisterFragmentLifecycleCallbacks(this)
-            }
-        }, false)
+
+                // If we don't post when using penaltyListener on P+, the violation listener is never
+                // called. My best guess is that, unlike penaltyDeath, the violations are not
+                // delivered instantaneously so posting gives time for the violation listeners to
+                // run before they are removed here. This may be a race so we give the listeners a
+                // little extra time to run too though this way we may accidentally trigger
+                // violations for non-startup, which we haven't planned to do yet.
+                Handler(mainLooper).postDelayed({
+                    enableStrictMode(setPenaltyDeath = false)
+                }, DELAY_TO_REMOVE_STRICT_MODE_MILLIS)
+            } }, false)
     }
 
     /**
@@ -137,13 +147,35 @@ class StrictModeManager(
             functionBlock()
         }
     }
+}
 
-    /**
-     * There are certain manufacturers that have custom font classes for the OS systems.
-     * These classes violates the [StrictMode] policies on startup. As a workaround, we create
-     * an exception list for these manufacturers so that dialogs do not show up on start up.
-     * To add a new manufacturer to the list, log "Build.MANUFACTURER" from the device to get the
-     * exact name of the manufacturer.
-     */
-    private val strictModeExceptionList = setOf(MANUFACTURE_HUAWEI, MANUFACTURE_ONE_PLUS)
+/**
+ * There are certain manufacturers that have custom font classes for the OS systems.
+ * These classes violates the [StrictMode] policies on startup. As a workaround, we create
+ * an exception list for these manufacturers so that dialogs do not show up on start up.
+ * To add a new manufacturer to the list, log "Build.MANUFACTURER" from the device to get the
+ * exact name of the manufacturer.
+ */
+private val strictModeExceptionList = setOf(ManufacturerCodes.HUAWEI, ManufacturerCodes.ONE_PLUS)
+
+private fun StrictMode.ThreadPolicy.Builder.penaltyDeathWithIgnores(): StrictMode.ThreadPolicy.Builder {
+    // This workaround was added before we realized we can ignored based on violation contents
+    // (see code below). This solution - blanket disabling StrictMode on some manufacturers - isn't
+    // great so, if we have time, we should consider reimplementing these fixes using the methods below.
+    if (Build.MANUFACTURER in strictModeExceptionList) {
+        return this
+    }
+
+    // If we want to apply ignores based on stack trace contents to APIs below P, we can use this methodology:
+    // https://medium.com/@tokudu/how-to-whitelist-strictmode-violations-on-android-based-on-stacktrace-eb0018e909aa
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
+        penaltyDeath()
+    } else {
+        // Ideally, we'd use a shared thread pool but we don't have any on the system currently
+        // (all shared ones are coroutine dispatchers).
+        val executor = Executors.newSingleThreadExecutor()
+        penaltyListener(executor, ThreadPenaltyDeathWithIgnoresListener())
+    }
+
+    return this
 }
diff --git a/app/src/main/java/org/mozilla/fenix/perf/ThreadPenaltyDeathWithIgnoresListener.kt b/app/src/main/java/org/mozilla/fenix/perf/ThreadPenaltyDeathWithIgnoresListener.kt
new file mode 100644
index 000000000..fcc7774b3
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/perf/ThreadPenaltyDeathWithIgnoresListener.kt
@@ -0,0 +1,73 @@
+/* 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.perf
+
+import android.os.Build
+import android.os.StrictMode
+import android.os.strictmode.Violation
+import androidx.annotation.RequiresApi
+import mozilla.components.support.base.log.logger.Logger
+import org.mozilla.fenix.utils.ManufacturerCodes
+
+private const val FCQN_EDM_STORAGE_PROVIDER_BASE = "com.android.server.enterprise.storage.EdmStorageProviderBase"
+
+/**
+ * A [StrictMode.OnThreadViolationListener] that recreates
+ * [StrictMode.ThreadPolicy.Builder.penaltyDeath] but will ignore some violations. For example,
+ * sometimes OEMs will add code that violates StrictMode so we can ignore them here instead of
+ * cluttering up our code with resetAfter.
+ *
+ * This class can only be used with Android P+ so we'd have to implement workarounds if the
+ * violations we want to ignore affect older devices.
+ */
+@RequiresApi(Build.VERSION_CODES.P)
+class ThreadPenaltyDeathWithIgnoresListener(
+    private val logger: Logger = Performance.logger
+) : StrictMode.OnThreadViolationListener {
+
+    override fun onThreadViolation(violation: Violation?) {
+        if (violation == null) return
+
+        // Unfortunately, this method gets called many (~5+) times with the same violation so we end
+        // up logging/throwing redundantly.
+        if (shouldViolationBeIgnored(violation)) {
+            logger.debug("Ignoring StrictMode ThreadPolicy violation", violation)
+        } else {
+            penaltyDeath(violation)
+        }
+    }
+
+    @Suppress("TooGenericExceptionThrown") // we throw what StrictMode's penaltyDeath throws.
+    private fun penaltyDeath(violation: Violation) {
+        throw RuntimeException("StrictMode ThreadPolicy violation", violation)
+    }
+
+    private fun shouldViolationBeIgnored(violation: Violation): Boolean =
+        isSamsungLgEdmStorageProviderStartupViolation(violation)
+
+    private fun isSamsungLgEdmStorageProviderStartupViolation(violation: Violation): Boolean {
+        // Root issue: https://github.com/mozilla-mobile/fenix/issues/17920
+        //
+        // This fix may address the issues seen in this bug:
+        // https://github.com/mozilla-mobile/fenix/issues/15430
+        // So we might be able to back out the changes made there. However, I don't have a device to
+        // test so I didn't bother.
+        //
+        // This issue occurs on the Galaxy S10e, Galaxy A50, Note 10, and LG G7 FIT but not the S7:
+        // I'm guessing it's just a problem on recent Samsungs and LGs so it's okay being in this P+
+        // listener.
+        if (!ManufacturerCodes.isSamsung && !ManufacturerCodes.isLG) {
+            return false
+        }
+
+        // To ignore this warning, we can inspect the stack trace. There are no parts of the
+        // violation stack trace that are clearly unique to this violation but
+        // EdmStorageProviderBase doesn't appear in Android code search so we match against it.
+        // This class may be used in other violations that we're capable of fixing but this
+        // code may ignore them. I think it's okay - we keep this code simple and if it was a serious
+        // issue, we'd catch it on other manufacturers.
+        return violation.stackTrace.any { it.className == FCQN_EDM_STORAGE_PROVIDER_BASE }
+    }
+}
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 6e20a2972..f1b5adcdb 100644
--- a/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt
@@ -116,6 +116,7 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler {
         }
     }
 
+    @SuppressWarnings("LongMethod")
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -172,10 +173,13 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler {
         val awesomeBar = view.awesome_bar
         awesomeBar.customizeForBottomToolbar = requireContext().settings().shouldUseBottomToolbar
 
+        val fromHomeFragment =
+            findNavController().previousBackStackEntry?.destination?.id == R.id.homeFragment
         awesomeBarView = AwesomeBarView(
             activity,
             interactor,
-            awesomeBar
+            awesomeBar,
+            fromHomeFragment
         )
 
         view.awesome_bar.setOnTouchListener { _, _ ->
@@ -191,7 +195,7 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler {
 
         requireComponents.core.engine.speculativeCreateSession(isPrivate)
 
-        if (findNavController().previousBackStackEntry?.destination?.id == R.id.homeFragment) {
+        if (fromHomeFragment) {
             // When displayed above home, dispatches the touch events to scrim area to the HomeFragment
             view.search_wrapper.background = ColorDrawable(Color.TRANSPARENT)
             dialog?.window?.decorView?.setOnTouchListener { _, event ->
@@ -467,8 +471,15 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler {
                 clear(pill_wrapper.id, BOTTOM)
                 connect(pill_wrapper.id, BOTTOM, toolbar.id, TOP)
 
+                clear(awesome_bar.id, TOP)
+                clear(awesome_bar.id, BOTTOM)
+                connect(awesome_bar.id, TOP, search_suggestions_hint.id, BOTTOM)
+                connect(awesome_bar.id, BOTTOM, pill_wrapper.id, TOP)
+
                 clear(search_suggestions_hint.id, TOP)
+                clear(search_suggestions_hint.id, BOTTOM)
                 connect(search_suggestions_hint.id, TOP, PARENT_ID, TOP)
+                connect(search_suggestions_hint.id, BOTTOM, search_hint_bottom_barrier.id, TOP)
 
                 clear(fill_link_from_clipboard.id, TOP)
                 connect(fill_link_from_clipboard.id, BOTTOM, pill_wrapper.id, TOP)
@@ -483,7 +494,10 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler {
 
     private fun updateSearchSuggestionsHintVisibility(state: SearchFragmentState) {
         view?.apply {
-            val showHint = state.showSearchSuggestionsHint && !state.showSearchShortcuts
+            val showHint = state.showSearchSuggestionsHint &&
+                    !state.showSearchShortcuts &&
+                    state.url != state.query
+
             findViewById<View>(R.id.search_suggestions_hint)?.isVisible = showHint
             search_suggestions_hint_divider?.isVisible = showHint
         }
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 7d97dea8f..cd9fa8c8b 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
@@ -10,7 +10,6 @@ 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.session.Session
 import mozilla.components.browser.state.search.SearchEngine
 import mozilla.components.concept.awesomebar.AwesomeBar
 import mozilla.components.concept.engine.EngineSession
@@ -42,7 +41,8 @@ import mozilla.components.browser.search.SearchEngine as LegacySearchEngine
 class AwesomeBarView(
     private val activity: HomeActivity,
     val interactor: AwesomeBarInteractor,
-    val view: BrowserAwesomeBar
+    val view: BrowserAwesomeBar,
+    private val fromHomeFragment: Boolean
 ) {
     private val sessionProvider: SessionSuggestionProvider
     private val historyStorageProvider: HistoryStorageSuggestionProvider
@@ -85,10 +85,6 @@ class AwesomeBarView(
     }
 
     private val selectTabUseCase = object : TabsUseCases.SelectTabUseCase {
-        override fun invoke(session: Session) {
-            interactor.onExistingSessionSelected(session.id)
-        }
-
         override fun invoke(tabId: String) {
             interactor.onExistingSessionSelected(tabId)
         }
@@ -111,7 +107,7 @@ class AwesomeBarView(
                 selectTabUseCase,
                 components.core.icons,
                 getDrawable(activity, R.drawable.ic_search_results_tab),
-                excludeSelectedSession = true
+                excludeSelectedSession = !fromHomeFragment
             )
 
         historyStorageProvider =
diff --git a/app/src/main/java/org/mozilla/fenix/settings/DataChoicesFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/DataChoicesFragment.kt
index 03f7d5deb..ca0229a2a 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/DataChoicesFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/DataChoicesFragment.kt
@@ -31,6 +31,10 @@ class DataChoicesFragment : PreferenceFragmentCompat() {
                 } else {
                     context.components.analytics.metrics.stop(MetricServiceType.Data)
                 }
+                // Reset experiment identifiers on both opt-in and opt-out; it's likely
+                // that in future we will need to pass in the new telemetry client_id
+                // to this method when the user opts back in.
+                context.components.analytics.experiments.resetTelemetryIdentifiers()
             } else if (key == getPreferenceKey(R.string.pref_key_marketing_telemetry)) {
                 if (context.settings().isMarketingTelemetryEnabled) {
                     context.components.analytics.metrics.start(MetricServiceType.Marketing)
diff --git a/app/src/main/java/org/mozilla/fenix/settings/PrivateBrowsingFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/PrivateBrowsingFragment.kt
index ff0515af0..2a9812054 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/PrivateBrowsingFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/PrivateBrowsingFragment.kt
@@ -5,9 +5,11 @@
 package org.mozilla.fenix.settings
 
 import android.os.Bundle
+import android.view.WindowManager
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.SwitchPreference
+import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
 import org.mozilla.fenix.components.PrivateShortcutCreateManager
 import org.mozilla.fenix.components.metrics.Event
@@ -44,7 +46,18 @@ class PrivateBrowsingFragment : PreferenceFragmentCompat() {
         }
 
         requirePreference<SwitchPreference>(R.string.pref_key_allow_screenshots_in_private_mode).apply {
-            onPreferenceChangeListener = SharedPreferenceUpdater()
+            onPreferenceChangeListener = object : SharedPreferenceUpdater() {
+                override fun onPreferenceChange(preference: Preference, newValue: Any?): Boolean {
+                    if ((activity as? HomeActivity)?.browsingModeManager?.mode?.isPrivate == true &&
+                        newValue == false
+                    ) {
+                        activity?.window?.addFlags(WindowManager.LayoutParams.FLAG_SECURE)
+                    } else {
+                        activity?.window?.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
+                    }
+                    return super.onPreferenceChange(preference, newValue)
+                }
+            }
         }
     }
 }
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 d63bfeee0..54c91d802 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt
@@ -6,10 +6,7 @@ package org.mozilla.fenix.settings
 
 import android.os.Bundle
 import androidx.preference.PreferenceFragmentCompat
-import androidx.preference.SwitchPreference
-import org.mozilla.fenix.FeatureFlags
 import org.mozilla.fenix.R
-import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.ext.showToolbar
 
 class SecretSettingsFragment : PreferenceFragmentCompat() {
@@ -21,11 +18,5 @@ class SecretSettingsFragment : PreferenceFragmentCompat() {
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         setPreferencesFromResource(R.xml.secret_settings_preferences, rootKey)
-
-        requirePreference<SwitchPreference>(R.string.pref_key_synced_tabs_tabs_tray).apply {
-            isVisible = FeatureFlags.syncedTabsInTabsTray
-            isChecked = context.settings().syncedTabsInTabsTray
-            onPreferenceChangeListener = SharedPreferenceUpdater()
-        }
     }
 }
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 2bf9ad3a0..ea8fd5753 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
@@ -14,6 +14,7 @@ import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.os.Handler
+import android.os.Looper
 import android.view.LayoutInflater
 import android.widget.Toast
 import androidx.annotation.VisibleForTesting
@@ -335,7 +336,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
                             Toast.LENGTH_LONG
                         ).show()
 
-                        Handler().postDelayed({
+                        Handler(Looper.getMainLooper()).postDelayed({
                             exitProcess(0)
                         }, AMO_COLLECTION_OVERRIDE_EXIT_DELAY)
                     }
@@ -406,7 +407,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
                         getString(R.string.toast_override_fxa_sync_server_done),
                         Toast.LENGTH_LONG
                     ).show()
-                    Handler().postDelayed({
+                    Handler(Looper.getMainLooper()).postDelayed({
                         exitProcess(0)
                     }, FXA_SYNC_OVERRIDE_EXIT_DELAY)
                 }
@@ -434,8 +435,14 @@ class SettingsFragment : PreferenceFragmentCompat() {
             Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q -> {
                 Preference.OnPreferenceClickListener {
                     requireContext().getSystemService(RoleManager::class.java).also {
-                        if (!it.isRoleHeld(RoleManager.ROLE_BROWSER)) {
-                            startActivityForResult(it.createRequestRoleIntent(RoleManager.ROLE_BROWSER), 0)
+                        if (it.isRoleAvailable(RoleManager.ROLE_BROWSER) && !it.isRoleHeld(
+                                RoleManager.ROLE_BROWSER
+                            )
+                        ) {
+                            startActivityForResult(
+                                it.createRequestRoleIntent(RoleManager.ROLE_BROWSER),
+                                REQUEST_CODE_BROWSER_ROLE
+                            )
                         } else {
                             navigateUserToDefaultAppsSettings()
                         }
@@ -452,12 +459,12 @@ class SettingsFragment : PreferenceFragmentCompat() {
             else -> {
                 Preference.OnPreferenceClickListener {
                     (activity as HomeActivity).openToBrowserAndLoad(
-                            searchTermOrURL = SupportUtils.getSumoURLForTopic(
-                                    requireContext(),
-                                    SupportUtils.SumoTopic.SET_AS_DEFAULT_BROWSER
-                            ),
-                            newTab = true,
-                            from = BrowserDirection.FromSettings
+                        searchTermOrURL = SupportUtils.getSumoURLForTopic(
+                            requireContext(),
+                            SupportUtils.SumoTopic.SET_AS_DEFAULT_BROWSER
+                        ),
+                        newTab = true,
+                        from = BrowserDirection.FromSettings
                     )
                     true
                 }
@@ -468,12 +475,9 @@ class SettingsFragment : PreferenceFragmentCompat() {
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
 
-        /*
-        If role manager doesn't show in-app browser changing dialog for a reason, navigate user to
-        Default Apps Settings.
-         */
-        if (resultCode == Activity.RESULT_CANCELED && requestCode == 0) {
-            navigateUserToDefaultAppsSettings()
+        // If the user made us the default browser, update the switch
+        if (resultCode == Activity.RESULT_OK && requestCode == REQUEST_CODE_BROWSER_ROLE) {
+            updateMakeDefaultBrowserPreference()
         }
     }
 
@@ -547,6 +551,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
     }
 
     companion object {
+        private const val REQUEST_CODE_BROWSER_ROLE = 1
         private const val SCROLL_INDICATOR_DELAY = 10L
         private const val FXA_SYNC_OVERRIDE_EXIT_DELAY = 2000L
         private const val AMO_COLLECTION_OVERRIDE_EXIT_DELAY = 3000L
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 63fe12c87..10b031877 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
@@ -13,6 +13,7 @@ import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
+import android.view.WindowManager
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.Fragment
@@ -111,6 +112,14 @@ class LoginDetailFragment : Fragment(R.layout.fragment_login_detail) {
         setHasOptionsMenu(true)
     }
 
+    override fun onResume() {
+        super.onResume()
+        activity?.window?.setFlags(
+            WindowManager.LayoutParams.FLAG_SECURE,
+            WindowManager.LayoutParams.FLAG_SECURE
+        )
+    }
+
     /**
      * As described in #10727, the User should re-auth if the fragment is paused and the user is not
      * navigating to SavedLoginsFragment or EditLoginFragment
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 130e856a6..9339dcdbe 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
@@ -150,6 +150,8 @@ class SavedLoginsFragment : Fragment() {
         toolbarChildContainer.visibility = View.GONE
         (activity as HomeActivity).getSupportActionBarAndInflateIfNecessary().setDisplayShowTitleEnabled(true)
         sortingStrategyMenu.menuController.dismiss()
+        sortLoginsMenuRoot.setOnClickListener(null)
+        setHasOptionsMenu(false)
 
         redirectToReAuth(listOf(R.id.loginDetailFragment), findNavController().currentDestination?.id)
         super.onPause()
diff --git a/app/src/main/java/org/mozilla/fenix/settings/logins/view/LoginsListViewHolder.kt b/app/src/main/java/org/mozilla/fenix/settings/logins/view/LoginsListViewHolder.kt
index 223139995..f6c89acbb 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/logins/view/LoginsListViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/logins/view/LoginsListViewHolder.kt
@@ -5,6 +5,7 @@
 package org.mozilla.fenix.settings.logins.view
 
 import android.view.View
+import androidx.core.view.isVisible
 import kotlinx.android.synthetic.main.logins_item.*
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.loadIntoView
@@ -28,6 +29,7 @@ class LoginsListViewHolder(
             timeLastUsed = item.timeLastUsed
         )
         webAddressView.text = item.origin
+        usernameView.isVisible = item.username.isNotEmpty()
         usernameView.text = item.username
 
         updateFavIcon(item.origin)
diff --git a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsFragmentState.kt b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsFragmentState.kt
index 056db2e20..2caf3fc60 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsFragmentState.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsFragmentState.kt
@@ -234,17 +234,17 @@ sealed class AutoplayValue(
             val rules = settings.getSitePermissionsCustomSettingsRules()
             return listOf(
                 AllowAll(
-                    context.getString(R.string.preference_option_autoplay_allowed2),
+                    context.getString(R.string.quick_setting_option_autoplay_allowed),
                     rules,
                     sitePermission
                 ),
                 BlockAll(
-                    context.getString(R.string.preference_option_autoplay_blocked3),
+                    context.getString(R.string.quick_setting_option_autoplay_blocked),
                     rules,
                     sitePermission
                 ),
                 BlockAudible(
-                    context.getString(R.string.preference_option_autoplay_block_audio2),
+                    context.getString(R.string.quick_setting_option_autoplay_block_audio),
                     rules,
                     sitePermission
                 )
diff --git a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/WebsitePermissionsView.kt b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/WebsitePermissionsView.kt
index 8cc26d7fb..dc1735d33 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/WebsitePermissionsView.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/WebsitePermissionsView.kt
@@ -12,6 +12,7 @@ import android.widget.ArrayAdapter
 import android.widget.TextView
 import androidx.annotation.VisibleForTesting
 import androidx.appcompat.widget.AppCompatSpinner
+import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import kotlinx.android.extensions.LayoutContainer
 import kotlinx.android.synthetic.main.quicksettings_permissions.view.*
@@ -151,11 +152,34 @@ class WebsitePermissionsView(
                 }
 
                 val selectedIndex = permissionState.options.indexOf(permissionState.autoplayValue)
-                val adapter = ArrayAdapter(
+
+                val adapter = object : ArrayAdapter<AutoplayValue>(
                     context,
                     R.layout.quicksettings_permission_spinner_item,
                     permissionState.options
-                )
+                ) {
+                    override fun getDropDownView(
+                        position: Int,
+                        convertView: View?,
+                        parent: ViewGroup
+                    ): View {
+                        val view = super.getDropDownView(
+                            position,
+                            convertView,
+                            parent
+                        )
+                        if (position == viewHolder.status.selectedItemPosition) {
+                            view.setBackgroundColor(
+                                ContextCompat.getColor(
+                                    context,
+                                    R.color.spinner_selected_item
+                                )
+                            )
+                        }
+                        return view
+                    }
+                }
+
                 adapter.setDropDownViewResource(R.layout.quicksetting_permission_spinner_dropdown)
                 viewHolder.status.adapter = adapter
 
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 4c7daaed0..4f459f84e 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
@@ -13,12 +13,20 @@ import org.mozilla.fenix.components.Components
 import org.mozilla.fenix.settings.PhoneFeature
 
 /**
- * Try to reload a session if a session with the given [origin] it is found.
- * @param origin The origin the session to be reloaded.
+ * Reloads the last used tab matching the provided origin. For performance
+ * reasons we don't want to reload all matching tabs. Reloading the last used
+ * tab is a good compromise as it's likely the reason for a change in site
+ * permissions.
+ *
+ * @param origin The origin of the tab to reload.
  */
 internal fun Components.tryReloadTabBy(origin: String) {
-    val session = core.sessionManager.all.find { it.url.toUri().host == origin }
-    useCases.sessionUseCases.reload(session)
+    core.store.state.tabs
+        .sortedByDescending { it.lastAccess }
+        .find { it.content.url.toUri().host == origin }
+        ?.let {
+            useCases.sessionUseCases.reload(it.id)
+        }
 }
 
 internal fun initBlockedByAndroidView(phoneFeature: PhoneFeature, blockedByAndroidView: View) {
diff --git a/app/src/main/java/org/mozilla/fenix/sync/SyncedTabsFragment.kt b/app/src/main/java/org/mozilla/fenix/sync/SyncedTabsFragment.kt
index 8acfbab99..2c5018629 100644
--- a/app/src/main/java/org/mozilla/fenix/sync/SyncedTabsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/sync/SyncedTabsFragment.kt
@@ -17,7 +17,6 @@ import mozilla.components.browser.storage.sync.Tab
 import mozilla.components.feature.syncedtabs.SyncedTabsFeature
 import mozilla.components.support.base.feature.ViewBoundFeatureWrapper
 import org.mozilla.fenix.BrowserDirection
-import org.mozilla.fenix.FeatureFlags
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
 import org.mozilla.fenix.ext.components
@@ -28,11 +27,6 @@ import org.mozilla.fenix.theme.ThemeManager
 class SyncedTabsFragment : LibraryPageFragment<Tab>() {
     private val syncedTabsFeature = ViewBoundFeatureWrapper<SyncedTabsFeature>()
 
-    init {
-        // Sanity-check: Remove this class when the feature flag is always enabled.
-        FeatureFlags.syncedTabsInTabsTray
-    }
-
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
diff --git a/app/src/main/java/org/mozilla/fenix/sync/SyncedTabsLayout.kt b/app/src/main/java/org/mozilla/fenix/sync/SyncedTabsLayout.kt
index 56255910c..b6c65b90e 100644
--- a/app/src/main/java/org/mozilla/fenix/sync/SyncedTabsLayout.kt
+++ b/app/src/main/java/org/mozilla/fenix/sync/SyncedTabsLayout.kt
@@ -19,7 +19,6 @@ import kotlinx.coroutines.launch
 import mozilla.components.browser.storage.sync.SyncedDeviceTabs
 import mozilla.components.browser.storage.sync.Tab
 import mozilla.components.feature.syncedtabs.view.SyncedTabsView
-import org.mozilla.fenix.FeatureFlags
 import org.mozilla.fenix.R
 import org.mozilla.fenix.components.metrics.Event
 import org.mozilla.fenix.components.metrics.MetricController
@@ -47,9 +46,6 @@ class SyncedTabsLayout @JvmOverloads constructor(
         synced_tabs_list.adapter = adapter
 
         synced_tabs_pull_to_refresh.setOnRefreshListener { listener?.onRefresh() }
-
-        // Sanity-check: Remove this class when the feature flag is always enabled.
-        FeatureFlags.syncedTabsInTabsTray
     }
 
     override fun onError(error: SyncedTabsView.ErrorType) {
diff --git a/app/src/main/java/org/mozilla/fenix/tabtray/SyncedTabsController.kt b/app/src/main/java/org/mozilla/fenix/tabtray/SyncedTabsController.kt
deleted file mode 100644
index b982ca21a..000000000
--- a/app/src/main/java/org/mozilla/fenix/tabtray/SyncedTabsController.kt
+++ /dev/null
@@ -1,87 +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.tabtray
-
-import android.view.View
-import androidx.fragment.app.FragmentManager.findFragment
-import androidx.lifecycle.LifecycleOwner
-import androidx.navigation.NavController
-import androidx.navigation.fragment.findNavController
-import androidx.recyclerview.widget.ConcatAdapter
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.flow.drop
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.launch
-import mozilla.components.browser.storage.sync.SyncedDeviceTabs
-import mozilla.components.feature.syncedtabs.view.SyncedTabsView
-import mozilla.components.lib.state.ext.flowScoped
-import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifChanged
-import org.mozilla.fenix.components.metrics.MetricController
-import org.mozilla.fenix.sync.ListenerDelegate
-import org.mozilla.fenix.sync.SyncedTabsAdapter
-import org.mozilla.fenix.sync.ext.toAdapterList
-import org.mozilla.fenix.sync.ext.toAdapterItem
-import org.mozilla.fenix.sync.ext.toStringRes
-import kotlin.coroutines.CoroutineContext
-
-@OptIn(ExperimentalCoroutinesApi::class)
-class SyncedTabsController(
-    lifecycleOwner: LifecycleOwner,
-    private val view: View,
-    store: TabTrayDialogFragmentStore,
-    private val concatAdapter: ConcatAdapter,
-    coroutineContext: CoroutineContext = Dispatchers.Main,
-    metrics: MetricController
-) : SyncedTabsView {
-    override var listener: SyncedTabsView.Listener? = null
-
-    val adapter = SyncedTabsAdapter(ListenerDelegate(metrics) { listener })
-
-    private val scope: CoroutineScope = CoroutineScope(coroutineContext)
-
-    init {
-        store.flowScoped(lifecycleOwner) { flow ->
-            flow.map { it.mode }
-                .ifChanged()
-                .drop(1)
-                .collect { mode ->
-                    when (mode) {
-                        is TabTrayDialogFragmentState.Mode.Normal -> {
-                            concatAdapter.addAdapter(adapter)
-                        }
-                        is TabTrayDialogFragmentState.Mode.MultiSelect -> {
-                            concatAdapter.removeAdapter(adapter)
-                        }
-                    }
-                }
-        }
-    }
-
-    override fun displaySyncedTabs(syncedTabs: List<SyncedDeviceTabs>) {
-        scope.launch {
-            val tabsList = listOf(SyncedTabsAdapter.AdapterItem.Title) + syncedTabs.toAdapterList()
-            // Reverse layout for TabTrayView which does things backwards.
-            adapter.submitList(tabsList.reversed())
-        }
-    }
-
-    override fun onError(error: SyncedTabsView.ErrorType) {
-        scope.launch {
-            val navController: NavController? = try {
-                findFragment<TabTrayDialogFragment>(view).findNavController()
-            } catch (exception: IllegalStateException) {
-                null
-            }
-
-            val descriptionResId = error.toStringRes()
-            val errorItem = error.toAdapterItem(descriptionResId, navController)
-
-            adapter.submitList(listOf(errorItem))
-        }
-    }
-}
diff --git a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayController.kt b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayController.kt
index f38e01d96..4ce4c635c 100644
--- a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayController.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayController.kt
@@ -20,7 +20,6 @@ import mozilla.components.concept.engine.prompt.ShareData
 import mozilla.components.concept.storage.BookmarksStorage
 import mozilla.components.concept.tabstray.Tab
 import mozilla.components.feature.tabs.TabsUseCases
-import org.mozilla.fenix.BrowserDirection
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.browser.browsingmode.BrowsingMode
 import org.mozilla.fenix.browser.browsingmode.BrowsingModeManager
@@ -28,7 +27,6 @@ import org.mozilla.fenix.components.TabCollectionStorage
 import org.mozilla.fenix.components.metrics.Event
 import org.mozilla.fenix.components.metrics.MetricController
 import org.mozilla.fenix.home.HomeFragment
-import mozilla.components.browser.storage.sync.Tab as SyncTab
 
 /**
  * [TabTrayDialogFragment] controller.
@@ -42,7 +40,6 @@ interface TabTrayController {
     fun handleTabSettingsClicked()
     fun handleShareTabsOfTypeClicked(private: Boolean)
     fun handleShareSelectedTabsClicked(selectedTabs: Set<Tab>)
-    fun handleSyncedTabClicked(syncTab: SyncTab)
     fun handleSaveToCollectionClicked(selectedTabs: Set<Tab>)
     fun handleBookmarkSelectedTabs(selectedTabs: Set<Tab>)
     fun handleDeleteSelectedTabs(selectedTabs: Set<Tab>)
@@ -197,14 +194,6 @@ class DefaultTabTrayController(
         }
     }
 
-    override fun handleSyncedTabClicked(syncTab: SyncTab) {
-        activity.openToBrowserAndLoad(
-            searchTermOrURL = syncTab.active().url,
-            newTab = true,
-            from = BrowserDirection.FromTabTray
-        )
-    }
-
     @OptIn(ExperimentalCoroutinesApi::class)
     override fun handleCloseAllTabsClicked(private: Boolean) {
         val sessionsToClose = if (private) {
diff --git a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayDialogFragment.kt b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayDialogFragment.kt
index fbf222d8a..ef6f3fe70 100644
--- a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayDialogFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayDialogFragment.kt
@@ -32,7 +32,6 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.plus
 import mozilla.appservices.places.BookmarkRoot
-import mozilla.components.browser.session.Session
 import mozilla.components.browser.state.selector.findTab
 import mozilla.components.browser.state.selector.getNormalOrPrivateTabs
 import mozilla.components.browser.state.selector.normalTabs
@@ -45,6 +44,9 @@ import mozilla.components.lib.state.ext.consumeFrom
 import mozilla.components.support.base.feature.UserInteractionHandler
 import mozilla.components.support.base.feature.ViewBoundFeatureWrapper
 import mozilla.components.support.ktx.android.view.showKeyboard
+import mozilla.components.support.utils.ext.bottom
+import mozilla.components.support.utils.ext.left
+import mozilla.components.support.utils.ext.right
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.NavGraphDirections
 import org.mozilla.fenix.R
@@ -105,12 +107,6 @@ class TabTrayDialogFragment : AppCompatDialogFragment(), UserInteractionHandler
             requireComponents.useCases.tabsUseCases.selectTab(tabId)
             navigateToBrowser()
         }
-
-        override fun invoke(session: Session) {
-            requireContext().components.analytics.metrics.track(Event.OpenedExistingTab)
-            requireComponents.useCases.tabsUseCases.selectTab(session)
-            navigateToBrowser()
-        }
     }
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
@@ -127,12 +123,6 @@ class TabTrayDialogFragment : AppCompatDialogFragment(), UserInteractionHandler
             showUndoSnackbarForTab(sessionId)
             removeIfNotLastTab(sessionId)
         }
-
-        override fun invoke(session: Session) {
-            requireContext().components.analytics.metrics.track(Event.ClosedExistingTab)
-            showUndoSnackbarForTab(session.id)
-            removeIfNotLastTab(session.id)
-        }
     }
 
     private fun removeIfNotLastTab(sessionId: String) {
@@ -225,7 +215,6 @@ class TabTrayDialogFragment : AppCompatDialogFragment(), UserInteractionHandler
                     showBookmarksSnackbar = ::showBookmarksSnackbar
                 )
             ),
-            store = tabTrayDialogStore,
             isPrivate = isPrivate,
             isInLandscape = ::isInLandscape,
             lifecycleOwner = viewLifecycleOwner
@@ -257,13 +246,13 @@ class TabTrayDialogFragment : AppCompatDialogFragment(), UserInteractionHandler
 
         view.tabLayout.setOnApplyWindowInsetsListener { v, insets ->
             v.updatePadding(
-                left = insets.systemWindowInsetLeft,
-                right = insets.systemWindowInsetRight,
-                bottom = insets.systemWindowInsetBottom
+                left = insets.left(),
+                right = insets.right(),
+                bottom = insets.bottom()
             )
 
             tabTrayView.view.tab_wrapper.updatePadding(
-                bottom = insets.systemWindowInsetBottom
+                bottom = insets.bottom()
             )
 
             insets
@@ -281,7 +270,7 @@ class TabTrayDialogFragment : AppCompatDialogFragment(), UserInteractionHandler
     private fun setSecureFlagsIfNeeded(private: Boolean) {
         if (private && context?.settings()?.allowScreenshotsInPrivateMode == false) {
             dialog?.window?.addFlags(WindowManager.LayoutParams.FLAG_SECURE)
-        } else if (!(activity as HomeActivity).browsingModeManager.mode.isPrivate) {
+        } else {
             dialog?.window?.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
         }
     }
diff --git a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayFragmentInteractor.kt b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayFragmentInteractor.kt
index 8dc718225..7f7eae7a2 100644
--- a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayFragmentInteractor.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayFragmentInteractor.kt
@@ -5,7 +5,6 @@
 package org.mozilla.fenix.tabtray
 
 import mozilla.components.concept.tabstray.Tab
-import mozilla.components.browser.storage.sync.Tab as SyncTab
 
 @Suppress("TooManyFunctions")
 interface TabTrayInteractor {
@@ -54,11 +53,6 @@ interface TabTrayInteractor {
      */
     fun onCloseAllTabsClicked(private: Boolean)
 
-    /**
-     * Called when the user clicks on a synced tab entry.
-     */
-    fun onSyncedTabClicked(syncTab: SyncTab)
-
     /**
      * Called when the physical back button is clicked.
      */
@@ -146,10 +140,6 @@ class TabTrayFragmentInteractor(private val controller: TabTrayController) : Tab
         controller.handleCloseAllTabsClicked(private)
     }
 
-    override fun onSyncedTabClicked(syncTab: SyncTab) {
-        controller.handleSyncedTabClicked(syncTab)
-    }
-
     override fun onBackPressed(): Boolean {
         return controller.handleBackPressed()
     }
diff --git a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt
index bf97ba942..db3768a32 100644
--- a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt
@@ -41,15 +41,13 @@ import mozilla.components.browser.state.selector.privateTabs
 import mozilla.components.browser.state.state.BrowserState
 import mozilla.components.browser.state.state.TabSessionState
 import mozilla.components.browser.tabstray.TabViewHolder
-import mozilla.components.feature.syncedtabs.SyncedTabsFeature
-import mozilla.components.support.base.feature.ViewBoundFeatureWrapper
 import mozilla.components.support.ktx.android.util.dpToPx
 import mozilla.components.ui.tabcounter.TabCounter.Companion.INFINITE_CHAR_PADDING_BOTTOM
 import org.mozilla.fenix.R
-import org.mozilla.fenix.browser.InfoBanner
 import org.mozilla.fenix.components.metrics.Event
 import mozilla.components.ui.tabcounter.TabCounter.Companion.MAX_VISIBLE_TABS
 import mozilla.components.ui.tabcounter.TabCounter.Companion.SO_MANY_TABS_OPEN
+import org.mozilla.fenix.browser.infobanner.InfoBanner
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.ext.updateAccessibilityCollectionInfo
@@ -59,7 +57,6 @@ import org.mozilla.fenix.utils.Settings
 import java.text.NumberFormat
 import kotlin.math.max
 import kotlin.math.roundToInt
-import mozilla.components.browser.storage.sync.Tab as SyncTab
 
 /**
  * View that contains and configures the BrowserAwesomeBar
@@ -69,7 +66,6 @@ class TabTrayView(
     private val container: ViewGroup,
     private val tabsAdapter: FenixTabsAdapter,
     private val interactor: TabTrayInteractor,
-    store: TabTrayDialogFragmentStore,
     isPrivate: Boolean,
     private val isInLandscape: () -> Boolean,
     lifecycleOwner: LifecycleOwner,
@@ -97,11 +93,6 @@ class TabTrayView(
 
     private var tabsTouchHelper: TabsTouchHelper
     private val collectionsButtonAdapter = SaveToCollectionsButtonAdapter(interactor, isPrivate)
-    private val metrics = container.context.components.analytics.metrics
-
-    private val syncedTabsController =
-        SyncedTabsController(lifecycleOwner, view, store, concatAdapter, metrics = metrics)
-    private val syncedTabsFeature = ViewBoundFeatureWrapper<SyncedTabsFeature>()
 
     private var hasLoaded = false
 
@@ -167,21 +158,6 @@ class TabTrayView(
 
         setTopOffset(isInLandscape())
 
-        if (view.context.settings().syncedTabsInTabsTray) {
-            syncedTabsFeature.set(
-                feature = SyncedTabsFeature(
-                    context = container.context,
-                    storage = components.backgroundServices.syncedTabsStorage,
-                    accountManager = components.backgroundServices.accountManager,
-                    view = syncedTabsController,
-                    lifecycleOwner = lifecycleOwner,
-                    onTabClicked = ::handleTabClicked
-                ),
-                owner = lifecycleOwner,
-                view = view
-            )
-        }
-
         updateTabsTrayLayout()
 
         view.tabsTray.apply {
@@ -197,7 +173,6 @@ class TabTrayView(
             tabsAdapter.tabTrayInteractor = interactor
             tabsAdapter.onTabsUpdated = {
                 concatAdapter.addAdapter(collectionsButtonAdapter)
-                concatAdapter.addAdapter(syncedTabsController.adapter)
 
                 if (hasAccessibilityEnabled) {
                     tabsAdapter.notifyItemRangeChanged(0, tabs.size)
@@ -344,10 +319,6 @@ class TabTrayView(
         }
     }
 
-    private fun handleTabClicked(tab: SyncTab) {
-        interactor.onSyncedTabClicked(tab)
-    }
-
     private fun adjustNewTabButtonsForNormalMode() {
         view.tab_tray_new_tab.apply {
             isVisible = hasAccessibilityEnabled
diff --git a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayViewHolder.kt b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayViewHolder.kt
index 1965f32b1..5d0832433 100644
--- a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayViewHolder.kt
@@ -36,12 +36,6 @@ import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.ext.showAndEnable
 import org.mozilla.fenix.ext.toShortUrl
 import kotlin.math.max
-import mozilla.components.browser.state.state.MediaState
-import mozilla.components.feature.media.ext.pauseIfPlaying
-import mozilla.components.feature.media.ext.playIfPaused
-import org.mozilla.fenix.FeatureFlags.newMediaSessionApi
-import org.mozilla.fenix.ext.getMediaStateForSession
-import org.mozilla.fenix.utils.Do
 
 /**
  * A RecyclerView ViewHolder implementation for "tab" items.
@@ -99,94 +93,46 @@ class TabTrayViewHolder(
         // Media state
         playPauseButtonView.increaseTapArea(PLAY_PAUSE_BUTTON_EXTRA_DPS)
 
-        if (newMediaSessionApi) {
-            with(playPauseButtonView) {
-                invalidate()
-                val sessionState = store.state.findTabOrCustomTab(tab.id)
-                when (sessionState?.mediaSessionState?.playbackState) {
-                    MediaSession.PlaybackState.PAUSED -> {
-                        showAndEnable()
-                        contentDescription =
-                            context.getString(R.string.mozac_feature_media_notification_action_play)
-                        setImageDrawable(
-                            AppCompatResources.getDrawable(context, R.drawable.media_state_play)
-                        )
-                    }
-
-                    MediaSession.PlaybackState.PLAYING -> {
-                        showAndEnable()
-                        contentDescription =
-                            context.getString(R.string.mozac_feature_media_notification_action_pause)
-                        setImageDrawable(
-                            AppCompatResources.getDrawable(context, R.drawable.media_state_pause)
-                        )
-                    }
-
-                    else -> {
-                        removeTouchDelegate()
-                        removeAndDisable()
-                    }
+        with(playPauseButtonView) {
+            invalidate()
+            val sessionState = store.state.findTabOrCustomTab(tab.id)
+            when (sessionState?.mediaSessionState?.playbackState) {
+                MediaSession.PlaybackState.PAUSED -> {
+                    showAndEnable()
+                    contentDescription =
+                        context.getString(R.string.mozac_feature_media_notification_action_play)
+                    setImageDrawable(
+                        AppCompatResources.getDrawable(context, R.drawable.media_state_play)
+                    )
                 }
 
-                setOnClickListener {
-                    when (sessionState?.mediaSessionState?.playbackState) {
-                        MediaSession.PlaybackState.PLAYING -> {
-                            metrics.track(Event.TabMediaPause)
-                            sessionState.mediaSessionState?.controller?.pause()
-                        }
-
-                        MediaSession.PlaybackState.PAUSED -> {
-                            metrics.track(Event.TabMediaPlay)
-                            sessionState.mediaSessionState?.controller?.play()
-                        }
-                        else -> throw AssertionError(
-                            "Play/Pause button clicked without play/pause state."
-                        )
-                    }
+                MediaSession.PlaybackState.PLAYING -> {
+                    showAndEnable()
+                    contentDescription =
+                        context.getString(R.string.mozac_feature_media_notification_action_pause)
+                    setImageDrawable(
+                        AppCompatResources.getDrawable(context, R.drawable.media_state_pause)
+                    )
                 }
-            }
-        } else {
-            with(playPauseButtonView) {
-                invalidate()
-                Do exhaustive when (store.state.getMediaStateForSession(tab.id)) {
-                    MediaState.State.PAUSED -> {
-                        showAndEnable()
-                        contentDescription =
-                            context.getString(R.string.mozac_feature_media_notification_action_play)
-                        setImageDrawable(
-                            AppCompatResources.getDrawable(context, R.drawable.media_state_play)
-                        )
-                    }
-
-                    MediaState.State.PLAYING -> {
-                        showAndEnable()
-                        contentDescription =
-                            context.getString(R.string.mozac_feature_media_notification_action_pause)
-                        setImageDrawable(
-                            AppCompatResources.getDrawable(context, R.drawable.media_state_pause)
-                        )
-                    }
 
-                    MediaState.State.NONE -> {
-                        removeTouchDelegate()
-                        removeAndDisable()
-                    }
+                else -> {
+                    removeTouchDelegate()
+                    removeAndDisable()
                 }
             }
 
-            playPauseButtonView.setOnClickListener {
-                Do exhaustive when (store.state.getMediaStateForSession(tab.id)) {
-                    MediaState.State.PLAYING -> {
+            setOnClickListener {
+                when (sessionState?.mediaSessionState?.playbackState) {
+                    MediaSession.PlaybackState.PLAYING -> {
                         metrics.track(Event.TabMediaPause)
-                        store.state.media.pauseIfPlaying()
+                        sessionState.mediaSessionState?.controller?.pause()
                     }
 
-                    MediaState.State.PAUSED -> {
+                    MediaSession.PlaybackState.PAUSED -> {
                         metrics.track(Event.TabMediaPlay)
-                        store.state.media.playIfPaused()
+                        sessionState.mediaSessionState?.controller?.play()
                     }
-
-                    MediaState.State.NONE -> throw AssertionError(
+                    else -> throw AssertionError(
                         "Play/Pause button clicked without play/pause state."
                     )
                 }
diff --git a/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlay.kt b/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlay.kt
index 6e098fa12..167c78d18 100644
--- a/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlay.kt
+++ b/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlay.kt
@@ -62,9 +62,9 @@ class TrackingProtectionOverlay(
             }.ifChanged { tab ->
                 tab.content.loading
             }
-            .collect { tab ->
-                onLoadingStateChanged(tab)
-            }
+                .collect { tab ->
+                    onLoadingStateChanged(tab)
+                }
         }
     }
 
@@ -77,7 +77,10 @@ class TrackingProtectionOverlay(
 
     @VisibleForTesting
     internal fun onLoadingStateChanged(tab: SessionState) {
-        if (!tab.content.loading && shouldShowTrackingProtectionOnboarding(tab)) {
+        if (shouldShowTrackingProtectionOnboarding(tab) &&
+            tab.content.progress == FULL_PROGRESS &&
+            settings.shouldUseTrackingProtection
+        ) {
             showTrackingProtectionOnboarding()
         }
     }
@@ -85,7 +88,7 @@ class TrackingProtectionOverlay(
     private fun shouldShowTrackingProtectionOnboarding(tab: SessionState) =
         tab.trackingProtection.enabled &&
                 tab.trackingProtection.blockedTrackers.isNotEmpty() &&
-            settings.shouldShowTrackingProtectionCfr
+                settings.shouldShowTrackingProtectionCfr
 
     @Suppress("MagicNumber", "InflateParams")
     private fun showTrackingProtectionOnboarding() {
@@ -184,6 +187,7 @@ class TrackingProtectionOverlay(
     }
 
     private companion object {
+        private const val FULL_PROGRESS = 100
         private const val BUTTON_INCREASE_DPS = 12
     }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/utils/ManufacturerCodes.kt b/app/src/main/java/org/mozilla/fenix/utils/ManufacturerCodes.kt
new file mode 100644
index 000000000..7915bcf4f
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/utils/ManufacturerCodes.kt
@@ -0,0 +1,22 @@
+/* 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.utils
+
+import android.os.Build
+
+/**
+ * A listing of codes returned by [android.os.Build.MANUFACTURER] for different manufacturers.
+ * While we try to get the casing accurate, it may be good to use .equals(str, ignoreCase = true)
+ * to do the comparison.
+ */
+object ManufacturerCodes {
+    const val HUAWEI: String = "HUAWEI"
+    const val LG = "LGE"
+    const val ONE_PLUS: String = "OnePlus"
+    const val SAMSUNG = "samsung"
+
+    val isLG get() = Build.MANUFACTURER.equals(LG, ignoreCase = true)
+    val isSamsung get() = Build.MANUFACTURER.equals(SAMSUNG, ignoreCase = true)
+}
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 2dca9a789..156dc89a3 100644
--- a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
+++ b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
@@ -26,12 +26,10 @@ import mozilla.components.support.ktx.android.content.longPreference
 import mozilla.components.support.ktx.android.content.stringPreference
 import org.mozilla.fenix.BuildConfig
 import org.mozilla.fenix.Config
-import org.mozilla.fenix.FeatureFlags
 import org.mozilla.fenix.R
 import org.mozilla.fenix.browser.browsingmode.BrowsingMode
 import org.mozilla.fenix.components.metrics.MozillaProductDetector
 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.ext.components
 import org.mozilla.fenix.ext.getPreferenceKey
@@ -123,12 +121,6 @@ class Settings(private val appContext: Context) : PreferencesHolder {
     val canShowCfr: Boolean
         get() = (System.currentTimeMillis() - lastCfrShownTimeInMillis) > THREE_DAYS_MS
 
-    var syncedTabsInTabsTray by featureFlagPreference(
-        appContext.getPreferenceKey(R.string.pref_key_synced_tabs_tabs_tray),
-        default = false,
-        featureFlag = FeatureFlags.syncedTabsInTabsTray
-    )
-
     var forceEnableZoom by booleanPreference(
         appContext.getPreferenceKey(R.string.pref_key_accessibility_force_enable_zoom),
         default = false
@@ -252,6 +244,11 @@ class Settings(private val appContext: Context) : PreferencesHolder {
     val shouldShowSecurityPinWarning: Boolean
         get() = loginsSecureWarningCount.underMaxCount()
 
+    var shouldShowPrivacyPopWindow by booleanPreference(
+        appContext.getPreferenceKey(R.string.pref_key_privacy_pop_window),
+        default = true
+    )
+
     var shouldUseLightTheme by booleanPreference(
         appContext.getPreferenceKey(R.string.pref_key_light_theme),
         default = false
@@ -471,6 +468,13 @@ class Settings(private val appContext: Context) : PreferencesHolder {
         true
     )
 
+    /**
+     * Prefer to use a fixed top toolbar when:
+     * - a talkback service is enabled or
+     * - switch access is enabled.
+     *
+     * This is automatically inferred based on the current system status. Not a setting in our app.
+     */
     val shouldUseFixedTopToolbar: Boolean
         get() {
             return touchExplorationIsEnabled || switchServiceIsEnabled
diff --git a/app/src/main/java/org/mozilla/fenix/utils/ToolbarPopupWindow.kt b/app/src/main/java/org/mozilla/fenix/utils/ToolbarPopupWindow.kt
index 21c56576b..f9b349fce 100644
--- a/app/src/main/java/org/mozilla/fenix/utils/ToolbarPopupWindow.kt
+++ b/app/src/main/java/org/mozilla/fenix/utils/ToolbarPopupWindow.kt
@@ -15,8 +15,8 @@ import androidx.annotation.VisibleForTesting
 import androidx.core.view.isVisible
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.android.synthetic.main.browser_toolbar_popup_window.view.*
-import mozilla.components.browser.session.Session
 import mozilla.components.browser.state.selector.selectedTab
+import mozilla.components.browser.state.state.CustomTabSessionState
 import mozilla.components.browser.state.store.BrowserStore
 import org.mozilla.fenix.R
 import org.mozilla.fenix.components.FenixSnackbar
@@ -27,7 +27,7 @@ import java.lang.ref.WeakReference
 object ToolbarPopupWindow {
     fun show(
         view: WeakReference<View>,
-        customTabSession: Session? = null,
+        customTabSession: CustomTabSessionState? = null,
         handlePasteAndGo: (String) -> Unit,
         handlePaste: (String) -> Unit,
         copyVisible: Boolean = true
@@ -101,10 +101,10 @@ object ToolbarPopupWindow {
     @VisibleForTesting
     internal fun getUrlForClipboard(
         store: BrowserStore,
-        customTabSession: Session? = null
+        customTabSession: CustomTabSessionState? = null
     ): String? {
         return if (customTabSession != null) {
-            customTabSession.url
+            customTabSession.content.url
         } else {
             val selectedTab = store.state.selectedTab
             selectedTab?.readerState?.activeUrl ?: selectedTab?.content?.url
diff --git a/app/src/main/res/drawable/etp_spinner_item_background.xml b/app/src/main/res/drawable/etp_spinner_item_background.xml
index 642b276e3..05f0f2eea 100644
--- a/app/src/main/res/drawable/etp_spinner_item_background.xml
+++ b/app/src/main/res/drawable/etp_spinner_item_background.xml
@@ -5,7 +5,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_checked="true">
         <shape>
-            <solid android:color="#1415141A"/>
+            <solid android:color="@color/spinner_selected_item"/>
         </shape>
     </item>
 </selector>
diff --git a/app/src/main/res/layout/activity_privacy_content_display.xml b/app/src/main/res/layout/activity_privacy_content_display.xml
new file mode 100644
index 000000000..c6ff55e47
--- /dev/null
+++ b/app/src/main/res/layout/activity_privacy_content_display.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:orientation="vertical" android:layout_width="match_parent"
+        android:layout_height="match_parent">
+    <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/browser_actions_divider_color">
+
+            <ImageButton
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginBottom="10dp"
+                    android:layout_marginLeft="10dp"
+                    android:background="@android:color/transparent"
+                    android:id="@+id/privacyContentCloseButton"
+                    android:src="@drawable/ic_close"
+                    android:contentDescription="close"
+                    tools:ignore="AndroidSrcXmlDetector" />
+
+        </LinearLayout>
+
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_gravity="bottom"
+                android:background="@android:color/darker_gray"/>
+
+
+    </LinearLayout>
+    <mozilla.components.concept.engine.EngineView
+            tools:ignore="Instantiatable"
+            android:id="@+id/privacyContentEngineView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+</LinearLayout>
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 479bc9dd9..77f460296 100644
--- a/app/src/main/res/layout/component_browser_top_toolbar.xml
+++ b/app/src/main/res/layout/component_browser_top_toolbar.xml
@@ -2,12 +2,9 @@
 <!-- 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/. -->
-<com.google.android.material.appbar.AppBarLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/app_bar"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+
 <mozilla.components.browser.toolbar.BrowserToolbar
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/toolbar"
     android:layout_width="match_parent"
@@ -17,13 +14,10 @@
     android:clickable="true"
     android:focusable="true"
     android:focusableInTouchMode="true"
-    app:layout_scrollFlags="scroll|enterAlways|snap|exitUntilCollapsed"
     app:browserToolbarClearColor="?primaryText"
     app:browserToolbarInsecureColor="?primaryText"
     app:browserToolbarMenuColor="?primaryText"
     app:browserToolbarProgressBarGravity="bottom"
     app:browserToolbarSecureColor="?primaryText"
     app:browserToolbarTrackingProtectionAndSecurityIndicatorSeparatorColor="?toolbarDivider" />
-</com.google.android.material.appbar.AppBarLayout>
 
-<!-- NOTE: Scroll flags set dynamically with `setScrollFlagsForTopToolbar` -->
diff --git a/app/src/main/res/layout/fragment_browser.xml b/app/src/main/res/layout/fragment_browser.xml
index 63150e569..32d2bd4c4 100644
--- a/app/src/main/res/layout/fragment_browser.xml
+++ b/app/src/main/res/layout/fragment_browser.xml
@@ -25,8 +25,7 @@
             <mozilla.components.ui.widgets.VerticalSwipeRefreshLayout
                 android:id="@+id/swipeRefresh"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                app:layout_behavior="@string/appbar_scrolling_view_behavior">
+                android:layout_height="match_parent">
 
                 <mozilla.components.concept.engine.EngineView
                     tools:ignore="Instantiatable"
diff --git a/app/src/main/res/layout/fragment_search_dialog.xml b/app/src/main/res/layout/fragment_search_dialog.xml
index 14ff932e4..153723799 100644
--- a/app/src/main/res/layout/fragment_search_dialog.xml
+++ b/app/src/main/res/layout/fragment_search_dialog.xml
@@ -5,12 +5,12 @@
 <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/search_wrapper"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    android:background="?attr/scrimBackground"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:background="?attr/scrimBackground">
     <mozilla.components.browser.toolbar.BrowserToolbar
         android:id="@+id/toolbar"
         android:layout_width="0dp"
@@ -29,41 +29,18 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"/>
-    <mozilla.components.browser.awesomebar.BrowserAwesomeBar
-        xmlns:mozac="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/awesome_bar"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:fadingEdge="horizontal"
-        android:fadingEdgeLength="40dp"
-        android:nestedScrollingEnabled="false"
-        android:requiresFadingEdge="vertical"
-        android:background="?attr/foundation"
-        android:visibility="invisible"
-        app:layout_constraintBottom_toTopOf="@+id/pill_wrapper"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/top_barrier"
-        mozac:awesomeBarDescriptionTextColor="?secondaryText"
-        mozac:awesomeBarTitleTextColor="?primaryText" />
 
     <ViewStub
         android:id="@+id/search_suggestions_hint"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
         android:inflatedId="@id/search_suggestions_hint"
         android:layout="@layout/search_suggestions_hint"
+        app:layout_constraintBottom_toTopOf="@id/search_hint_bottom_barrier"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/toolbar" />
-
-    <androidx.constraintlayout.widget.Barrier
-        android:id="@+id/top_barrier"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:barrierDirection="bottom"
-        app:constraint_referenced_ids="search_suggestions_hint"/>
-
+        app:layout_constraintTop_toBottomOf="@id/toolbar"
+        app:layout_constraintHeight_default="wrap"/>
 
     <View
         android:id="@+id/search_suggestions_hint_divider"
@@ -75,6 +52,31 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
+    <androidx.constraintlayout.widget.Barrier
+        android:id="@+id/search_hint_bottom_barrier"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:barrierDirection="top"
+        app:constraint_referenced_ids="awesome_bar,pill_wrapper"/>
+
+    <mozilla.components.browser.awesomebar.BrowserAwesomeBar
+        xmlns:mozac="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/awesome_bar"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:fadingEdge="horizontal"
+        android:fadingEdgeLength="40dp"
+        android:nestedScrollingEnabled="false"
+        android:requiresFadingEdge="vertical"
+        android:background="?attr/foundation"
+        android:visibility="invisible"
+        app:layout_constraintBottom_toTopOf="@+id/pill_wrapper"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/search_suggestions_hint"
+        mozac:awesomeBarDescriptionTextColor="?secondaryText"
+        mozac:awesomeBarTitleTextColor="?primaryText" />
+
     <View
         android:id="@+id/fill_link_from_clipboard"
         android:layout_width="0dp"
diff --git a/app/src/main/res/layout/search_suggestions_hint.xml b/app/src/main/res/layout/search_suggestions_hint.xml
index 472a5e4ff..14bf46202 100644
--- a/app/src/main/res/layout/search_suggestions_hint.xml
+++ b/app/src/main/res/layout/search_suggestions_hint.xml
@@ -2,91 +2,104 @@
 <!-- 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"
+
+<androidx.core.widget.NestedScrollView 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:id="@+id/scrollView"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?attr/foundation"
-    android:paddingStart="20dp"
-    android:paddingTop="20dp"
-    android:paddingEnd="20dp"
-    android:paddingBottom="10dp">
-
-    <ImageView
-        android:id="@+id/info_button"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:importantForAccessibility="no"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_info"
-        tools:tint="@color/contrast_text_private_theme" />
+    android:layout_height="match_parent"
+    android:scrollbars="vertical"
+    android:fadeScrollbars="false"
+    app:layout_constraintBottom_toBottomOf="@id/search_divider"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toBottomOf="@id/toolbar">
 
-    <TextView
-        android:id="@+id/title"
-        android:layout_width="0dp"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="32dp"
-        android:paddingBottom="12dp"
-        android:textAppearance="?android:attr/textAppearanceListItem"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="@string/search_suggestions_onboarding_title"
-        tools:textAppearance="?android:attr/textAppearanceListItem" />
+        android:background="?attr/foundation"
+        android:paddingStart="20dp"
+        android:paddingTop="20dp"
+        android:paddingEnd="20dp"
+        android:paddingBottom="10dp">
 
-    <TextView
-        android:id="@+id/text"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        app:layout_constraintBottom_toTopOf="@id/learn_more"
-        app:layout_constraintEnd_toEndOf="@id/title"
-        app:layout_constraintStart_toStartOf="@id/title"
-        app:layout_constraintTop_toBottomOf="@id/title"
-        tools:text="@string/search_suggestions_onboarding_text"
-        tools:textAppearance="?attr/textAppearanceListItemSmall" />
+        <ImageView
+            android:id="@+id/info_button"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:importantForAccessibility="no"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@drawable/ic_info"
+            tools:tint="@color/contrast_text_private_theme" />
 
-    <org.mozilla.fenix.utils.LinkTextView
-        android:id="@+id/learn_more"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:minHeight="48dp"
-        android:text="@string/exceptions_empty_message_learn_more_link"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textColor="?attr/accentHighContrast"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@id/allow"
-        app:layout_constraintEnd_toStartOf="@id/dismiss"
-        app:layout_constraintStart_toStartOf="@id/title"
-        app:layout_constraintTop_toBottomOf="@id/text"
-        tools:textColor="@color/accent_high_contrast_private_theme" />
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="32dp"
+            android:paddingBottom="12dp"
+            android:textAppearance="?android:attr/textAppearanceListItem"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="@string/search_suggestions_onboarding_title"
+            tools:textAppearance="?android:attr/textAppearanceListItem" />
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/allow"
-        style="@style/NeutralButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="20dp"
-        android:paddingHorizontal="12dp"
-        android:text="@string/search_suggestions_onboarding_allow_button"
-        app:layout_constraintEnd_toEndOf="@id/title"
-        app:layout_constraintTop_toBottomOf="@id/text" />
+        <TextView
+            android:id="@+id/text"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            app:layout_constraintBottom_toTopOf="@id/learn_more"
+            app:layout_constraintEnd_toEndOf="@id/title"
+            app:layout_constraintStart_toStartOf="@id/title"
+            app:layout_constraintTop_toBottomOf="@id/title"
+            tools:text="@string/search_suggestions_onboarding_text"
+            tools:textAppearance="?attr/textAppearanceListItemSmall" />
+
+        <org.mozilla.fenix.utils.LinkTextView
+            android:id="@+id/learn_more"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:minHeight="48dp"
+            android:text="@string/exceptions_empty_message_learn_more_link"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="?attr/accentHighContrast"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toTopOf="@id/allow"
+            app:layout_constraintEnd_toStartOf="@id/dismiss"
+            app:layout_constraintStart_toStartOf="@id/title"
+            app:layout_constraintTop_toBottomOf="@id/text"
+            tools:textColor="@color/accent_high_contrast_private_theme" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/allow"
+            style="@style/NeutralButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:paddingHorizontal="12dp"
+            android:text="@string/search_suggestions_onboarding_allow_button"
+            app:layout_constraintEnd_toEndOf="@id/title"
+            app:layout_constraintTop_toBottomOf="@id/text" />
 
-    <TextView
-        android:id="@+id/dismiss"
-        android:layout_width="0dp"
-        android:layout_height="48dp"
-        android:fontFamily="@font/metropolis_semibold"
-        android:gravity="center_vertical"
-        android:letterSpacing="0"
-        android:paddingHorizontal="20dp"
-        android:text="@string/search_suggestions_onboarding_do_not_allow_button"
-        android:textColor="#ffffff"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="@id/allow"
-        app:layout_constraintEnd_toStartOf="@id/allow"
-        app:layout_constraintTop_toTopOf="@id/allow" />
+        <TextView
+            android:id="@+id/dismiss"
+            android:layout_width="0dp"
+            android:layout_height="48dp"
+            android:fontFamily="@font/metropolis_semibold"
+            android:gravity="center_vertical"
+            android:letterSpacing="0"
+            android:paddingHorizontal="20dp"
+            android:text="@string/search_suggestions_onboarding_do_not_allow_button"
+            android:textColor="#ffffff"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="@id/allow"
+            app:layout_constraintEnd_toStartOf="@id/allow"
+            app:layout_constraintTop_toTopOf="@id/allow" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index 07666ee3c..d3a9c5efb 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -102,7 +102,11 @@
         app:destination="@id/trackingProtectionExceptionsFragment" />
     <action
         android:id="@+id/action_global_accountSettingsFragment"
-        app:destination="@id/accountSettingsFragment" />
+        app:destination="@id/accountSettingsFragment"
+        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_global_trackingProtectionPanelDialogFragment"
         app:destination="@id/trackingProtectionPanelDialogFragment" />
diff --git a/app/src/main/res/values-ast/strings.xml b/app/src/main/res/values-ast/strings.xml
index d13fff47d..54b3faa96 100644
--- a/app/src/main/res/values-ast/strings.xml
+++ b/app/src/main/res/values-ast/strings.xml
@@ -130,6 +130,8 @@
     <string name="browser_menu_bookmark">Amestar a marcadores</string>
     <!-- Browser menu button that opens the addon manager -->
     <string name="browser_menu_add_ons">Complementos</string>
+    <!-- Browser menu button that opens the addon extensions manager -->
+    <string name="browser_menu_extensions">Estensiones</string>
     <!-- Text displayed when there are no add-ons to be shown -->
     <string name="no_add_ons">Equí nun hai complementos</string>
     <!-- Browser menu button that sends a user to help articles -->
@@ -289,6 +291,8 @@
     <string name="toast_override_fxa_sync_server_done">Modificóse\'l sirvidor de cuentes/sincronización de Firefox. Colando de l\'aplicación p\'aplicar los cambeos…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Cuenta</string>
+    <!-- Preference shown on banner to sign into account -->
+    <string name="preferences_sign_in">Aniciar sesión</string>
     <!-- Preference for changing where the toolbar is positioned -->
     <string name="preferences_toolbar">Barra de ferramientes</string>
     <!-- Preference for changing default theme to dark or light mode -->
@@ -351,6 +355,8 @@
     <!-- Button caption to abort the add-on collection configuration -->
     <string name="customize_addon_collection_cancel">Encaboxar</string>
 
+    <!-- Hint displayed on input field for custom collection name -->
+    <string name="customize_addon_collection_hint">Nome de la coleición</string>
     <!-- Toast shown after confirming the custom add-on collection configuration -->
     <string name="toast_customize_addon_collection_done">Modificóse la coleición de complementos. L\'aplicación va zarrase p\'aplicar los cambeos…</string>
 
@@ -454,6 +460,8 @@
     <!-- Header of the Turn on Sync preference view -->
     <string name="preferences_sync">Activación de Sync</string>
 
+    <!-- Preference for account login -->
+    <string name="preferences_sync_sign_in">Aniciar sesión</string>
     <!-- Preference for reconnecting to FxA sync -->
     <string name="preferences_sync_sign_in_to_reconnect">Aniciar sesión pa reconectar</string>
     <!-- Preference for removing FxA account -->
@@ -512,13 +520,19 @@
     <string name="library_history">Historial</string>
     <!-- Option in Library to open a new tab -->
     <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 -->
+    <string name="library_search">Buscar</string>
     <!-- Settings Page Title -->
     <string name="settings_title">Axustes</string>
 
+    <!-- Content description (not visible, for screen readers etc.): "Menu icon for items on a history item" -->
+    <string name="content_description_history_menu">Menú d\'un elementu del historial</string>
     <!-- Content description (not visible, for screen readers etc.): "Close button for library settings" -->
     <string name="content_description_close_button">Zarrar</string>
 
@@ -595,6 +609,8 @@
     <string name="tab_tray_menu_item_close">Zarrar toles llingüetes</string>
     <!-- Shortcut action to open new tab -->
     <string name="tab_tray_menu_open_new_tab">Llingüeta nueva</string>
+    <!-- Shortcut action to open the home screen -->
+    <string name="tab_tray_menu_home">Dir pal aniciu</string>
     <!-- Text shown in the multiselect menu for bookmarking selected tabs. -->
     <string name="tab_tray_multiselect_menu_item_bookmark">Amestar a Marcadores</string>
     <!-- Text shown in the multiselect menu for closing selected tabs. -->
@@ -677,6 +693,9 @@
     <!-- History multi select title in app bar
     The first parameter is the number of bookmarks selected -->
     <string name="history_multi_select_title">Elementos esbillaos: %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">Desaniciar %1$d elementos</string>
     <!-- Text for the header that groups the history for today -->
     <string name="history_today">Güei</string>
     <!-- Text for the header that groups the history for yesterday -->
@@ -707,6 +726,8 @@
     <!-- History multi select title in app bar
     The first parameter is the number of downloads selected -->
     <string name="download_multi_select_title">Descargues esbillaes: %1$d</string>
+    <!-- History overflow menu open in new tab button -->
+    <string name="download_menu_open">Abrir</string>
     <!-- Text for the button to remove a single download item -->
     <string name="download_delete_item_1">Quitar</string>
 
@@ -728,6 +749,10 @@
     <!-- Bookmarks -->
     <!-- Content description for bookmarks library menu -->
     <string name="bookmark_menu_content_description">Menú de los marcadores</string>
+    <!-- Screen title for editing bookmarks -->
+    <string name="bookmark_edit">Edición d\'un marcador</string>
+    <!-- Screen title for selecting a bookmarks folder -->
+    <string name="bookmark_select_folder">Esbilla d\'una carpeta</string>
     <!-- Confirmation message for a dialog confirming if the user wants to delete the selected folder -->
     <string name="bookmark_delete_folder_confirmation_dialog">¿De xuru que quies desaniciar 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. -->
@@ -806,6 +831,8 @@
     <string name="phone_feature_recommended">Aconséyase</string>
     <!-- Button label for clearing all the information of site permissions-->
     <string name="clear_permissions">Reafitamientu de permisos</string>
+    <!-- Button label for clearing a site permission-->
+    <string name="clear_permission">Reafitar el permisu</string>
     <!-- Button label for clearing all the information on all sites-->
     <string name="clear_permissions_on_all_sites">Reafitar los permisos de tolos sitios</string>
     <!-- Preference for altering video and audio autoplay for all websites -->
@@ -838,16 +865,22 @@
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Non</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">Permitir l\'audiu y videu</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Permitir l\'audiu y videu</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Bloquiar namás l\'audiu y videu colos datos móviles</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">L\'audiu y videu va reproducise namás per 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">Bloquiar namás l\'audiu</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Bloquiar namás l\'audiu</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Bloquiar l\'audiu y videu</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Bloquiar l\'audiu y videu</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">Sí</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
@@ -920,6 +953,8 @@
     <string name="sync_send_to_all">Unviar a tolos preseos</string>
     <!-- An option from the share dialog to reconnect to sync -->
     <string name="sync_reconnect">Reconexón con Sync</string>
+    <!-- Text displayed when sync is offline and cannot be accessed -->
+    <string name="sync_offline">Ensin conexón</string>
     <!-- An option to connect additional devices -->
     <string name="sync_connect_device">Coneutar otru preséu</string>
     <!-- The dialog text shown when additional devices are not available -->
@@ -1156,7 +1191,7 @@
     <!-- 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">Bloquia más rastrexadores, anuncios y ventanos emerxentes. Los páxines van cargar más rápido mas dalgunes funcionalidaes quiciabes nun funcionen.</string>
+    <string name="onboarding_tracking_protection_strict_button_description_2">Bloquia más rastrexadores, anuncios y ventanos emerxentes. Les páxines van cargar más rápido mas dalgunes funcionalidaes quiciabes nun funcionen.</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 -->
@@ -1603,6 +1638,8 @@ en llinia y con nós.</string>
     <string name="saved_login_username_description">El campu de testu editable pal nome d\'usuariu del aniciu de sesión.</string>
     <!--  The editable text field for a login's password. -->
     <string name="saved_login_password_description">El campu de testu editable pa la contraseña del aniciu de sesión.</string>
+    <!--  The button description to discard changes to an edited login. -->
+    <string name="discard_changes">Escartar los cambeos</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">Edición</string>
     <!--  The error message in edit login view when password field is blank. -->
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index d55cb5f6a..5cd09eab8 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -128,6 +128,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 -->
@@ -214,6 +216,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>
@@ -531,6 +538,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 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 -->
@@ -888,16 +899,22 @@
     <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 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">Дазволіць гук і відэа</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 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">Блакаваць толькі гук</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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 -->
diff --git a/app/src/main/res/values-br/strings.xml b/app/src/main/res/values-br/strings.xml
index 1a141ea80..5dbe8b20e 100644
--- a/app/src/main/res/values-br/strings.xml
+++ b/app/src/main/res/values-br/strings.xml
@@ -128,6 +128,8 @@
     <string name="browser_menu_edit_bookmark">Embann ar sined</string>
     <!-- Browser menu button that opens the addon manager -->
     <string name="browser_menu_add_ons">Askouezhioù</string>
+    <!-- Browser menu button that opens the addon extensions manager -->
+    <string name="browser_menu_extensions">Askouezhioù</string>
     <!-- Text displayed when there are no add-ons to be shown -->
     <string name="no_add_ons">Nʼeus tamm askouezh ebet amañ</string>
     <!-- Browser menu button that sends a user to help articles -->
@@ -212,6 +214,11 @@
     <!-- Search suggestion onboarding hint Learn more link text -->
     <string name="search_suggestions_onboarding_learn_more_link">Gouzout hirocʼh</string>
 
+    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <string name="search_engine_suggestions_title">Klask %s</string>
+    <!-- Search engine suggestion description text -->
+    <string name="search_engine_suggestions_description">Klask war-eeun eus ar varrenn chomlec’h</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
     <string name="search_widget_content_description">Digeriñ un ivinell Firefox nevez</string>
@@ -523,6 +530,10 @@
     <string name="library_desktop_bookmarks_unfiled">Sinedoù all</string>
     <!-- Option in Library to open History page -->
     <string name="library_history">Roll istor</string>
+    <!-- Option in Library to open a new tab -->
+    <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 -->
@@ -873,17 +884,23 @@
     <string name="tracking_protection_on">Gweredekaet</string>
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Diweredekaet</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">Aotren an aodio ha video</string>
 
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Aotren an aodio ha video</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Stankañ an aodio hag ar video pa vez war ar roadennoù hezoug nemetken</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">An aodio hag ar video a vo lennet war ar 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">Stankañ an aodio nemetken</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Stankañ an aodio nemetken</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Stankañ an aodio hag ar video</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Stankañ an aodio hag ar video</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">Gweredekaet</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index b4b7cb5ff..ff2514abc 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -218,6 +218,11 @@
     <!-- Search suggestion onboarding hint Learn more link text -->
     <string name="search_suggestions_onboarding_learn_more_link">Més informació</string>
 
+    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <string name="search_engine_suggestions_title">Cerca amb %s</string>
+    <!-- Search engine suggestion description text -->
+    <string name="search_engine_suggestions_description">Cerca directament des de la barra d’adreces</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
     <string name="search_widget_content_description">Obre una pestanya nova del Firefox</string>
@@ -889,16 +894,22 @@
     <string name="tracking_protection_on">Activada</string>
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Desactivada</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">Permet àudio i vídeo</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Permet àudio i vídeo</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Bloca àudio i vídeo només amb dades mòbils</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">L’àudio i el vídeo es reproduiran amb 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">Bloca només àudio</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Bloca només àudio</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Bloca àudio i vídeo</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Bloca àudio i vídeo</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">Activat</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
diff --git a/app/src/main/res/values-cak/strings.xml b/app/src/main/res/values-cak/strings.xml
index 7d7db3b5c..1cea4e24a 100644
--- a/app/src/main/res/values-cak/strings.xml
+++ b/app/src/main/res/values-cak/strings.xml
@@ -135,6 +135,8 @@
 
     <!-- Browser menu button that opens the addon manager -->
     <string name="browser_menu_add_ons">Taq tz\'aqat</string>
+    <!-- Browser menu button that opens the addon extensions manager -->
+    <string name="browser_menu_extensions">Taq k\'amal</string>
     <!-- Text displayed when there are no add-ons to be shown -->
     <string name="no_add_ons">Majun tz\'aqat wakami</string>
     <!-- Browser menu button that sends a user to help articles -->
@@ -185,6 +187,8 @@
     <!-- Browser menu button to configure reader mode appearance e.g. the used font type and size -->
     <string name="browser_menu_read_appearance">Rutzub\'al</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">Ke\'ichinäx rutz\'etoj sik\'inem</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">Man nok ta. Man netamäx ta ruwa ruch\'akulal URL.</string>
@@ -222,6 +226,12 @@
     <!-- Search suggestion onboarding hint Learn more link text -->
     <string name="search_suggestions_onboarding_learn_more_link">Tetamäx ch\'aqa\' chik</string>
 
+    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <string name="search_engine_suggestions_title">Tikanöx %s</string>
+
+    <!-- Search engine suggestion description text -->
+    <string name="search_engine_suggestions_description">Tikanöx pa kikajtz\'ik ochochib\'äl</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
     <string name="search_widget_content_description">Tijaq jun k\'ak\'a\' ruwi\' Firefox</string>
@@ -547,6 +557,10 @@
     <string name="library_desktop_bookmarks_unfiled">Ch\'aqa\' chik taq Yaketal</string>
     <!-- Option in Library to open History page -->
     <string name="library_history">Natab\'äl</string>
+    <!-- Option in Library to open a new tab -->
+    <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 -->
@@ -904,16 +918,22 @@
     <string name="tracking_protection_on">Titzij</string>
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Tichup</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">Tiya\' q\'ij k\'oxom chuqa\' silowäch</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Tiya\' q\'ij k\'oxom chuqa\' silowäch</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Keq\'at k\'oxom chuqa\' silowäch xa xe rik\'in kitzij selular</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">Ri  k\'oxom chuqa\' silowäch xketzij rik\'in 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">Xa xe tiq\'at k\'oxom</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Xa xe tiq\'at k\'oxom</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Tiq\'at k\'oxom chuqa\' silowäch</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Tiq\'at k\'oxom chuqa\' silowäch</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">Titzij</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
@@ -1118,6 +1138,8 @@
     <!-- Title for the site permissions item in Delete browsing data -->
     <string name="preferences_delete_browsing_data_site_permissions">Taq ruya\'oj q\'ij ruxaq</string>
 
+    <!-- Title for the downloads item in Delete browsing data -->
+    <string name="preferences_delete_browsing_data_downloads">Taq qasanïk</string>
     <!-- Text for the button to delete browsing data -->
     <string name="preferences_delete_browsing_data_button">Keyuj taq rutzij okem pa k\'amaya\'l</string>
     <!-- Title for the Delete browsing data on quit preference -->
@@ -1243,8 +1265,7 @@
 
     <!-- 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">Xqawachib\'ej %s richin nachajij ri nakomonij
-        pa k\'amab\'ey chuqa\' ri nakomonij qik\'in.</string>
+    <string name="onboarding_privacy_notice_description2">Xqawachib\'ej %s richin nachajij ri nakomonij pa k\'amab\'ey chuqa\' ri nakomonij qik\'in.</string>
     <!-- Text for the button to read the privacy notice -->
     <string name="onboarding_privacy_notice_read_button">Tasik\'ij ri rutzijol qichinanem</string>
 
diff --git a/app/src/main/res/values-co/strings.xml b/app/src/main/res/values-co/strings.xml
index c42c30624..a8b76440e 100644
--- a/app/src/main/res/values-co/strings.xml
+++ b/app/src/main/res/values-co/strings.xml
@@ -185,6 +185,8 @@
     <!-- Browser menu button to configure reader mode appearance e.g. the used font type and size -->
     <string name="browser_menu_read_appearance">Aspettu</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">Persunalizà u modu di lettura</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 cunnettassi. Schema d’URL scunnisciutu.</string>
@@ -221,6 +223,11 @@
     <!-- Search suggestion onboarding hint Learn more link text -->
     <string name="search_suggestions_onboarding_learn_more_link">Sapene di più</string>
 
+    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <string name="search_engine_suggestions_title">Ricercà in %s</string>
+    <!-- Search engine suggestion description text -->
+    <string name="search_engine_suggestions_description">Ricercà direttamente da a barra d’indirizzu</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
     <string name="search_widget_content_description">Apre una nova unghjetta in Firefox</string>
@@ -897,16 +904,22 @@
     <string name="tracking_protection_on">Attivata</string>
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Disattivata</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">Permette l’audio è a video</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Permette l’audio è a video</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Bluccà l’audio è a video da i dati mubili solu</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">Audio è video seranu letti cù una cunnessione 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">Bluccà solu l’audio</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Bluccà solu l’audio</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Bluccà l’audio è a video</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Bluccà l’audio è a video</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">Attivata</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 5d3a4477e..6b80e461f 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -222,6 +222,11 @@
     <!-- Search suggestion onboarding hint Learn more link text -->
     <string name="search_suggestions_onboarding_learn_more_link">Zjistit více</string>
 
+    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <string name="search_engine_suggestions_title">Hledat na %s</string>
+    <!-- Search engine suggestion description text -->
+    <string name="search_engine_suggestions_description">Vyhledat na webu přímo z adresního řádku</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
     <string name="search_widget_content_description">Otevřít nový panel Firefoxu</string>
@@ -905,16 +910,22 @@
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Vypnuta</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">Povolit zvuk i video</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Povolit zvuk 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">Blokovat automatické přehrávání zvuků i videí při připojení přes mobilní data</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">Na Wi-Fi připojení se zvuky i videa automaticky přehrávat budou</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">Blokovat automatické přehrávání zvuků</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Blokovat automatické přehrávání zvuků</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Blokovat automatické přehrávání zvuků i videí</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Blokovat automatické přehrávání zvuků i videí</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">Zapnuto</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
@@ -1114,6 +1125,8 @@
     <string name="preferences_delete_browsing_data_cached_files_subtitle">Uvolní využitý prostor na zařízení</string>
     <!-- Title for the site permissions item in Delete browsing data -->
     <string name="preferences_delete_browsing_data_site_permissions">Oprávnění serverů</string>
+    <!-- Title for the downloads item in Delete browsing data -->
+    <string name="preferences_delete_browsing_data_downloads">Stažené soubory</string>
     <!-- Text for the button to delete browsing data -->
     <string name="preferences_delete_browsing_data_button">Smazat soukromá data</string>
 
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index 1ee1be2a5..336188a71 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -180,6 +180,8 @@
     <!-- Browser menu button to configure reader mode appearance e.g. the used font type and size -->
     <string name="browser_menu_read_appearance">Gwedd</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">Cyfaddasu’r golwg defnyddiwr</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>
@@ -216,6 +218,11 @@
     <!-- Search suggestion onboarding hint Learn more link text -->
     <string name="search_suggestions_onboarding_learn_more_link">Dysgu rhagor</string>
 
+    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <string name="search_engine_suggestions_title">Chwilio %s</string>
+    <!-- Search engine suggestion description text -->
+    <string name="search_engine_suggestions_description">Chwilio’n uniongyrchol o’r bar cyfeiriad</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
     <string name="search_widget_content_description">Agorwch tab Firefox newydd</string>
@@ -886,16 +893,22 @@
     <string name="tracking_protection_on">Ymlaen</string>
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Diffodd</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">Caniatáu sain a fideo</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Caniatáu sain a fideo</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Rhwystro sain a fideo ar ddata cellol yn unig</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">Bydd sain a fideo yn chwarae ar ddiwifr</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">Rhwystro sain yn unig</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Rhwystro sain yn unig</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Rhwystro sain a fideo</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Rhwystro sain a fideo</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">Ymlaen</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 838fe1f53..b662bf04c 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -130,6 +130,8 @@
     <string name="browser_menu_edit_bookmark">Rediger bogmærke</string>
     <!-- Browser menu button that opens the addon manager -->
     <string name="browser_menu_add_ons">Tilføjelser</string>
+    <!-- Browser menu button that opens the addon extensions manager -->
+    <string name="browser_menu_extensions">Udvidelser</string>
     <!-- Text displayed when there are no add-ons to be shown -->
     <string name="no_add_ons">Her er ingen tilføjelser</string>
     <!-- Browser menu button that sends a user to help articles -->
@@ -523,6 +525,10 @@
     <string name="library_desktop_bookmarks_unfiled">Andre bogmærker</string>
     <!-- Option in Library to open History page -->
     <string name="library_history">Historik</string>
+    <!-- Option in Library to open a new tab -->
+    <string name="library_new_tab">Nyt faneblad</string>
+    <!-- Option in Library to find text in page -->
+    <string name="library_find_in_page">Find på siden</string>
     <!-- Option in Library to open Synced Tabs page -->
     <string name="library_synced_tabs">Synkroniserede faneblade</string>
     <!-- Option in Library to open Reading List -->
@@ -873,16 +879,22 @@
     <string name="tracking_protection_on">Til</string>
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Fra</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">Tillad lyd og video</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Tillad lyd og video</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Bloker kun lyd og video via mobildata</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">Lyd og video afspilles kun via 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">Bloker kun lyd</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Bloker kun lyd</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Bloker lyd og video</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Bloker lyd og video</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">Til</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 0f8097498..69ab06941 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -185,6 +185,8 @@
     <!-- Browser menu button to configure reader mode appearance e.g. the used font type and size -->
     <string name="browser_menu_read_appearance">Erscheinungsbild</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">Leseansicht anpassen</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>
@@ -222,6 +224,11 @@
     <!-- Search suggestion onboarding hint Learn more link text -->
     <string name="search_suggestions_onboarding_learn_more_link">Weitere Informationen</string>
 
+    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <string name="search_engine_suggestions_title">Suchen mit %s</string>
+    <!-- Search engine suggestion description text -->
+    <string name="search_engine_suggestions_description">Direkt aus der Adressleiste suchen</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
     <string name="search_widget_content_description">In einem neuen Firefox-Tab öffnen</string>
@@ -902,16 +909,22 @@
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Aus</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">Audio und Video erlauben</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Audio und Video erlauben</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Audio und Video nur bei Mobilfunkverbindung blockieren</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">Audio und Video werden bei WLAN-Verbindung wiedergegeben</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">Nur Audio blockieren</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Nur Audio blockieren</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Audio und Video blockieren</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Audio und Video blockieren</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">Ein</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
diff --git a/app/src/main/res/values-dsb/strings.xml b/app/src/main/res/values-dsb/strings.xml
index 021686f6b..589dc5bdb 100644
--- a/app/src/main/res/values-dsb/strings.xml
+++ b/app/src/main/res/values-dsb/strings.xml
@@ -180,6 +180,8 @@
     <!-- Browser menu button to configure reader mode appearance e.g. the used font type and size -->
     <string name="browser_menu_read_appearance">Wenkowny naglěd</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">Cytański naglěd pśiměriś</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>
@@ -216,6 +218,11 @@
     <!-- Search suggestion onboarding hint Learn more link text -->
     <string name="search_suggestions_onboarding_learn_more_link">Dalšne informacije</string>
 
+    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <string name="search_engine_suggestions_title">Z %s pytaś</string>
+    <!-- Search engine suggestion description text -->
+    <string name="search_engine_suggestions_description">Direktnje z adresowego póla pytaś</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
     <string name="search_widget_content_description">Nowy rejtarik Firefox wócyniś</string>
@@ -886,16 +893,22 @@
     <string name="tracking_protection_on">Zašaltowany</string>
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Wušaltowany</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">Awdio a wideo dowóliś</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Awdio a wideo dowóliś</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Awdio a wideo jano za mobilny zwisk blokěrowaś</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">Awdio a wideo se pśez WLAN wótgrawatej</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">Jano awdio blokěrowaś</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Jano awdio blokěrowaś</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Awdio a wideo blokěrowaś</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Awdio a wideo blokěrowaś</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">Zašaltowany</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 345827d89..1d72264bd 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -186,6 +186,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>
     <!-- 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>
@@ -223,6 +225,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>
@@ -896,16 +903,22 @@
     <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 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">Αποδοχή ήχου και βίντεο</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 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">Φραγή ήχου μόνο</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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 -->
diff --git a/app/src/main/res/values-en-rCA/strings.xml b/app/src/main/res/values-en-rCA/strings.xml
index 03c68fca0..146c1e22b 100644
--- a/app/src/main/res/values-en-rCA/strings.xml
+++ b/app/src/main/res/values-en-rCA/strings.xml
@@ -130,6 +130,8 @@
     <string name="browser_menu_edit_bookmark">Edit bookmark</string>
     <!-- Browser menu button that opens the addon manager -->
     <string name="browser_menu_add_ons">Add-ons</string>
+    <!-- Browser menu button that opens the addon extensions manager -->
+    <string name="browser_menu_extensions">Extensions</string>
     <!-- Text displayed when there are no add-ons to be shown -->
     <string name="no_add_ons">No add-ons here</string>
     <!-- Browser menu button that sends a user to help articles -->
@@ -178,6 +180,8 @@
     <!-- Browser menu button to configure reader mode appearance e.g. the used font type and size -->
     <string name="browser_menu_read_appearance">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">Customize reader view</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>
@@ -214,6 +218,11 @@
     <!-- Search suggestion onboarding hint Learn more link text -->
     <string name="search_suggestions_onboarding_learn_more_link">Learn more</string>
 
+    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <string name="search_engine_suggestions_title">Search %s</string>
+    <!-- Search engine suggestion description text -->
+    <string name="search_engine_suggestions_description">Search directly from the address bar</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
     <string name="search_widget_content_description">Open a new Firefox tab</string>
@@ -524,6 +533,10 @@
     <string name="library_desktop_bookmarks_unfiled">Other Bookmarks</string>
     <!-- Option in Library to open History page -->
     <string name="library_history">History</string>
+    <!-- Option in Library to open a new tab -->
+    <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 -->
@@ -873,16 +886,22 @@
     <string name="tracking_protection_on">On</string>
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Off</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">Allow audio and video</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Allow audio and video</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Block audio and video on cellular data only</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">Audio and video will play on 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">Block audio only</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Block audio only</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Block audio and video</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Block audio and video</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">On</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
index 49d293b86..9516a3abc 100644
--- a/app/src/main/res/values-en-rGB/strings.xml
+++ b/app/src/main/res/values-en-rGB/strings.xml
@@ -179,6 +179,8 @@
     <!-- Browser menu button to configure reader mode appearance e.g. the used font type and size -->
     <string name="browser_menu_read_appearance">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">Customise reader view</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>
@@ -215,6 +217,11 @@
     <!-- Search suggestion onboarding hint Learn more link text -->
     <string name="search_suggestions_onboarding_learn_more_link">Learn more</string>
 
+    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <string name="search_engine_suggestions_title">Search %s</string>
+    <!-- Search engine suggestion description text -->
+    <string name="search_engine_suggestions_description">Search directly from the address bar</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
     <string name="search_widget_content_description">Open a new Firefox tab</string>
@@ -881,16 +888,22 @@
     <string name="tracking_protection_on">On</string>
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Off</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">Allow audio and video</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Allow audio and video</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Block audio and video on mobile data only</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">Audio and video will play on 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">Block audio only</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Block audio only</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Block audio and video</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Block audio and video</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">On</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index fc99a3785..13986308f 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -890,16 +890,20 @@
     <string name="tracking_protection_on">Ŝaltita</string>
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Malŝaltita</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">Permesi sonon kaj videon</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Bloki sonon kaj videon nur dum konekto al poŝaparataj retoj</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">Sono kaj video estos ludataj en sendrata konektoj (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">Nur bloki sonon</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Nur bloki sonon</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Bloki sonon kaj videon</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Bloki sonon kaj videon</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">Ŝaltita</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
diff --git a/app/src/main/res/values-es-rAR/strings.xml b/app/src/main/res/values-es-rAR/strings.xml
index d2126b692..01f219fe1 100644
--- a/app/src/main/res/values-es-rAR/strings.xml
+++ b/app/src/main/res/values-es-rAR/strings.xml
@@ -183,6 +183,8 @@
     <!-- Browser menu button to configure reader mode appearance e.g. the used font type and size -->
     <string name="browser_menu_read_appearance">Apariencia</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">Personalizar vista de lectura</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>
@@ -222,6 +224,11 @@
     <!-- Search suggestion onboarding hint Learn more link text -->
     <string name="search_suggestions_onboarding_learn_more_link">Conocer más</string>
 
+    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <string name="search_engine_suggestions_title">Buscar %s</string>
+    <!-- Search engine suggestion description text -->
+    <string name="search_engine_suggestions_description">Buscar directamente desde la barra de direcciones</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
     <string name="search_widget_content_description">Abrir una nueva pestaña de Firefox</string>
@@ -905,16 +912,22 @@
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Desactivada</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">Permitir audio y video</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Permitir audio y video</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Bloquear audio y video solo en datos celulares</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">El audio y el video se van a reproducir con 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">Bloquear solo audio</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Bloquear solo audio</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Bloquear audio y video</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Bloquear audio y video</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">Activado</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
diff --git a/app/src/main/res/values-es-rCL/strings.xml b/app/src/main/res/values-es-rCL/strings.xml
index de1528334..55e449df7 100644
--- a/app/src/main/res/values-es-rCL/strings.xml
+++ b/app/src/main/res/values-es-rCL/strings.xml
@@ -129,6 +129,8 @@
     <string name="browser_menu_edit_bookmark">Editar marcador</string>
     <!-- Browser menu button that opens the addon manager -->
     <string name="browser_menu_add_ons">Complementos</string>
+    <!-- Browser menu button that opens the addon extensions manager -->
+    <string name="browser_menu_extensions">Extensiones</string>
     <!-- Text displayed when there are no add-ons to be shown -->
     <string name="no_add_ons">No hay complementos aquí</string>
     <!-- Browser menu button that sends a user to help articles -->
@@ -213,6 +215,11 @@
     <!-- Search suggestion onboarding hint Learn more link text -->
     <string name="search_suggestions_onboarding_learn_more_link">Aprender más</string>
 
+    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <string name="search_engine_suggestions_title">Buscar %s</string>
+    <!-- Search engine suggestion description text -->
+    <string name="search_engine_suggestions_description">Buscar directamente desde la barra de direcciones</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
     <string name="search_widget_content_description">Abrir una nueva pestaña de Firefox</string>
@@ -526,6 +533,10 @@
     <string name="library_desktop_bookmarks_unfiled">Otros marcadores</string>
     <!-- Option in Library to open History page -->
     <string name="library_history">Historial</string>
+    <!-- Option in Library to open a new tab -->
+    <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 -->
@@ -877,16 +888,22 @@
     <string name="tracking_protection_on">Sí</string>
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">No</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">Permitir audio y video</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Permitir audio y video</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Bloquear audio y video solo en datos celulares</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">El audio y video se reproducirán en 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">Bloquear solo audio</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Bloquear solo audio</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Bloquear audio y video</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Bloquear audio y video</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">Sí</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 0f8730760..41c69bdc0 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -184,6 +184,8 @@
     <!-- Browser menu button to configure reader mode appearance e.g. the used font type and size -->
     <string name="browser_menu_read_appearance">Apariencia</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">Personalizar vista de lectura</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>
@@ -221,6 +223,11 @@
     <!-- Search suggestion onboarding hint Learn more link text -->
     <string name="search_suggestions_onboarding_learn_more_link">Saber más</string>
 
+    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <string name="search_engine_suggestions_title">Buscar %s</string>
+    <!-- Search engine suggestion description text -->
+    <string name="search_engine_suggestions_description">Buscar directamente desde la barra de direcciones</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
     <string name="search_widget_content_description">Abrir una nueva pestaña de Firefox</string>
@@ -900,16 +907,22 @@
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Desactivada</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">Permitir audio y vídeo</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Permitir audio y vídeo</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Bloquear audio y vídeo solo con datos móviles</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">El audio y el vídeo se reproducirán con 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">Bloquear solo audio</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Bloquear solo audio</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Bloquear audio y vídeo</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Bloquear audio y vídeo</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">Activado</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index ad65854cf..4529d97c8 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -136,6 +136,8 @@
     <string name="browser_menu_edit_bookmark">Editar marcador</string>
     <!-- Browser menu button that opens the addon manager -->
     <string name="browser_menu_add_ons">Complementos</string>
+    <!-- Browser menu button that opens the addon extensions manager -->
+    <string name="browser_menu_extensions">Extensiones</string>
     <!-- Text displayed when there are no add-ons to be shown -->
     <string name="no_add_ons">No hay complementos aquí</string>
     <!-- Browser menu button that sends a user to help articles -->
@@ -222,6 +224,9 @@
     <!-- Search suggestion onboarding hint Learn more link text -->
     <string name="search_suggestions_onboarding_learn_more_link">Saber más</string>
 
+    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <string name="search_engine_suggestions_title">Buscar %1$s</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
     <string name="search_widget_content_description">Abrir una nueva pestaña de Firefox</string>
@@ -537,6 +542,10 @@
     <string name="library_desktop_bookmarks_unfiled">Otros marcadores</string>
     <!-- Option in Library to open History page -->
     <string name="library_history">Historial</string>
+    <!-- Option in Library to open a new tab -->
+    <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 -->
@@ -894,16 +903,22 @@
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Desactivado</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">Permitir audio y vídeo</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Permitir audio y video</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Bloquear audio y vídeo solo con datos móviles</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">El audio y el vídeo se reproducirán con 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">Bloquear solo audio</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Bloquear solo audio</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Bloquear audio y vídeo</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Bloquear audio y video</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">Activado</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 2e8280356..7dd70b032 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -132,6 +132,8 @@
     <string name="browser_menu_edit_bookmark">Editatu laster-marka</string>
     <!-- Browser menu button that opens the addon manager -->
     <string name="browser_menu_add_ons">Gehigarriak</string>
+    <!-- Browser menu button that opens the addon extensions manager -->
+    <string name="browser_menu_extensions">Hedapenak</string>
     <!-- Text displayed when there are no add-ons to be shown -->
     <string name="no_add_ons">Gehigarririk ez hemen</string>
     <!-- Browser menu button that sends a user to help articles -->
@@ -183,6 +185,8 @@
     <!-- Browser menu button to configure reader mode appearance e.g. the used font type and size -->
     <string name="browser_menu_read_appearance">Itxura</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">Pertsonalizatu irakurtzeko ikuspegia</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">Ezin da konektatu. URL eskema ezagutezina.</string>
@@ -220,6 +224,11 @@
     <!-- Search suggestion onboarding hint Learn more link text -->
     <string name="search_suggestions_onboarding_learn_more_link">Argibide gehiago</string>
 
+    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <string name="search_engine_suggestions_title">Bilatu %s erabiliz</string>
+    <!-- Search engine suggestion description text -->
+    <string name="search_engine_suggestions_description">Bilatu helbide-barratik zuzenean</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
     <string name="search_widget_content_description">Ireki Firefoxen fitxa berri bat</string>
@@ -538,6 +547,10 @@
     <string name="library_desktop_bookmarks_unfiled">Beste laster-markak</string>
     <!-- Option in Library to open History page -->
     <string name="library_history">Historia</string>
+    <!-- Option in Library to open a new tab -->
+    <string name="library_new_tab">Fitxa berria</string>
+    <!-- Option in Library to find text in page -->
+    <string name="library_find_in_page">Bilatu orrian</string>
     <!-- Option in Library to open Synced Tabs page -->
     <string name="library_synced_tabs">Sinkronizatutako fitxak</string>
     <!-- Option in Library to open Reading List -->
@@ -893,16 +906,22 @@
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Desaktibatuta</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">Baimendu audioa eta bideoa</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Baimendu audioa eta bideoa</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Blokeatu audioa eta bideoa datu mugikorretan soilik</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">Audioa eta bideoa WiFi bidez erreproduzituko dira soilik</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">Blokeatu audioa soilik</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Blokeatu audioa soilik</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Blokeatu audioa eta bideoa</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Blokeatu audioa eta bideoa</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">Aktibatuta</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index b0fb3425e..59b9d908c 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -128,6 +128,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 -->
@@ -212,6 +214,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">بازکردن یک زبانه فایرفاکس جدید</string>
@@ -522,6 +529,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 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 -->
@@ -874,16 +885,22 @@
     <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 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">اجازه دادن صوت و ویدئو</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 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">مسدود کردن فقط صدا</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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 -->
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index d672e5818..2fd2f384c 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -183,6 +183,8 @@
     <!-- Browser menu button to configure reader mode appearance e.g. the used font type and size -->
     <string name="browser_menu_read_appearance">Ulkoasu</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">Mukauta lukunä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>
@@ -897,16 +899,22 @@
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Pois</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">Salli ääni ja video</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Salli ääni ja video</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Estä ääni ja video vain käytettäessä matkapuhelinverkon datayhteyttä</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">Ääni ja video toistetaan käytettäessä Wi-Fi-yhteyttä</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">Estä vain ääni</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Estä vain ääni</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Estä ääni ja video</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Estä ääni ja video</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">Päällä</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 808ade139..c8ed1d932 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -131,6 +131,8 @@
     <string name="browser_menu_edit_bookmark">Modifier le marque-page</string>
     <!-- Browser menu button that opens the addon manager -->
     <string name="browser_menu_add_ons">Modules complémentaires</string>
+    <!-- Browser menu button that opens the addon extensions manager -->
+    <string name="browser_menu_extensions">Extensions</string>
     <!-- Text displayed when there are no add-ons to be shown -->
     <string name="no_add_ons">Aucun module ici</string>
     <!-- Browser menu button that sends a user to help articles -->
@@ -181,6 +183,8 @@
     <!-- Browser menu button to configure reader mode appearance e.g. the used font type and size -->
     <string name="browser_menu_read_appearance">Apparence</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">Personnaliser le mode lecture</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>
@@ -218,6 +222,11 @@
     <!-- Search suggestion onboarding hint Learn more link text -->
     <string name="search_suggestions_onboarding_learn_more_link">En savoir plus</string>
 
+    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <string name="search_engine_suggestions_title">Recherche %s</string>
+    <!-- Search engine suggestion description text -->
+    <string name="search_engine_suggestions_description">Recherchez directement depuis la barre d’adresse</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
     <string name="search_widget_content_description">Ouvrir un nouvel onglet dans Firefox</string>
@@ -537,6 +546,10 @@
     <string name="library_desktop_bookmarks_unfiled">Autres marque-pages</string>
     <!-- Option in Library to open History page -->
     <string name="library_history">Historique</string>
+    <!-- Option in Library to open a new tab -->
+    <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 -->
@@ -893,16 +906,22 @@
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Désactivée</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">Autoriser l’audio et la vidéo</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Autoriser l’audio et la vidéo</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Bloquer l’audio et la vidéo depuis les données mobiles uniquement</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">L’audio et la vidéo seront lus avec une connexion 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">Bloquer l’audio uniquement</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Bloquer l’audio uniquement</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Bloquer l’audio et la vidéo</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Bloquer l’audio et la vidéo</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">Activé</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
diff --git a/app/src/main/res/values-fy-rNL/strings.xml b/app/src/main/res/values-fy-rNL/strings.xml
index 4f33c21e0..928a8da77 100644
--- a/app/src/main/res/values-fy-rNL/strings.xml
+++ b/app/src/main/res/values-fy-rNL/strings.xml
@@ -183,6 +183,8 @@
     <!-- Browser menu button to configure reader mode appearance e.g. the used font type and size -->
     <string name="browser_menu_read_appearance">Uterlik</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">Lêzerwerjefte oanpasse</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>
@@ -219,6 +221,12 @@
     <!-- Search suggestion onboarding hint Learn more link text -->
     <string name="search_suggestions_onboarding_learn_more_link">Mear ynfo</string>
 
+    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <string name="search_engine_suggestions_title">%s trochsykje</string>
+
+    <!-- Search engine suggestion description text -->
+    <string name="search_engine_suggestions_description">Streekrjocht fan de adresbalke út sykje</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
     <string name="search_widget_content_description">In nij Firefox-ljepblêd iepenje</string>
@@ -884,16 +892,22 @@
     <string name="tracking_protection_on">Oan</string>
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Ut</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">Audio en fideo tastean</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Audio en fideo tastean</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Audio en fideo allinnich op mobile data blokkearje</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">Audio en fideo wurde fia wifi ôfspile</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">Allinnich audio blokkearje</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Allinnich audio blokkearje</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Audio en fideo blokkearje</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Audio en fideo blokkearje</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">Oan</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
diff --git a/app/src/main/res/values-gd/strings.xml b/app/src/main/res/values-gd/strings.xml
index 6cf7846f2..1d2e1c835 100644
--- a/app/src/main/res/values-gd/strings.xml
+++ b/app/src/main/res/values-gd/strings.xml
@@ -127,6 +127,8 @@
     <string name="browser_menu_edit_bookmark">Deasaich an comharra-lìn</string>
     <!-- Browser menu button that opens the addon manager -->
     <string name="browser_menu_add_ons">Tuilleadain</string>
+    <!-- Browser menu button that opens the addon extensions manager -->
+    <string name="browser_menu_extensions">Leudachain</string>
     <!-- Text displayed when there are no add-ons to be shown -->
     <string name="no_add_ons">Chan eil tuilleadan sam bith an-seo</string>
     <!-- Browser menu button that sends a user to help articles -->
@@ -522,6 +524,10 @@
     <string name="library_desktop_bookmarks_unfiled">Comharran-lìn eile</string>
     <!-- Option in Library to open History page -->
     <string name="library_history">An eachdraidh</string>
+    <!-- Option in Library to open a new tab -->
+    <string name="library_new_tab">Taba ùr</string>
+    <!-- Option in Library to find text in page -->
+    <string name="library_find_in_page">Lorg san duilleag</string>
     <!-- Option in Library to open Synced Tabs page -->
     <string name="library_synced_tabs">Tabaichean sioncronaichte</string>
     <!-- Option in Library to open Reading List -->
@@ -871,16 +877,22 @@
     <string name="tracking_protection_on">Air</string>
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Dheth</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">Ceadaich fuaim is video</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Ceadaich fuaim is video</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Bac an fhuaim agus video air ceangal dàta mobile a-mhàin</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">Gabhaidh fuaim agus video a chluich air WiFi</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">Na bac ach an fhuaim</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Na bac ach an fhuaim</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Bach an fhuaim agus a’ video</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Bach an fhuaim agus a’ video</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">Air</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
@@ -1078,6 +1090,8 @@
     <string name="preferences_delete_browsing_data_cached_files_subtitle">Saoraidh seo stòras</string>
     <!-- Title for the site permissions item in Delete browsing data -->
     <string name="preferences_delete_browsing_data_site_permissions">Ceadan nan làrach</string>
+    <!-- Title for the downloads item in Delete browsing data -->
+    <string name="preferences_delete_browsing_data_downloads">Luchdaidhean a-nuas</string>
     <!-- Text for the button to delete browsing data -->
     <string name="preferences_delete_browsing_data_button">Sguab an dàta brabhsaidh às</string>
     <!-- Title for the Delete browsing data on quit preference -->
@@ -1202,8 +1216,7 @@
     <string name="onboarding_privacy_notice_header">Do phrìobhaideachd</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">Dhealbh sinn %s airson ’s gum bi smachd agad-sa air na cho-roinneas
-        tu air loidhne agus na cho-roinneas tu leinne.</string>
+    <string name="onboarding_privacy_notice_description2">Dhealbh sinn %s airson ’s gum bi smachd agad-sa air na cho-roinneas tu air loidhne agus na cho-roinneas tu leinn.</string>
     <!-- Text for the button to read the privacy notice -->
     <string name="onboarding_privacy_notice_read_button">Leugh sanas na prìobhaideachd againn</string>
 
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index cd25c2457..875f0fe2a 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -128,6 +128,8 @@
     <string name="browser_menu_edit_bookmark">Editar marcador</string>
     <!-- Browser menu button that opens the addon manager -->
     <string name="browser_menu_add_ons">Complementos</string>
+    <!-- Browser menu button that opens the addon extensions manager -->
+    <string name="browser_menu_extensions">Extensións</string>
     <!-- Text displayed when there are no add-ons to be shown -->
     <string name="no_add_ons">Aquí non hai complementos</string>
     <!-- Browser menu button that sends a user to help articles -->
@@ -520,6 +522,10 @@
     <string name="library_desktop_bookmarks_unfiled">Outros marcadores</string>
     <!-- Option in Library to open History page -->
     <string name="library_history">Historial</string>
+    <!-- Option in Library to open a new tab -->
+    <string name="library_new_tab">Nova lapela</string>
+    <!-- Option in Library to find text in page -->
+    <string name="library_find_in_page">Atopar na páxina</string>
     <!-- Option in Library to open Synced Tabs page -->
     <string name="library_synced_tabs">Lapelas sincronizadas</string>
     <!-- Option in Library to open Reading List -->
@@ -866,17 +872,23 @@
     <string name="tracking_protection_on">Activado</string>
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Desactivado</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">Permitir son e vídeo</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Permitir son e vídeo</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Bloquear son e vídeo só en datos móbiles</string>
 
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">O son e o vídeo reproduciranse habendo wifi</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">Bloquear só o son</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Bloquear só o son</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Bloquear son e vídeo</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Bloquear son e vídeo</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">Activado</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
diff --git a/app/src/main/res/values-gn/strings.xml b/app/src/main/res/values-gn/strings.xml
index 66e7e9225..f4f1a7c0a 100644
--- a/app/src/main/res/values-gn/strings.xml
+++ b/app/src/main/res/values-gn/strings.xml
@@ -184,6 +184,8 @@
     <!-- Browser menu button to configure reader mode appearance e.g. the used font type and size -->
     <string name="browser_menu_read_appearance">Mba’ejegua</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">Emboava moñe’ẽhára rechaha</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>
@@ -220,6 +222,12 @@
     <!-- Search suggestion onboarding hint Learn more link text -->
     <string name="search_suggestions_onboarding_learn_more_link">Kuaave</string>
 
+    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <string name="search_engine_suggestions_title">Eheka %s</string>
+
+    <!-- Search engine suggestion description text -->
+    <string name="search_engine_suggestions_description">Eheka kundaharape renda guive</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
     <string name="search_widget_content_description">Embojuruja Firefox rendayke pyahu</string>
@@ -900,16 +908,22 @@
     <string name="tracking_protection_on">Hendypyre</string>
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Mboguepyre</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">Emoneĩ mba’epu ha ta’ãngamýi</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Emoneĩ mba’epu ha ta’ãngamýi</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Ejoko mba’epu ha ta’ãngamýi pumbyry mba’ekuaarãme año</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">Mba’epu ha ta’ãngamýi oñembohetáta Wi-Fi ndive</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">Ejoko mba’epu año</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Ejoko mba’epu año</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Ejoko mba’epu ha ta’ãngamýi año</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Ejoko mba’epu ha ta’ãngamýi</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">Hendypyre</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index 58d511663..5e972d85c 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -52,7 +52,7 @@
     <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 को @fork-maintainers द्वारा निर्मित किया गया है।</string>
+    <string name="about_content">%1$s को Mozilla द्वारा निर्मित किया गया है।</string>
 
     <!-- Private Browsing -->
     <!-- Title for private session option -->
@@ -472,6 +472,8 @@
     <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 open Synced Tabs page -->
     <string name="library_synced_tabs">सिंक हुए टैब</string>
     <!-- Option in Library to open Reading List -->
@@ -629,6 +631,10 @@
     <string name="history_empty_message">यहां कोई इतिहास नहीं</string>
 
 
+    <!-- History overflow menu open in new tab button -->
+    <string name="download_menu_open">खोलें</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>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index a2f96eb21..b3c1d73b7 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -61,7 +61,7 @@
     <string name="private_browsing_title">Nalaziš se u privatnoj sesiji</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 čisti tvoju kronologiju pretraživanja i pregledavanja kad izađeš iz aplikacije ili kad zatvoriš sve kartice i prozore privatnog pregledavanja. Ovo te ne čini anonimnim prema web-stranicama ili tvom pružatelju internet usluga, ali olakšava da zadržiš privatnim ono što radiš na internetu od ostalih osoba koje koriste ovo računalo.</string>
+    <string name="private_browsing_placeholder_description_2">%1$s čisti tvoju povijest pretraživanja i pregledavanja u privatnim karticama kada ih zatvoriš ili izađeš iz aplikacije. Ovo te ne čini anonimnim prema web-stranicama ili tvom pružatelju internetskih usluga, ali olakšava da zadržiš privatnim ono što radiš na internetu od ostalih osoba koje koriste ovaj uređaj.</string>
     <string name="private_browsing_common_myths">Česti mitovi o privatnom pregledavanju</string>
     <!-- Delete session button to erase your history in a private session -->
     <string name="private_browsing_delete_session">Izbriši sesiju</string>
@@ -179,6 +179,8 @@
     <!-- Browser menu button to configure reader mode appearance e.g. the used font type and size -->
     <string name="browser_menu_read_appearance">Izgled</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">Prilagodi prikaz za čitanje</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>
@@ -216,6 +218,11 @@
     <!-- Search suggestion onboarding hint Learn more link text -->
     <string name="search_suggestions_onboarding_learn_more_link">Saznaj više</string>
 
+    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <string name="search_engine_suggestions_title">Pretraži %s</string>
+    <!-- Search engine suggestion description text -->
+    <string name="search_engine_suggestions_description">Pretraži izravno iz adresne trake</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
     <string name="search_widget_content_description">Otvori novu karticu u Firefoxu</string>
@@ -493,9 +500,9 @@
 
     <!-- Theme Preferences -->
     <!-- Preference for using light theme -->
-    <string name="preference_light_theme">Svijetli</string>
+    <string name="preference_light_theme">Svijetla</string>
     <!-- Preference for using dark theme -->
-    <string name="preference_dark_theme">Tamni</string>
+    <string name="preference_dark_theme">Tamna</string>
 
     <!-- Preference for using using dark or light theme automatically set by battery -->
     <string name="preference_auto_battery_theme">Postavljeno u postavkama za štednju baterije</string>
@@ -892,16 +899,22 @@
     <string name="tracking_protection_on">Uključeno</string>
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Isključeno</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">Dopusti zvuk i video</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Dopusti zvuk 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">Blokiraj zvuk i video samo na mobilnoj vezi</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">Zvuk i video reproducirat će se na Wi-Fi-ju</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">Blokiraj samo zvuk</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Blokiraj samo zvuk</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Blokiraj zvuk i video</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Blokiraj zvuk i video</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">Uključeno</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
diff --git a/app/src/main/res/values-hsb/strings.xml b/app/src/main/res/values-hsb/strings.xml
index 366e974d2..b64c370ca 100644
--- a/app/src/main/res/values-hsb/strings.xml
+++ b/app/src/main/res/values-hsb/strings.xml
@@ -181,6 +181,8 @@
     <!-- Browser menu button to configure reader mode appearance e.g. the used font type and size -->
     <string name="browser_menu_read_appearance">Zwonkowny napohlad</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">Čitanski napohlad přiměrić</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>
@@ -217,6 +219,11 @@
     <!-- Search suggestion onboarding hint Learn more link text -->
     <string name="search_suggestions_onboarding_learn_more_link">Dalše informacije</string>
 
+    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <string name="search_engine_suggestions_title">Z %s pytać</string>
+    <!-- Search engine suggestion description text -->
+    <string name="search_engine_suggestions_description">Direktnje z adresoweho pola pytać</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
     <string name="search_widget_content_description">Nowy rajtark Firefox wočinić</string>
@@ -889,16 +896,22 @@
     <string name="tracking_protection_on">Zapinjeny</string>
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Wupinjeny</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">Awdio a widejo dowolić</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Awdio a widejo dowolić</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Awdio a widejo jenož za mobilny zwisk blokować</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">Awdio a widejo so přez WLAN wothrawatej</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">Jenož awdio blokować</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Jenož awdio blokować</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Awdio a widejo blokować</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Awdio a widejo blokować</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">Zapinjeny</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 9010518a1..6470877a1 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -130,6 +130,8 @@
     <string name="browser_menu_edit_bookmark">Könyvjelző szerkesztése</string>
     <!-- Browser menu button that opens the addon manager -->
     <string name="browser_menu_add_ons">Kiegészítők</string>
+    <!-- Browser menu button that opens the addon extensions manager -->
+    <string name="browser_menu_extensions">Kiegészítők</string>
     <!-- Text displayed when there are no add-ons to be shown -->
     <string name="no_add_ons">Nincsenek kiegészítők</string>
     <!-- Browser menu button that sends a user to help articles -->
@@ -180,6 +182,8 @@
     <!-- Browser menu button to configure reader mode appearance e.g. the used font type and size -->
     <string name="browser_menu_read_appearance">Megjelenés</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">Olvasó nézet testreszabása</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>
@@ -217,6 +221,11 @@
     <!-- Search suggestion onboarding hint Learn more link text -->
     <string name="search_suggestions_onboarding_learn_more_link">További tudnivalók</string>
 
+    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <string name="search_engine_suggestions_title">%s keresés</string>
+    <!-- Search engine suggestion description text -->
+    <string name="search_engine_suggestions_description">Keresés közvetlenül a címsávból</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
     <string name="search_widget_content_description">Új Firefox-lap megnyitása</string>
@@ -532,6 +541,10 @@
     <string name="library_desktop_bookmarks_unfiled">Más könyvjelzők</string>
     <!-- Option in Library to open History page -->
     <string name="library_history">Előzmények</string>
+    <!-- Option in Library to open a new tab -->
+    <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 -->
@@ -885,16 +898,22 @@
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Ki</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">Hang és videó engedélyezése</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Hang és videó engedélyezése</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Hang és videó blokkolása csak mobil-adatkapcsolaton</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">A hang és videó Wi-Fi-n lesz lejátszva</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">Csak a hang blokkolása</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Csak a hang blokkolása</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Hang és videó blokkolása</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Hang és videó blokkolása</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">Be</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 7644c30a0..e62ef605e 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -132,6 +132,8 @@
     <string name="browser_menu_edit_bookmark">Edit markah</string>
     <!-- Browser menu button that opens the addon manager -->
     <string name="browser_menu_add_ons">Pengaya</string>
+    <!-- Browser menu button that opens the addon extensions manager -->
+    <string name="browser_menu_extensions">Ekstensi</string>
     <!-- Text displayed when there are no add-ons to be shown -->
     <string name="no_add_ons">Tidak ada pengaya di sini</string>
     <!-- Browser menu button that sends a user to help articles -->
@@ -540,6 +542,10 @@
     <string name="library_desktop_bookmarks_unfiled">Markah Lain</string>
     <!-- Option in Library to open History page -->
     <string name="library_history">Riwayat</string>
+    <!-- Option in Library to open a new tab -->
+    <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 -->
@@ -895,16 +901,22 @@
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Nonaktif</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">Izinkan audio dan video</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Izinkan audio dan video</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Blokir suara dan video hanya pada mode data seluler</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">Suara dan video akan diputar dalam mode 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">Blokir suara saja</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Blokir audio saja</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Blokir suara dan video</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Blokir audio dan video</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">Aktif</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 0c0d4252d..4192e89a7 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -183,6 +183,8 @@
     <!-- Browser menu button to configure reader mode appearance e.g. the used font type and size -->
     <string name="browser_menu_read_appearance">Aspetto</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">Personalizza modalità lettura</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>
@@ -220,6 +222,11 @@
     <!-- Search suggestion onboarding hint Learn more link text -->
     <string name="search_suggestions_onboarding_learn_more_link">Ulteriori informazioni</string>
 
+    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <string name="search_engine_suggestions_title">Cerca in %s</string>
+    <!-- Search engine suggestion description text -->
+    <string name="search_engine_suggestions_description">Cerca direttamente dalla barra degli indirizzi</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
     <string name="search_widget_content_description">Apri una nuova scheda in Firefox</string>
@@ -903,16 +910,22 @@
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Disattivata</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">Consenti audio e video</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Consenti audio e video</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Blocca audio e video solo con connessione dati</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">Audio e video saranno riprodotti con una connessione 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">Blocca solo l’audio</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Blocca solo l’audio</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Blocca audio e video</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Blocca audio e video</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">Attivato</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 1898fcb8b..d59d78e2d 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -180,6 +180,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>
     <!-- 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>
@@ -216,6 +218,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>
@@ -495,6 +502,8 @@
     <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>
 
@@ -616,6 +625,8 @@
     <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. -->
@@ -883,16 +894,22 @@
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">כבויה</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">לאפשר שמע ווידאו</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 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">לחסום שמע בלבד</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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 -->
@@ -1467,6 +1484,8 @@
     <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">להכניס את הקוד שלך מחדש</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 -->
@@ -1505,12 +1524,18 @@
     <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">ניתן להגדיר תבנית נעילת מכשיר, קוד או ססמה כדי להגן על פרטי הגישה והססמאות שלך מפני גורמים בלתי מהימנים שמחזיקים במכשיר שלך.</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) -->
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index a757700b2..06a2c93e2 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -133,6 +133,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 -->
@@ -183,6 +185,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>
     <!-- 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>
@@ -220,6 +224,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>
@@ -537,6 +546,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 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 -->
@@ -895,16 +908,22 @@
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">オフ</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">音声と動画の再生を許可</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 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">音声のみブロック</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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 -->
diff --git a/app/src/main/res/values-ka/strings.xml b/app/src/main/res/values-ka/strings.xml
index 336ff332e..572aa547f 100644
--- a/app/src/main/res/values-ka/strings.xml
+++ b/app/src/main/res/values-ka/strings.xml
@@ -127,6 +127,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 -->
@@ -175,6 +177,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>
     <!-- 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>
@@ -211,6 +215,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>
@@ -526,6 +535,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 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 -->
@@ -879,16 +892,22 @@
     <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 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">ხმისა და ვიდეოს დაშვება</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 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">მხოლოდ ხმის შეზღუდვა</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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 -->
@@ -955,7 +974,7 @@
     <!-- 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 share dialog to sign into sync -->
-    <string name="sync_sign_in">Sync შესვლა</string>
+    <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 -->
diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
index 7018fa864..98598bd12 100644
--- a/app/src/main/res/values-kab/strings.xml
+++ b/app/src/main/res/values-kab/strings.xml
@@ -183,6 +183,8 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Browser menu button to configure reader mode appearance e.g. the used font type and size -->
     <string name="browser_menu_read_appearance">Arwes</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">Sagen timeẓri n tɣuri</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>
@@ -219,6 +221,11 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Search suggestion onboarding hint Learn more link text -->
     <string name="search_suggestions_onboarding_learn_more_link">Issin ugar</string>
 
+    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <string name="search_engine_suggestions_title">Nadi %s</string>
+    <!-- Search engine suggestion description text -->
+    <string name="search_engine_suggestions_description">Nadi srid seg ufeggag n tansiwin</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
     <string name="search_widget_content_description">Ldi iccer amaynut n Firefox</string>
@@ -898,16 +905,22 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <string name="tracking_protection_on">Irmed</string>
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Insa</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">Sireg ameslaw d uvidyu</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Sireg ameslaw d tvidyut</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Sewḥel imeslawen d tvidyutin ded yisefka izirazen kan</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">Imeslawen d tividyutin ad uraren deg 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">Sewḥel kan imeslawen</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Sewḥel kan ameslaw</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Sewḥel imeslawen d tvidyutin</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Sewḥel ameslaw d tvidyut</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">Irmed</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
diff --git a/app/src/main/res/values-kk/strings.xml b/app/src/main/res/values-kk/strings.xml
index d7944dc43..a51ebc93b 100644
--- a/app/src/main/res/values-kk/strings.xml
+++ b/app/src/main/res/values-kk/strings.xml
@@ -127,6 +127,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 -->
@@ -174,6 +176,8 @@
     <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>
     <!-- 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>
@@ -211,6 +215,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>
@@ -520,6 +529,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 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 -->
@@ -870,16 +883,22 @@
     <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 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">Аудио мен видеоны рұқсат ету</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 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">Тек аудионы бұғаттау</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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 -->
diff --git a/app/src/main/res/values-kmr/strings.xml b/app/src/main/res/values-kmr/strings.xml
index a883ba0e3..d7908dd91 100644
--- a/app/src/main/res/values-kmr/strings.xml
+++ b/app/src/main/res/values-kmr/strings.xml
@@ -14,7 +14,7 @@
     <!-- Content description (not visible, for screen readers etc.): "Private Browsing" menu button. -->
     <string name="content_description_disable_private_browsing_button">Gerîna veşartî bigire</string>
     <!-- Placeholder text shown in the search bar before a user enters text -->
-    <string name="search_hint">Lêgerîn yan navnîşanek</string>
+    <string name="search_hint">Lêgerîn an jî navnîşan</string>
     <!-- No Open Tabs Message Description -->
     <string name="no_open_tabs_description">Hilpekînên te yên vekirî ew ê li vir bên nîşandan.</string>
     <!-- No Private Tabs Message Description -->
@@ -36,19 +36,19 @@
     <!-- Label of button in save to collection dialog for selecting a current collection  -->
     <string name="tab_tray_select_collection">Koleksiyonê hilbijêre</string>
     <!-- Content description for close button while in multiselect mode in tab tray -->
-    <string name="tab_tray_close_multiselect_content_description">Ji moda pir-bijartinê derkeve</string>
+    <string name="tab_tray_close_multiselect_content_description">Ji moda bijartina-pir derkeve</string>
     <!-- Content description for save to collection button while in multiselect mode in tab tray -->
     <string name="tab_tray_collection_button_multiselect_content_description">Hilpekînên bijartî li koleksiyonê qeyd bike</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 hat bijartin</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">Bıjartina %1$s hate rakirin</string>
+    <string name="tab_tray_item_unselected_multiselect_content_description">Bijartina %1$s hate rakirin</string>
     <!-- Content description announcement when exiting multiselect mode in tab tray -->
-    <string name="tab_tray_exit_multiselect_content_description">Ji moda pir-bijartinê hate derketin</string>
+    <string name="tab_tray_exit_multiselect_content_description">Ji moda bijartina-pir hate derketin</string>
 
     <!-- Content description announcement when entering multiselect mode in tab tray -->
-    <string name="tab_tray_enter_multiselect_content_description">Tu ket moda pir-bijartinê, ji bo tomarkirina li koleksiyonê hilpekînan hilbijêre</string>
+    <string name="tab_tray_enter_multiselect_content_description">Tu ket moda bijartina-pir, ji bo tomarkirina li koleksiyonê hilpekînan hilbijêre</string>
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">Hate bijartin</string>
 
@@ -61,9 +61,9 @@
     <!-- 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, dema ku te hilpekînên veşartî girtin an jî tu ji sepanê derket ew ê raboriya te ya gerîn û lêgerînê ji hilpekînên veşartî bên paqijkirin. Ev, rê li ber şopandina/nedîtina te ya ji aliyê malper û peydakerên servîsê ve nagirê lê heke hin kesên din ên vê cîhazê bi kar tînin hebin ew ê bihêle ku tu raboriya xwe ji wan veşêrî.</string>
+        %1$s, dema ku te hilpekînên veşartî girtin an jî tu ji sepanê derket ew ê raboriya te ya gerîn û lêgerînê ji hilpekînên veşartî bên paqijkirin. Ev, rê li ber şopandina te ya ji aliyê malper û peydakerên servîsê ve nagirê lê heke hin kesên din ên vê cîhazê bi kar tînin hebin ew ê bihêle ku tu raboriya xwe ji wan veşêrî.</string>
     <string name="private_browsing_common_myths">
-       Efsaneyên berbelav ên derbarê gerîna veşartî de
+       Efsaneyên berbelav ên têkildarî gerîna veşartî
     </string>
     <!-- Delete session button to erase your history in a private session -->
     <string name="private_browsing_delete_session">Rûniştinê jê bibe</string>
@@ -85,7 +85,7 @@
     <string name="open_in_app_cfr_negative_button_text">Bigire</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">Gihîna kamerayê hewce ye. Here sazkariyên Androidê ji beşa destûran, destûrê bide.</string>
+    <string name="camera_permissions_needed_message">Gihîna li kamerayê hewce ye. Here sazkariyên Androidê ji beşa destûran, destûrê bide.</string>
     <!-- Text for the positive action button to go to Android Settings to grant permissions. -->
     <string name="camera_permissions_needed_positive_button_text">Here sazkariyan</string>
     <!-- Text for the negative action button to dismiss the dialog. -->
@@ -99,7 +99,7 @@
     <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înê&quot; gridê hilbijêre.</string>
+    <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. -->
@@ -126,11 +126,13 @@
     <!-- Content description (not visible, for screen readers etc.): Stop loading current website -->
     <string name="browser_menu_stop">Rawestîne</string>
     <!-- Content description (not visible, for screen readers etc.): Bookmark the current page -->
-    <string name="browser_menu_bookmark">Favorî</string>
+    <string name="browser_menu_bookmark">Tevlî favoriyan bike</string>
     <!-- Content description (not visible, for screen readers etc.): Un-bookmark the current page -->
-    <string name="browser_menu_edit_bookmark">Favoriyan serast bike</string>
+    <string name="browser_menu_edit_bookmark">Favoriyan sererast bike</string>
     <!-- Browser menu button that opens the addon manager -->
     <string name="browser_menu_add_ons">Pêvek</string>
+    <!-- Browser menu button that opens the addon extensions manager -->
+    <string name="browser_menu_extensions">Pêvek</string>
     <!-- Text displayed when there are no add-ons to be shown -->
     <string name="no_add_ons">Ti pêvek li vir tune</string>
     <!-- Browser menu button that sends a user to help articles -->
@@ -196,13 +198,13 @@
 
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
-    <string name="search_scan_button">Sken</string>
+    <string name="search_scan_button">Kodê bixwîne</string>
     <!-- Button in the search view that lets a user change their search engine -->
     <string name="search_engine_button">Motora lêgerînê</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">Sazkariyên motora lêgerînê</string>
     <!-- Header displayed when selecting a shortcut search engine -->
-    <string name="search_engines_search_with">Îja ka bi vê bigere:</string>
+    <string name="search_engines_search_with">Îja ka bi vê lê bigere:</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">Girêdanê ji panoyê bîne</string>
     <!-- Button in the search suggestions onboarding that allows search suggestions in private sessions -->
@@ -210,9 +212,9 @@
     <!-- Button in the search suggestions onboarding that does not allow search suggestions in private sessions -->
     <string name="search_suggestions_onboarding_do_not_allow_button">Destûrê nede</string>
     <!-- Search suggestion onboarding hint title text -->
-    <string name="search_suggestions_onboarding_title">Di rûniştina veşartî de bila pêşniyarên lêgerînê werin pêş te?</string>
+    <string name="search_suggestions_onboarding_title">Bila pêşniyarên lêgerînê di rûniştina veşartî de werin pêş te?</string>
     <!-- Search suggestion onboarding hint description text, first parameter is the name of the app defined in app_name (for example: Fenix)-->
-    <string name="search_suggestions_onboarding_text">%s dê hemû tiştên tu li darikê navnîşanan binivîsî bi motora te ya lêgerînê ya derbasdar re parve bike.</string>
+    <string name="search_suggestions_onboarding_text">%s dê hemû tiştên tu li darika navnîşanan binivîsî bi motora te ya lêgerînê ya derbasdar re parve bike.</string>
     <!-- Search suggestion onboarding hint Learn more link text -->
     <string name="search_suggestions_onboarding_learn_more_link">Zêdetir bizane</string>
 
@@ -240,7 +242,7 @@
     <!-- Preference for settings related to Search -->
     <string name="preferences_search">Lêgerîn</string>
     <!-- Preference for settings related to Search address bar -->
-    <string name="preferences_search_address_bar">Dariikê navnîşanan</string>
+    <string name="preferences_search_address_bar">Darika navnîşanê</string>
     <!-- Preference linking to help about Fenix -->
     <string name="preferences_help">Alîkarî</string>
     <!-- Preference link to rating Fenix on the Play Store -->
@@ -249,7 +251,7 @@
     <string name="preferences_feedback">Paşragihandinê bişîne</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">Derbarê %1$s</string>
+    <string name="preferences_about">Derbarê %1$s de</string>
 
 
     <!-- Preference linking to the your rights SUMO page -->
@@ -273,19 +275,19 @@
     <!-- Preference for opening links in a private tab-->
     <string name="preferences_open_links_in_a_private_tab">Girêdanan di hilpekîna veşartî de veke</string>
     <!-- Preference for allowing screenshots to be taken while in a private tab-->
-    <string name="preferences_allow_screenshots_in_private_mode">Destûrê bide girtina wêneyê ekranê di gera nepen de</string>
+    <string name="preferences_allow_screenshots_in_private_mode">Di gerîna veşartî de, bihêle bila wêneyê ekranê bê kişandin</string>
     <!-- Will inform the user of the risk of activating Allow screenshots in private browsing option -->
-    <string name="preferences_screenshots_in_private_mode_disclaimer">Heke destûrê bidî, gava gelek bernamok vekirî bin hilpekînên nepen dê xuya bibin</string>
+    <string name="preferences_screenshots_in_private_mode_disclaimer">Heke destûr bê dayîn, dema ku gelek sepan vekirî bin jî ew ê hilpekînên veşartî xuya bibin</string>
     <!-- Preference for adding private browsing shortcut -->
-    <string name="preferences_add_private_browsing_shortcut">Kurteriya gera nepen lê zêde bike</string>
+    <string name="preferences_add_private_browsing_shortcut">Kurterêya gerîna veşartî tevlî bike</string>
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Gihînbarî</string>
     <!-- Preference to override the Firefox Account server -->
     <string name="preferences_override_fxa_server">Servera taybet a hesabê Firefoxê</string>
     <!-- Preference to override the Sync token server -->
-    <string name="preferences_override_sync_tokenserver">Servera taybet a Sync`ê</string>
+    <string name="preferences_override_sync_tokenserver">Servera Sync’ê ya taybet</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Hesabê Firefoxê/PÊşkêşkara Sync hat guhertin. Ji bo sepandina guhertinan ji bernameyê derdikeve…</string>
+    <string name="toast_override_fxa_sync_server_done">Servera Sync/Hesabê Firefoxê hat guhertin. Ji bo sepandina guhertinan ji sepanê derdikeve…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Hesab</string>
     <!-- Preference shown on banner to sign into account -->
@@ -297,15 +299,15 @@
     <!-- Preference for customizing the home screen -->
     <string name="preferences_home">Serrûpel</string>
     <!-- Preference for gestures based actions -->
-    <string name="preferences_gestures">Îşaretên tiliyan</string>
+    <string name="preferences_gestures">Hereketên tiliyan</string>
     <!-- Preference for settings related to visual options -->
     <string name="preferences_customize">Taybet bike</string>
     <!-- Preference description for banner about signing in -->
-    <string name="preferences_sign_in_description">Bi hesabê xwe yê Firefoxê favorî, mêjû û zêdetir tiştên xwe hevseng bike</string>
+    <string name="preferences_sign_in_description">Bi hesabê xwe yê Firefoxê favorî, raborî û zêdetirî wan senkronîze bike</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
     <string name="preferences_account_default_name">Hesabê Firefoxê</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
-    <string name="preferences_account_sync_error">Ji bo dewamkirina hevsengkirinê dîsgirêdanê çêke</string>
+    <string name="preferences_account_sync_error">Ji bo senkronîzekirinê bidomînî, dîsa girê bide</string>
     <!-- Preference for language -->
     <string name="preferences_language">Ziman</string>
     <!-- Preference for data choices -->
@@ -317,7 +319,7 @@
     <!-- Preference category for developer tools -->
     <string name="developer_tools_category">Amûrên pêşvebirinê</string>
     <!-- Preference for developers -->
-    <string name="preferences_remote_debugging">Bi riya USBê ji dûr ve neqandina çewtiyan</string>
+    <string name="preferences_remote_debugging">Bi rêya USB’ê ji dûr ve neqandina çewtiyan</string>
     <!-- Preference title for switch preference to show search engines -->
     <string name="preferences_show_search_engines">Motorên lêgerînê nîşan bide</string>
     <!-- Preference title for switch preference to show search suggestions -->
@@ -331,9 +333,9 @@
     <!-- Preference title for switch preference to suggest browsing history when searching -->
     <string name="preferences_search_browsing_history">Di raboriya gerînê de lê bigere</string>
     <!-- Preference title for switch preference to suggest bookmarks when searching -->
-    <string name="preferences_search_bookmarks">Di favoriyan de bigere</string>
+    <string name="preferences_search_bookmarks">Di favoriyan de lê bigere</string>
     <!-- Preference title for switch preference to suggest synced tabs when searching -->
-    <string name="preferences_search_synced_tabs">Di hilpekînên hevsengkirî de bigere</string>
+    <string name="preferences_search_synced_tabs">Di hilpekînên senkronîzekirî de lê bigere</string>
     <!-- Preference for account settings -->
     <string name="preferences_account_settings">Sazkariyên hesêb</string>
     <!-- Preference for enabling url autocomplete-->
@@ -341,7 +343,7 @@
     <!-- Preference for open links in third party apps -->
     <string name="preferences_open_links_in_apps">Girêdanan di sepanan de veke</string>
     <!-- Preference for open download with an external download manager app -->
-    <string name="preferences_external_download_manager">Rêvebera jêbarkirinê ya derveyî</string>
+    <string name="preferences_external_download_manager">Rêvebera daxistinê ya derveyî</string>
     <!-- Preference for add_ons -->
     <string name="preferences_addons">Pêvek</string>
     <!-- Preference for notifications -->
@@ -360,15 +362,14 @@
     <string name="customize_addon_collection_user_hint">Xwediyê koleksiyonê (nasnameya bikarhêner)</string>
 
     <!-- Toast shown after confirming the custom add-on collection configuration -->
-    <string name="toast_customize_addon_collection_done">Koleksiyona pêvekan hat guhertin. Ji bo sepandina guhertinan ji bernamokê derdikeve…</string>
+    <string name="toast_customize_addon_collection_done">Koleksiyona pêvekan hat guhertin. Ji bo sepandina guhertinan ji sepanê derdikeve…</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">Pêvek nayê piştgirîkirin</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">Pêvek jixwe sazkirî ye
-</string>
+    <string name="addon_already_installed">Pêvek jixwe sazkirî ye</string>
 
     <!-- Account Preferences -->
     <!-- Preference for triggering sync -->
@@ -409,13 +410,13 @@
 
     <!-- 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 wergirtin</string>
+    <string name="fxa_received_tab_channel_name">Hilpekînên hatine stendin</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">Danezanên ji bo hilpekînên ji amûrên din yên Firefoxê hatî</string>
+    <string name="fxa_received_tab_channel_description">Danezanên hilpekînan ên ji cîhazên Firefoxê tên stendin.</string>
     <!--  The body for these is the URL of the tab received  -->
-    <string name="fxa_tab_received_notification_name">Hilpekîn hate wergirtin</string>
+    <string name="fxa_tab_received_notification_name">Hilpekîn hate stendin</string>
     <!-- When multiple tabs have been received -->
-    <string name="fxa_tabs_received_notification_name">Hilpekîn hatin wergirtin</string>
+    <string name="fxa_tabs_received_notification_name">Hilpekîn hatin stendin</string>
     <!-- %s is the device name -->
     <string name="fxa_tab_received_from_notification_name">Hilpekîna ji %s ve hat</string>
 
@@ -426,7 +427,7 @@
     <string name="preferences_tracking_protection">Parastina ji Şopandinê</string>
 
     <!-- Preference switch description for tracking protection -->
-    <string name="preferences_tracking_protection_description">Naverok û skrîptên li ser înternetê te dişopînin asteng bike</string>
+    <string name="preferences_tracking_protection_description">Naverok û skrîptên ku li ser înternetê te dişopînin asteng bike</string>
     <!-- Preference for tracking protection exceptions -->
     <string name="preferences_tracking_protection_exceptions">Istisna</string>
     <!-- Preference description for tracking protection exceptions -->
@@ -434,17 +435,19 @@
     <!-- 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">Ji bo hemû malperan veke</string>
     <!-- Text displayed when there are no exceptions -->
-    <string name="exceptions_empty_message_description">Istisna dihêle ku tu dikaribî ji bo malperên hilbijartî parastina şopandinê bigirî.</string>
+    <string name="exceptions_empty_message_description">Istisna dihêlin ku tu bikaribî ji bo malperên hilbijartî parastina ji şopandinê bigirî.</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">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 Eyaran.</string>
+    <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 -->
     <string name="preference_usage_data">Daneyên bikaranînê û teknîkî</string>
+    <!-- Preference description for usage and technical data collection -->
+    <string name="preferences_usage_data_description">Performans, bikaranîn, reqalav û daneyên taybetkirinê yên têkildarî geroka te bi Mozillayê re parve dike, ji bo ku em karibin pê %1$s’ê baştir bikin</string>
     <!-- Preference switch for marketing data collection -->
     <string name="preferences_marketing_data">Daneyên bazarkirinê</string>
     <!-- Title for studies preferences -->
@@ -468,17 +471,17 @@
     <!-- Header of the Turn on Sync preference view -->
     <string name="preferences_sync">Sync’ê veke</string>
     <!-- Preference for pairing -->
-    <string name="preferences_sync_pair">Koda hevsengkirinê ya di Firefoxa Sermaseyê de sken bike</string>
+    <string name="preferences_sync_pair">Koda hevcotkirinê ya di Firefoxa Sermaseyê de bide xwendin</string>
     <!-- Preference for account login -->
     <string name="preferences_sync_sign_in">Têkeve</string>
     <!-- Preference for reconnecting to FxA sync -->
-    <string name="preferences_sync_sign_in_to_reconnect">Ji bo dîsberibandinê têkevinê</string>
+    <string name="preferences_sync_sign_in_to_reconnect">Ji bo dîsa girê bibî, têkeve</string>
     <!-- Preference for removing FxA account -->
     <string name="preferences_sync_remove_account">Hesêb rake</string>
 
     <!-- Pairing Feature strings -->
     <!-- Instructions on how to access pairing -->
-    <string name="pair_instructions_2"><![CDATA[Koda QRê ya di <b> firefox.com/pair </b> de xuya dibe sken bike]]></string>
+    <string name="pair_instructions_2"><![CDATA[Koda QRê ya di <b> firefox.com/pair </b> de xuya dibe, bide xwendin]]></string>
     <!-- Button to open camera for pairing -->
     <string name="pair_open_camera">Kamerayê veke</string>
     <!-- Button to cancel pairing -->
@@ -497,7 +500,7 @@
     <string name="preference_dark_theme">Tarî</string>
 
     <!-- Preference for using using dark or light theme automatically set by battery -->
-    <string name="preference_auto_battery_theme">Li gorî teserufa akuyê</string>
+    <string name="preference_auto_battery_theme">Li gorî teserufa bateryayê</string>
     <!-- Preference for using following device theme -->
     <string name="preference_follow_device_theme">Rûkara cîhazê bi kar bîne</string>
 
@@ -505,11 +508,11 @@
     <!-- Preferences for using pull to refresh in a webpage -->
     <string name="preference_gestures_website_pull_to_refresh">Ji bo nûkirinê bikişîne</string>
     <!-- Preference for using the dynamic toolbar -->
-    <string name="preference_gestures_dynamic_toolbar">Ji bo veşartina derikê amûran bişemitîne</string>
+    <string name="preference_gestures_dynamic_toolbar">Ji bo darikê amûran veşêrî, bişemitîne</string>
     <!-- Preference for switching tabs by swiping horizontally on the toolbar -->
-    <string name="preference_gestures_swipe_toolbar_switch_tabs">Ji bo guhertina hilpekînê darikê amûran bi kêlekê ve kaş bike</string>
+    <string name="preference_gestures_swipe_toolbar_switch_tabs">Ji bo hilpekînê biguherînî, darikê amûran biherikîne kêlekê</string>
     <!-- Preference for showing the opened tabs by swiping up on the toolbar-->
-    <string name="preference_gestures_swipe_toolbar_show_tabs">Ji bo vekirina hilpekînan darikê amûran bi jorê ve bikişîne</string>
+    <string name="preference_gestures_swipe_toolbar_show_tabs">Ji bo hilpekînan vekî, darikê amûran biherikîne jorê</string>
 
     <!-- Library -->
     <!-- Option in Library to open Sessions page -->
@@ -523,15 +526,19 @@
     <!-- Option in library to open Desktop Bookmarks root page -->
     <string name="library_desktop_bookmarks_root">Favoriyên Sermaseyê</string>
     <!-- Option in library to open Desktop Bookmarks "menu" page -->
-    <string name="library_desktop_bookmarks_menu">Menuya Favoriyan</string>
+    <string name="library_desktop_bookmarks_menu">Menûya Favoriyan</string>
     <!-- Option in library to open Desktop Bookmarks "toolbar" page -->
-    <string name="library_desktop_bookmarks_toolbar">Darikê Amûran yê Favoriyan</string>
+    <string name="library_desktop_bookmarks_toolbar">Darikê Amûran ê Favoriyan</string>
     <!-- Option in library to open Desktop Bookmarks "unfiled" page -->
     <string name="library_desktop_bookmarks_unfiled">Favoriyên din</string>
     <!-- Option in Library to open History page -->
     <string name="library_history">Raborî</string>
+    <!-- Option in Library to open a new tab -->
+    <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 hevsengkirî</string>
+    <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 -->
@@ -544,9 +551,9 @@
     <string name="content_description_close_button">Bigire</string>
 
     <!-- Option in library for Recently Closed Tabs -->
-    <string name="library_recently_closed_tabs">Hilpekînên dawiyê hatî girtin</string>
+    <string name="library_recently_closed_tabs">Hilpekînên herî dawî hatine girtin</string>
     <!-- Option in library to open Recently Closed Tabs page -->
-    <string name="recently_closed_show_full_history">Mêjûyê hemû nîşan bide</string>
+    <string name="recently_closed_show_full_history">Raboriyê gişî nişan bide</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 hilpekîn</string>
@@ -555,17 +562,17 @@
     <string name="recently_closed_tab">%d hilpekîn</string>
 
     <!-- Recently closed tabs screen message when there are no recently closed tabs -->
-    <string name="recently_closed_empty_message">Hilpekîna di nêzîk de hatî girtin nîn in</string>
+    <string name="recently_closed_empty_message">Hilpekîna berî niha hatiye girtin tune</string>
 
     <!-- Tab Management -->
     <!-- Title of preference for tabs management -->
     <string name="preferences_tabs">Hilpekîn</string>
     <!-- Title of preference that allows a user to specify the tab view -->
-    <string name="preferences_tab_view">Xuyabûna hilpekînê</string>
+    <string name="preferences_tab_view">Xuyabûna hilpekînan</string>
     <!-- Option for a list tab view -->
     <string name="tab_view_list">Lîste</string>
     <!-- Option for a grid tab view -->
-    <string name="tab_view_grid">Grid</string>
+    <string name="tab_view_grid">Grîd</string>
 
     <!-- Title of preference that allows a user to auto close tabs after a specified amount of time -->
     <string name="preferences_close_tabs">Hilpekînan bigire</string>
@@ -609,7 +616,7 @@
     <!-- Text shown in the menu for sharing all tabs -->
     <string name="tab_tray_menu_item_share">Hemû hilpekînan parve bike</string>
     <!-- Text shown in the menu to view recently closed tabs -->
-    <string name="tab_tray_menu_recently_closed">Hilpekînên dawiyê hatî girtin</string>
+    <string name="tab_tray_menu_recently_closed">Hilpekînên herî dawî hatine girtin</string>
     <!-- Text shown in the menu to view tab settings -->
     <string name="tab_tray_menu_tab_settings">Sazkariyên hilpekînê</string>
     <!-- Text shown in the menu for closing all tabs -->
@@ -627,7 +634,7 @@
     <!-- Content description for tabs tray multiselect share button -->
     <string name="tab_tray_multiselect_share_content_description">Hilpekînên hilbijartî parve bike</string>
     <!-- Content description for tabs tray multiselect menu -->
-    <string name="tab_tray_multiselect_menu_content_description">Menuya hilpekînên hilbijartî</string>
+    <string name="tab_tray_multiselect_menu_content_description">Menûya hilpekînên hilbijartî</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">Hilpekînê ji koleksiyê rake</string>
     <!-- Text for button to enter multiselect mode in tabs tray -->
@@ -691,7 +698,7 @@
     <!-- Text for positive action to delete history in deleting history dialog -->
     <string name="history_clear_dialog">Paqij bike</string>
     <!-- History overflow menu copy button -->
-    <string name="history_menu_copy_button">Kopî</string>
+    <string name="history_menu_copy_button">Kopî bike</string>
     <!-- History overflow menu share button -->
     <string name="history_menu_share_button">Parve bike</string>
     <!-- History overflow menu open in new tab button -->
@@ -762,9 +769,9 @@
 
     <!-- Bookmarks -->
     <!-- Content description for bookmarks library menu -->
-    <string name="bookmark_menu_content_description">Menuya Favoriyan</string>
+    <string name="bookmark_menu_content_description">Menûya favoriyan</string>
     <!-- Screen title for editing bookmarks -->
-    <string name="bookmark_edit">Favoriyan serast bike</string>
+    <string name="bookmark_edit">Favoriyan sererast bike</string>
     <!-- Screen title for selecting a bookmarks folder -->
     <string name="bookmark_select_folder">Peldankê hilbijêre</string>
     <!-- Confirmation message for a dialog confirming if the user wants to delete the selected folder -->
@@ -802,11 +809,11 @@
      The first parameter is the number of bookmarks selected -->
     <string name="bookmarks_multi_select_title">%1$d hatin bijartin</string>
     <!-- Bookmark editing screen title -->
-    <string name="edit_bookmark_fragment_title">Favoriyan serast bike</string>
+    <string name="edit_bookmark_fragment_title">Favoriyan sererast bike</string>
     <!-- Bookmark folder editing screen title -->
     <string name="edit_bookmark_folder_fragment_title">Peldankê sererast bike</string>
     <!-- Bookmark sign in button message -->
-    <string name="bookmark_sign_in_button">Ji bo favoriyan hevsengirî bibînî têkevê</string>
+    <string name="bookmark_sign_in_button">Ji bo favoriyên senkronêzekirî bibînî, têkeve</string>
     <!-- Bookmark URL editing field label -->
     <string name="bookmark_url_label">NAVNÎŞAN</string>
     <!-- Bookmark FOLDER editing field label -->
@@ -842,7 +849,7 @@
     <!-- 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">Rûpela sazkariyên zû</string>
+    <string name="quick_settings_sheet">Rûpela sazkariyên bilez</string>
     <!-- Label that indicates that this option it the recommended one -->
     <string name="phone_feature_recommended">Tê pêşniyarkirin</string>
     <!-- button that allows editing site permissions settings -->
@@ -872,7 +879,7 @@
     <!-- Label that indicates that a permission must be blocked -->
     <string name="preference_option_phone_feature_blocked">Hate astengkirin</string>
     <!-- Label that indicates that a permission must be allowed -->
-    <string name="preference_option_phone_feature_allowed">Destûrgirtî</string>
+    <string name="preference_option_phone_feature_allowed">Destûr hat dayîn</string>
     <!--Label that indicates a permission is by the Android OS-->
     <string name="phone_feature_blocked_by_android">Ji hêla Androidê ve hate astengkirin</string>
     <!-- Preference for showing a list of websites that the default configurations won't apply to them -->
@@ -881,16 +888,22 @@
     <string name="tracking_protection_on">Vekirî</string>
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Girtî</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">Destûrê bide deng û vîdyoyê</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Destûrê bide deng û vîdyoyê</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Deng û vîdyoyê tenê di daneya hucreyî de asteng bike</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">Deng û vîdyo ew ê tenê di  Wi-Fi de bên vekirin</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">Tenê dengan asteng bike</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Tenê dengan asteng bike</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Deng û vîdyoyê asteng bike</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Deng û vîdyoyê asteng bike</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">Vekirî</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
@@ -902,7 +915,7 @@
     <!-- Content description (not visible, for screen readers etc.): Opens the collection menu when pressed -->
     <string name="collection_menu_button_content_description">Menûya koleksiyonê</string>
     <!-- Label to describe what collections are to a new user without any collections -->
-    <string name="no_collections_description2">Tiştên ji te re girîng berhev bike.\nLêgerîn, malper û hilpekînên dixwazî xwe zû bigihînî wan bîne cem hev.</string>
+    <string name="no_collections_description2">Tiştên ku ji te re girîng in berhev bike.\nLêgerîn, malper û hilpekînên ku tu dixwazî xwe zû bigihînî wan bîne cem hev.</string>
     <!-- Title for the "select tabs" step of the collection creator -->
     <string name="create_collection_select_tabs">Hilpekînan hilbijêre</string>
     <!-- Title for the "select collection" step of the collection creator -->
@@ -954,7 +967,7 @@
     <!-- Sub-header in the dialog to share a link to an app from the full list -->
     <string name="share_link_all_apps_subheader">Hemû çalakî</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">Dawiyê hatî bikaranîn</string>
+    <string name="share_link_recent_apps_subheader">Bikaranînên herî dawî</string>
     <!-- An option from the share dialog to sign into sync -->
     <string name="sync_sign_in">Têkeve Sync’ê</string>
     <!-- An option from the share dialog to send link to all other sync devices -->
@@ -966,29 +979,29 @@
     <!-- An option to connect additional devices -->
     <string name="sync_connect_device">Cîhazeke din girê bide</string>
     <!-- The dialog text shown when additional devices are not available -->
-    <string name="sync_connect_device_dialog">Ji bo şandina hilpekînekê herî kêm ji amûreke din têkeve Firefoxê.</string>
+    <string name="sync_connect_device_dialog">Ji bo şandina hilpekînekê, herî kêm ji cîhazeke din têkeve Firefoxê.</string>
     <!-- Confirmation dialog button -->
     <string name="sync_confirmation_button">Min fêm kir</string>
     <!-- Share error message -->
-    <string name="share_error_snackbar">Bi vê amûrê re nayê parvekirin</string>
+    <string name="share_error_snackbar">Bi vê sepanê re nayê parvekirin</string>
     <!-- Add new device screen title -->
     <string name="sync_add_new_device_title">Bişîne cîhazê</string>
 
     <!-- Text for the warning message on the Add new device screen -->
-    <string name="sync_add_new_device_message">Amûra girêdayî nîn e</string>
+    <string name="sync_add_new_device_message">Cîhaza girêdayî tune</string>
 
     <!-- Text for the button to learn about sending tabs -->
-    <string name="sync_add_new_device_learn_button">Derbarê Şandina Hilpekînan de agahiyan bistîne…</string>
+    <string name="sync_add_new_device_learn_button">Derbarê şandina hilpekînan de agahiyan bistîne…</string>
     <!-- Text for the button to connect another device -->
-    <string name="sync_add_new_device_connect_button">Bi amûreke din ve girê bide…</string>
+    <string name="sync_add_new_device_connect_button">Cîhazeke din girê bide…</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">Danişîna gera nepen</string>
+    <string name="notification_pbm_channel_name">Rûniştina gerîna veşartî</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">Hilpekînên nepen jê bibe</string>
+    <string name="notification_pbm_delete_text">Hilpekînên veşartî jê bibe</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">Hilpekînên nepen bigire</string>
+    <string name="notification_pbm_delete_text_2">Hilpekînên veşartî bigire</string>
     <!-- Notification action to open Fenix and resume the current browsing session. -->
     <string name="notification_pbm_action_open">Veke</string>
     <!-- Notification action to delete all current private browsing sessions AND switch to Fenix (bring it to the foreground) -->
@@ -1031,7 +1044,7 @@
     <string name="a11y_dialog_deleted_confirm">Bipejirîne</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">Destûrê bide %1$sê ku %2$sê veke</string>
+    <string name="qr_scanner_confirmation_dialog_message">Destûrê bide %1$s’ê ku %2$s’ê veke</string>
     <!-- QR code scanner prompt dialog positive option to allow navigation to scanned link -->
     <string name="qr_scanner_dialog_positive">BIHÊLE</string>
     <!-- QR code scanner prompt dialog positive option to deny navigation to scanned link -->
@@ -1039,7 +1052,7 @@
     <!-- Tab collection deletion prompt dialog message. Placeholder will be replaced with the collection name -->
     <string name="tab_collection_dialog_message">Tu bi rastî jî dixwazî koleksiyana %1$s’ê were jêbirin?</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">Jêbirina vê hilpekînê dê hemû koleksiyê jê bibe. Kengê bixwazî dikarî koleksiyoneke nû biafirînî.</string>
+    <string name="delete_tab_and_collection_dialog_message">Jêbirina vê hilpekînê dê hemû koleksiyonê jê bibe. Kengî bixwazî dikarî koleksiyoneke nû biafirînî.</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’ê jê bibe?</string>
     <!-- Tab collection deletion prompt dialog option to delete the collection -->
@@ -1051,16 +1064,16 @@
     <!-- Message for copying the URL via long press on the toolbar -->
     <string name="url_copied">URL hate kopîkirin</string>
     <!-- Sample text for accessibility font size -->
-    <string name="accessibility_text_size_sample_text_1">Ev nivîseke nimûneyî ye. Li virê xuya dibe ka gava tu bi vê sazkariyê mezinahiyê biguherînî dê çawa be.</string>
+    <string name="accessibility_text_size_sample_text_1">Ev, nivîsa nimûne ye. Dema ku tu bi vê eyarê mezinbûnê biguherînî dê çawaniya nivîsê li vir xuya bibe.</string>
     <!-- Summary for Accessibility Text Size Scaling Preference -->
-    <string name="preference_accessibility_text_size_summary">Nivîsên li ser malperan mezintir yan biçûktir bike</string>
+    <string name="preference_accessibility_text_size_summary">Nivîsên li ser malperan mezintir an jî biçûktir bike</string>
     <!-- Title for Accessibility Text Size Scaling Preference -->
     <string name="preference_accessibility_font_size_title">Mezinahiya fontê</string>
 
     <!-- Title for Accessibility Text Automatic Size Scaling Preference -->
-    <string name="preference_accessibility_auto_size_2">Lêaîna mezinahiya nivîsan ya xweber</string>
+    <string name="preference_accessibility_auto_size_2">Mezinkirina fontê ya bixweber</string>
     <!-- Summary for Accessibility Text Automatic Size Scaling Preference -->
-    <string name="preference_accessibility_auto_size_summary">Mezinahiya nivîsan dê li gorî sazkariyên Androîda te be. Ji bo mezinahiyê nivîsê li virê biguherînî vê wê betal bike.</string>
+    <string name="preference_accessibility_auto_size_summary">Mezinahiya fontê ew ê li gorî sazkariyên Androida te be. Ji bo mezinahiya fontê li vir biguherînî, vê eyarê betal bike.</string>
 
     <!-- Title for the Delete browsing data preference -->
     <string name="preferences_delete_browsing_data">Daneyên gerînê jê bibe</string>
@@ -1081,11 +1094,11 @@
     <!-- Title for the cookies item in Delete browsing data -->
     <string name="preferences_delete_browsing_data_cookies">Kûkî</string>
     <!-- Subtitle for the cookies item in Delete browsing data -->
-    <string name="preferences_delete_browsing_data_cookies_subtitle">Danişînên li ser gelek malperan dê bên girtin</string>
+    <string name="preferences_delete_browsing_data_cookies_subtitle">Têketinên te yên li ser gelek malperan dê bên girtin</string>
     <!-- Title for the cached images and files item in Delete browsing data -->
-    <string name="preferences_delete_browsing_data_cached_files">Wêne û pelên di pêşbîrê de</string>
+    <string name="preferences_delete_browsing_data_cached_files">Wêne û dosyeyên di pêşbîrê de</string>
     <!-- Subtitle for the cached images and files item in Delete browsing data -->
-    <string name="preferences_delete_browsing_data_cached_files_subtitle">Ciyê depokirinê vala dike</string>
+    <string name="preferences_delete_browsing_data_cached_files_subtitle">Qada depokirinê vala dike</string>
     <!-- Title for the site permissions item in Delete browsing data -->
     <string name="preferences_delete_browsing_data_site_permissions">Destûrên malperan</string>
     <!-- Title for the downloads item in Delete browsing data -->
@@ -1093,25 +1106,25 @@
     <!-- Text for the button to delete browsing data -->
     <string name="preferences_delete_browsing_data_button">Daneyên gerînê jê bibe</string>
     <!-- Title for the Delete browsing data on quit preference -->
-    <string name="preferences_delete_browsing_data_on_quit">Daneyên gerê di dema derketinê de jê bibe</string>
+    <string name="preferences_delete_browsing_data_on_quit">Di derketinê de daneyên gerînê jê bibe</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">Gava tu ji menuya giştî &quot;Derkeve&quot;yê hilbijêrî daneyên gerê xweber paqij dike</string>
+    <string name="preference_summary_delete_browsing_data_on_quit">Gava tu ji menûya giştî &quot;Derkeve&quot;yê hilbijêrî daneyên gerînê xweber paqij dike</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">Gava tu ji menuya giştî \&quot;Derkeve\&quot;yê hilbijêrî daneyên gerê xweber paqij dike</string>
+    <string name="preference_summary_delete_browsing_data_on_quit_2">Gava tu ji menûya giştî \&quot;Derkeve\&quot;yê hilbijêrî daneyên gerînê xweber paqij dike</string>
     <!-- Action item in menu for the Delete browsing data on quit feature -->
     <string name="delete_browsing_data_on_quit_action">Derkeve</string>
 
     <!-- Dialog message to the user asking to delete browsing data. -->
-    <string name="delete_browsing_data_prompt_message">Ev ê hemû daneyên te yên gerê jê bibe</string>
+    <string name="delete_browsing_data_prompt_message">Ev ê hemû daneyên te yên gerînê jê bibe</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 dê daneyên gerê yên hilbijartî jê bibe.</string>
+    <string name="delete_browsing_data_prompt_message_3">%s dê daneyên gerînê yên hilbijartî jê bibe.</string>
     <!-- Text for the cancel button for the data deletion dialog -->
     <string name="delete_browsing_data_prompt_cancel">Betal bike</string>
     <!-- Text for the allow button for the data deletion dialog -->
     <string name="delete_browsing_data_prompt_allow">Jê bibe</string>
 
     <!-- Text for the snackbar confirmation that the data was deleted -->
-    <string name="preferences_delete_browsing_data_snackbar">Daneyên gerînê hate jêbirin</string>
+    <string name="preferences_delete_browsing_data_snackbar">Daneyên gerînê hatin jêbirin</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">Daneyên gerînê tên jêbirin…</string>
 
@@ -1121,28 +1134,28 @@
 
     <!-- text for firefox preview moving tip description -->
     <string name="tip_firefox_preview_moved_description">
-        Firefox Nightly her şev tê nûkirin û tê de taybetiyên nû yên ceribandinê hene.
-        Lê belê, dibe ku hindiktir stabîl be. Ji bo ceribandineke stabîltir geroka me ya beta jêbar bike.</string>
+        Firefox Nightly her şev tê nûvekirin û tê de taybetiyên nû yên ceribandinê hene.
+        Lê belê, dibe ku hindiktir stabîl be. Ji bo ceribandineke stabîltir geroka me ya betayê daxîne.</string>
     <!-- text for firefox preview moving tip button. "Firefox for Android Beta" is intentionally hardcoded -->
-    <string name="tip_firefox_preview_moved_button_2">Firefox Betaya ji bo Andoîdê jêbar bikin</string>
+    <string name="tip_firefox_preview_moved_button_2">Betaya Firefoxê ji bo Androidê daxîne</string>
 
     <!-- text for firefox preview moving tip header. "Firefox Nightly" is intentionally hardcoded -->
-    <string name="tip_firefox_preview_moved_header_preview_installed">Firefox Nightlyê bar kir</string>
+    <string name="tip_firefox_preview_moved_header_preview_installed">Firefox Nightly hat veguhastin</string>
     <!-- text for firefox preview moving tip description -->
     <string name="tip_firefox_preview_moved_description_preview_installed">
-        Ev sepan dê venûkirinên ewlekariyê êdî wernegire. Êdî vê sepanê bi kar neyne û derbasî Nightlya nû bibe.
-        \ n \ nJi bo transferkirina favorî, têketin û mêjûya xwe bo sepaneke din, hesabekî Firefoxê biafirîne.</string>
+        Ev sepan ew ê êdî nûvekirinên ewlekariyê wernegire. Êdî vê sepanê bi kar neyîne û derbasî Nightlya nû bibe.
+        \ n \ nJi bo transferkirina favorî, hesab û raboriya xwe li sepaneke din, hesabekî Firefoxê biafirîne.</string>
     <!-- text for firefox preview moving tip button  -->
     <string name="tip_firefox_preview_moved_button_preview_installed">Derbasî Nightlya nû bibe</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ê bar kir</string>
+    <string name="tip_firefox_preview_moved_header_preview_not_installed">Firefox Nightly hat veguhastin</string>
     <!-- text for firefox preview moving tip description -->
     <string name="tip_firefox_preview_moved_description_preview_not_installed">
-        Ev sepan dê venûkirinên ewlekariyê êdî wernegire. Êdî vê sepanê bi kar neyne û derbasî Nightlya nû bibe.
-        \ n \ nJi bo transferkirina favorî, têketin û mêjûya xwe bo sepaneke din, hesabekî Firefoxê biafirîne.</string>
+        Ev sepan ew ê êdî nûvekirinên ewlekariyê wernegire. Êdî vê sepanê bi kar neyîne û derbasî Nightlya nû bibe.
+        \ n \ nJi bo transferkirina favorî, hesab û raboriya xwe li sepaneke din, hesabekî Firefoxê biafirîne.</string>
     <!-- text for firefox preview moving tip button  -->
-    <string name="tip_firefox_preview_moved_button_preview_not_installed">Nightlya nû jêbar bike</string>
+    <string name="tip_firefox_preview_moved_button_preview_not_installed">Nightlya nû daxîne</string>
 
     <!-- Onboarding -->
     <!-- Text for onboarding welcome message
@@ -1157,17 +1170,17 @@
     <string name="onboarding_whats_new_header1">Tiştên nû bibîne</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">Pirsên te derbarê %sa nû de hene? Dixwazî bizanî ka çi guheriye?</string>
+    <string name="onboarding_whats_new_description">Pirsên te derbarê %s’ê ya nû de hene? Dixwazî bizanî ka çi guheriye?</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">Bersiv li vir in</string>
     <!-- text for the Firefox account onboarding sign in card header -->
-    <string name="onboarding_account_sign_in_header">Bi hesabê xwe yê Firefoxê dest bi hevsengkirina favoriyan, şîfreyan û zêdetir tiştên xwe bike.</string>
+    <string name="onboarding_account_sign_in_header">Bi hesabê xwe yê Firefoxê dest bi senkronîzekirina favoriyan, pêborînan û zêdetirî wan, bike.</string>
     <!-- Text for the button to learn more about signing in to your Firefox account -->
     <string name="onboarding_manual_sign_in_learn_more">Zêdetir bizane</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">Te li ser vê amûrê wekî %s li ser gerokeke din a Firefoxê têketin pêk anî. Tu dixwazî bi vî hesabî têkeviyê?</string>
+    <string name="onboarding_firefox_account_auto_signin_header_3">Tu li ser vê cîhazê di gerokeke din a Firefoxê de wekî %s têketî yê. Tu dixwazî bi vî hesabî têkevî?</string>
     <!-- text for the button to confirm automatic sign-in -->
     <string name="onboarding_firefox_account_auto_signin_confirm">Erê, têkeve</string>
     <!-- text for the automatic sign-in button while signing in is in process -->
@@ -1184,30 +1197,30 @@
     <string name="onboarding_tracking_protection_header_2">Nihêniya otomatîk</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">Sazkariyên nepeniyê û ewlekariyê şopîneran û sepanên niyetxirab û şirketên dixwazin te bişopînin asteng dike.</string>
+    <string name="onboarding_tracking_protection_description_2">Sazkariyên nihênî û ewlekariyê şopîneran û sepanên niyetxerab û şirketênku  dixwazin te bişopînin asteng dike.</string>
     <!-- text for tracking protection radio button option for standard level of blocking -->
     <string name="onboarding_tracking_protection_standard_button_2">Standard (jixweber)</string>
     <!-- text for standard blocking option button description -->
-    <string name="onboarding_tracking_protection_standard_button_description_2">Hindiktir şopîneran asteng dike. Rûpel dê bi awayê asayî bên barkirin.</string>
+    <string name="onboarding_tracking_protection_standard_button_description_2">Hindiktir şopîneran asteng dike. Rûpel ew ê bi awayê normal vebin.</string>
     <!-- text for tracking protection radio button option for strict level of blocking -->
     <string name="onboarding_tracking_protection_strict_button">Tund (tê pêşniyarkirin)</string>
     <!-- text for tracking protection radio button option for strict level of blocking -->
     <string name="onboarding_tracking_protection_strict_option">Tund</string>
     <!-- text for strict blocking option button description -->
-    <string name="onboarding_tracking_protection_strict_button_description_2">Zêdetir şopîneran, reklaman û popupan asteng dike. Rûpel zûtir vedibin, lê dibe ku hin taybetî nexebitin.</string>
+    <string name="onboarding_tracking_protection_strict_button_description_2">Zêdetir şopîneran, reklaman û pencereyên vebûnok asteng dike. Rûpel zûtir vedibin, lê dibe ku hin taybetî nexebitin.</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">Aliyê xwe hilbijêre</string>
     <!-- text for the toolbar position card description -->
-    <string name="onboarding_toolbar_position_description">Bi darikê amûran yê li xwarê gera bi destekî biceribîne yan jî wê bibe jorê.</string>
+    <string name="onboarding_toolbar_position_description">Darikê amûran ê jêrîn bi destekî biceribîne an jî wê bibe jorê tu bi kêfa xwe yî.</string>
     <!-- text for the private browsing onboarding card header -->
-    <string name="onboarding_private_browsing_header">Bi nepenî bigere</string>
+    <string name="onboarding_private_browsing_header">Bi nihênî bigere</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">Carekê hilpekîneke nepen veke: Pêl îkona %sê bike.</string>
+    <string name="onboarding_private_browsing_description1">Ji bo carekê hilpekîneke veşartî veke: Li îkona %s’ê bitikîne.</string>
     <!-- text for the private browsing onboarding card description, explaining how to always using private browsing -->
-    <string name="onboarding_private_browsing_always_description">Her car hilpekînên nepen veke: Sazkariyên xwe yên gera nepen venû bike.</string>
+    <string name="onboarding_private_browsing_always_description">Her carê hilpekînên veşartî veke: Sazkariyên xwe yên gerîna veşartî nûve bike.</string>
     <!-- text for the private browsing onbording card button, that launches settings -->
     <string name="onboarding_private_browsing_button">Sazkariyan veke</string>
     <!-- text for the privacy notice onboarding card header -->
@@ -1227,11 +1240,11 @@
     <!-- text for the theme picker onboarding card header -->
     <string name="onboarding_theme_picker_header">Rûkara xwe hilbijêre</string>
     <!-- text for the theme picker onboarding card description -->
-    <string name="onboarding_theme_picker_description1">Bi çalakkirina moda tarî him ji bataryayê teseruf bike him çavên xwe vehesîne.</string>
+    <string name="onboarding_theme_picker_description1">Bi çalakkirina moda tarî him ji bataryayê teserûf bike him jî çavên xwe rehet bike.</string>
     <!-- Automatic theme setting (will follow device setting) -->
     <string name="onboarding_theme_automatic_title">Otomatîk</string>
     <!-- Summary of automatic theme setting (will follow device setting) -->
-    <string name="onboarding_theme_automatic_summary">Xwe li sazkariyên amûra te tîne</string>
+    <string name="onboarding_theme_automatic_summary">Xwe li sazkariyên cîhaza te adabte dike</string>
     <!-- Theme setting for dark mode -->
     <string name="onboarding_theme_dark_title">Rûkara tarî</string>
     <!-- Theme setting for light mode -->
@@ -1246,71 +1259,71 @@
     <!-- Text shown in snackbar for the "retry" action that the user has after sharing tabs failed -->
     <string name="sync_sent_tab_error_snackbar_action">DÎSA BICERIBÎNE</string>
     <!-- Title of QR Pairing Fragment -->
-    <string name="sync_scan_code">Kodê sken bike</string>
+    <string name="sync_scan_code">Kodê bide xwendin</string>
     <!-- Instructions on how to access pairing -->
-    <string name="sign_in_instructions"><![CDATA[Firefoxê ji ser komputera xwe veke û here ser rûpela <b>https://firefox.com/pair</b>]]></string>
+    <string name="sign_in_instructions"><![CDATA[Firefoxê ji ser kombersa xwe veke û here ser rûpela <b>https://firefox.com/pair</b>]]></string>
     <!-- Text shown for sign in pairing when ready -->
-    <string name="sign_in_ready_for_scan">Ji bo skenkirinê amade me</string>
+    <string name="sign_in_ready_for_scan">Aniha kodê bide xwendin</string>
     <!-- Text shown for settings option for sign with pairing -->
-    <string name="sign_in_with_camera">Bi kameraya xwe têkevê</string>
+    <string name="sign_in_with_camera">Bi kameraya xwe têkeve</string>
     <!-- Text shown for settings option for sign with email -->
-    <string name="sign_in_with_email">Bi e-peyamê têkevê</string>
+    <string name="sign_in_with_email">Bi emaîlê têkeve</string>
     <!-- Text shown for settings option for create new account text.'Firefox' intentionally hardcoded here.-->
-    <string name="sign_in_create_account_text"><![CDATA[Hesabê te tune ye? <u>Yekê biafirîne</u> ku Firefoxê di navbera amûran de hevseng bikî.]]></string>
+    <string name="sign_in_create_account_text"><![CDATA[Hesabê te tune ye? Ji bo ku Firefoxê di navbera cîhazan de senkronîze bikî <u>Hesêb veke</u>.]]></string>
     <!-- Text shown in confirmation dialog to sign out of account -->
-    <string name="sign_out_confirmation_message">Firefox dê hevsengkirina bi hesabê te re asteng bike, lê dê daneyên te yên gerê yên li ser vê amûrê jê nebe.</string>
+    <string name="sign_out_confirmation_message">Firefox dê bi hesabê te re senkronîzekirinê rawestîne, lê ti daneyên te yên gerînê yên di vê cîhazê de nayên jêbirin.</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 dê hevsengkirina bi hesabê te re asteng bike, lê dê daneyên te yên gerê yên li ser vê amûrê jê nebe.</string>
+    <string name="sign_out_confirmation_message_2">%s ew ê bi hesabê te re senkronîzekirinê rawestîne, lê ti daneyên te yên gerînê yên di vê cîhazê de nayên jêbirin.</string>
     <!-- Option to continue signing out of account shown in confirmation dialog to sign out of account -->
     <string name="sign_out_disconnect">Girêdanê qut bike</string>
     <!-- Option to cancel signing out shown in confirmation dialog to sign out of account -->
     <string name="sign_out_cancel">Betal bike</string>
 
     <!-- Error message snackbar shown after the user tried to select a default folder which cannot be altered -->
-    <string name="bookmark_cannot_edit_root">Peldankên standard nayên serastkirin</string>
+    <string name="bookmark_cannot_edit_root">Peldankên standard nayên sererastkirin</string>
 
     <!-- Enhanced Tracking Protection -->
     <!-- Link displayed in enhanced tracking protection panel to access tracking protection settings -->
     <string name="etp_settings">Sazkariyên parastinê</string>
     <!-- Preference title for enhanced tracking protection settings -->
-    <string name="preference_enhanced_tracking_protection">Parastina şopandinê ya pêşketî</string>
+    <string name="preference_enhanced_tracking_protection">Parastina ji şopandinê ya pêşketî</string>
     <!-- Title for the description of enhanced tracking protection -->
-    <string name="preference_enhanced_tracking_protection_explanation_title">Bêyî ku bêtî şopandin bigere</string>
+    <string name="preference_enhanced_tracking_protection_explanation_title">Bêyî ku tu werî şopandin bigere</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">Bila daneyên te ji te re bimînin. %s te ji piraniya şopîneran diparêze ku tiştên tu li ser înternetê dikî dişopînin.</string>
+    <string name="preference_enhanced_tracking_protection_explanation">Bila daneyên te ji te re bimînin. %s te ji gelek şopdarên dilxerab diparêze û nahêle tiştên ku tu li ser înternetê dikî ji aliyê wan ve bên dîtin.</string>
     <!-- Text displayed that links to website about enhanced tracking protection -->
     <string name="preference_enhanced_tracking_protection_explanation_learn_more">Zêdetir bizane</string>
     <!-- Preference for enhanced tracking protection for the standard protection settings -->
     <string name="preference_enhanced_tracking_protection_standard_default_1">Standard (heyî)</string>
     <!-- Preference description for enhanced tracking protection for the standard protection settings -->
-    <string name="preference_enhanced_tracking_protection_standard_description_3">Hindiktir şopîneran asteng bike. Rûpel dê asayî vebin.</string>
+    <string name="preference_enhanced_tracking_protection_standard_description_3">Hindiktir şopîneran asteng dike. Rûpel ew ê bi awayê normal vebin.</string>
     <!--  Accessibility text for the Standard protection information icon  -->
-    <string name="preference_enhanced_tracking_protection_standard_info_button">Bi parastina şopandinê ya standard çi tên astengkirin?</string>
+    <string name="preference_enhanced_tracking_protection_standard_info_button">Bi parastina ji şopandinê ya standard çi tên astengkirin?</string>
     <!-- Preference for enhanced tracking protection for the strict protection settings -->
     <string name="preference_enhanced_tracking_protection_strict">Tund</string>
     <!-- Preference description for enhanced tracking protection for the strict protection settings -->
-    <string name="preference_enhanced_tracking_protection_strict_description_2">Zêdetir şopîneran, reklaman û popupan asteng dike. Rûpel zûtir tên barkirin, lê dibe ku hin taybetî nexebitin.</string>
+    <string name="preference_enhanced_tracking_protection_strict_description_2">Zêdetir şopîneran, reklaman û pencereyên vebûnok asteng dike. Rûpel zûtir vedibin, lê dibe ku hin taybetî nexebitin.</string>
     <!--  Accessibility text for the Strict protection information icon  -->
-    <string name="preference_enhanced_tracking_protection_strict_info_button">Bi parastina şopandinê ya tund çi tên astengkirin?</string>
+    <string name="preference_enhanced_tracking_protection_strict_info_button">Bi parastina ji şopandinê ya tund çi tên astengkirin?</string>
     <!-- Preference for enhanced tracking protection for the custom protection settings -->
     <string name="preference_enhanced_tracking_protection_custom">Taybet</string>
     <!-- Preference description for enhanced tracking protection for the strict protection settings -->
-    <string name="preference_enhanced_tracking_protection_custom_description_2">Hilbijêre ka kîjan şopîner û skrîpt bên astengkirin.</string>
+    <string name="preference_enhanced_tracking_protection_custom_description_2">Hilbijêre ka kîjan şopdar û skrîpt ew ê bêne astengkirin.</string>
     <!--  Accessibility text for the Strict protection information icon  -->
-    <string name="preference_enhanced_tracking_protection_custom_info_button">Bi parastina şopandina taybet çi tên astengkirin?</string>
+    <string name="preference_enhanced_tracking_protection_custom_info_button">Bi parastina ji şopandinê ya taybet çi tên astengkirin?</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">Kûkî</string>
     <!-- Option for enhanced tracking protection for the custom protection settings for cookies-->
     <string name="preference_enhanced_tracking_protection_custom_cookies_1">Şopînerên nav-malperî û şopînerên medyaya civakî</string>
     <!-- Option for enhanced tracking protection for the custom protection settings for cookies-->
-    <string name="preference_enhanced_tracking_protection_custom_cookies_2">Çerezên malperên nehatine bikaranîn</string>
+    <string name="preference_enhanced_tracking_protection_custom_cookies_2">Çerezên ji malperên ku nehatine ziyaretkirin</string>
     <!-- Option for enhanced tracking protection for the custom protection settings for cookies-->
-    <string name="preference_enhanced_tracking_protection_custom_cookies_3">Hemû çerezên partiya sêyemîn (dibe ku hin malper xira bibin)</string>
+    <string name="preference_enhanced_tracking_protection_custom_cookies_3">Hemû çerezên partiya sêyemîn (dibe ku hin malper xera bibin)</string>
     <!-- Option for enhanced tracking protection for the custom protection settings for cookies-->
-    <string name="preference_enhanced_tracking_protection_custom_cookies_4">Hemû çerezan (dibe ku hin malper xira bibin)</string>
+    <string name="preference_enhanced_tracking_protection_custom_cookies_4">Hemû çerez (dibe ku hin malper xera bibin)</string>
     <!-- Preference for enhanced tracking protection for the custom protection settings for tracking content -->
-    <string name="preference_enhanced_tracking_protection_custom_tracking_content">Naverokên şopandinê</string>
+    <string name="preference_enhanced_tracking_protection_custom_tracking_content">Naverokên ji bo şopandinê</string>
     <!-- Option for enhanced tracking protection for the custom protection settings for tracking content-->
     <string name="preference_enhanced_tracking_protection_custom_tracking_content_1">Di hemû hilpekînan de</string>
     <!-- Option for enhanced tracking protection for the custom protection settings for tracking content-->
@@ -1321,7 +1334,7 @@
     <string name="preference_enhanced_tracking_protection_custom_cryptominers">Kankerên krîpto</string>
     <!-- Preference for enhanced tracking protection for the custom protection settings -->
     <string name="preference_enhanced_tracking_protection_custom_fingerprinters">Berhevkarên şoptiliyan</string>
-    <string name="enhanced_tracking_protection_blocked">Astengker</string>
+    <string name="enhanced_tracking_protection_blocked">Yên astengbûyî</string>
     <!-- Header for categories that are being not being blocked by current Enhanced Tracking Protection settings -->
     <string name="enhanced_tracking_protection_allowed">Destûrgirtî</string>
     <!-- Category of trackers (social media trackers) that can be blocked by Enhanced Tracking Protection -->
@@ -1341,32 +1354,30 @@
     <!-- Category of trackers (tracking content) that can be blocked by Enhanced Tracking Protection -->
     <string name="etp_tracking_content_title">Naverokên şopandinê</string>
     <!-- Description of tracking content that can be blocked by Enhanced Tracking Protection -->
-    <string name="etp_tracking_content_description">Barkirina reklam, vidyo û naverokên din yên tê de koda şopandin heye asteng dike. Dibe ku bandorê li taybetiyên hin malperan bike.</string>
+    <string name="etp_tracking_content_description">Nahêle reklam, vîdyo û naverokên din ên tê de koda şopandinê hene bên barkirin. Dibe ku bandorê li taybetiyên hin malperan bike.</string>
     <!-- Enhanced Tracking Protection Onboarding Message shown in a dialog above the toolbar. The first parameter is the name of the application (For example: Fenix) -->
-    <string name="etp_onboarding_cfr_message">Gava mertal bû rengê mor, nexwe %sê şopîner asteng kirine. Ji bo agahiyên zêdetir bipelîne.</string>
+    <string name="etp_onboarding_cfr_message">Gava mertal bû rengê mor, tê vê wateyê ku %s’ê şopîner asteng kirine. Ji bo agahiyên zêdetir, bitepîne.</string>
     <!-- Enhanced Tracking Protection message that protection is currently on for this site -->
-    <string name="etp_panel_on">Parastin ji bo v malperê VEKIRÎ ne.</string>
+    <string name="etp_panel_on">Parastin ji bo vê malperê VEKIRÎ ne.</string>
     <!-- Enhanced Tracking Protection message that protection is currently off for this site -->
     <string name="etp_panel_off">Parastin ji bo vê malperê GIRTÎ ne</string>
     <!-- Header for exceptions list for which sites enhanced tracking protection is always off -->
-    <string name="enhanced_tracking_protection_exceptions">Parastina şopandinê ya pêşketî ji bo van malperan hat girtin</string>
+    <string name="enhanced_tracking_protection_exceptions">Parastina ji şopandinê ya pêşketî ji bo van malperan hat girtin</string>
     <!-- Content description (not visible, for screen readers etc.): Navigate
     back from ETP details (Ex: Tracking content) -->
     <string name="etp_back_button_content_description">Paşve here</string>
     <!-- About page Your rights link text -->
     <string name="about_your_rights">Mafên te</string>
     <!-- About page link text to open open source licenses screen -->
-    <string name="about_open_source_licenses">Pirtûkxaneyên çavkaniya azad yên em bi kar tînin</string>
+    <string name="about_open_source_licenses">Pirtûkxaneyên çavkaniya azad ên em bi kar tînin</string>
     <!-- About page link text to open what's new link -->
-    <string name="about_whats_new">Di %s çi tiştên nû hene?</string>
+    <string name="about_whats_new">Di %s’ê de çi tiştên nû hene?</string>
     <!-- Open source licenses page title
     The first parameter is the app name -->
     <string name="open_source_licenses_title">%s | Pirtûkxaneyên OSS’ê</string>
 
     <!-- Category of trackers (redirect trackers) that can be blocked by Enhanced Tracking Protection -->
     <string name="etp_redirect_trackers_title">Şoînerên beralîkirinê</string>
-    <!-- Description of redirect tracker cookies that can be blocked by Enhanced Tracking Protection -->
-    <string name="etp_redirect_trackers_description">Çerezên aîdî beralîkirinên ji bo malperên şopandinê yên naskirî asteng dike.</string>
 
     <!-- About page link text to open support link -->
     <string name="about_support">Piştgirî</string>
@@ -1380,12 +1391,12 @@
     <!-- About page link text to open licensing information link -->
     <string name="about_licensing_information">Agahiyên lîsanskirinê</string>
     <!-- About page link text to open a screen with libraries that are used -->
-    <string name="about_other_open_source_libraries">Pirtûkxaneyên em bikar tînin</string>
+    <string name="about_other_open_source_libraries">Pirtûkxaneyên em bi kar tînin</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">Menuya neqandina çewtiyan: Ji bo çalakkirinê %1$d tikandin man</string>
+    <string name="about_debug_menu_toast_progress">Menûya neqandina çewtiyan: Ji bo çalakkirinê %1$d tikandin man</string>
 
-    <string name="about_debug_menu_toast_done">Menuya neqandina çewtiyan hat çalakkirin</string>
+    <string name="about_debug_menu_toast_done">Menûya neqandina çewtiyan çalek e</string>
 
     <!-- Content description of the tab counter toolbar button when one tab is open -->
     <string name="tab_counter_content_description_one_tab">1 hilpekîn</string>
@@ -1414,7 +1425,7 @@
     <string name="add_to_homescreen_text_placeholder">Navê kurterêyê</string>
 
     <!-- Describes the add to homescreen functionality -->
-    <string name="add_to_homescreen_description_2">Tu dikarî vê malperê bi hêsanî li ekrana Serûpela amûra xwe zêde bikî ku zû bigihiyê û wê wekî sepanekê bi kar bînî.</string>
+    <string name="add_to_homescreen_description_2">Tu dikarî vê malperê bi hêsanî li ekrana Destpêkê ya cîhaza xwe zêde bikî ku ji wir zûtir bigihîjî wê û wê wekî sepanekê bi kar bînî.</string>
 
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Hesab û pêborîn</string>
@@ -1439,15 +1450,15 @@
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Hesabên tomarkirî</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">Têketinên te tomar kirine yan hevsengkirinên bi %sê re dê li virê bên nîşandan.</string>
+    <string name="preferences_passwords_saved_logins_description_empty_text">Hesabên ku te tomar kirine yan jî te bi %s’ê re senkronîze kirine dê li vir bên nîşandan.</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Derbarê Sync’ê de agahî bistîne.</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions">Istisna</string>
     <!-- Empty description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description_empty">Têketin û şîfreyên nehatine tomarkirin dê li virê bên nîşandan.</string>
+    <string name="preferences_passwords_exceptions_description_empty">Hesab û pêborînên nehatine tomarkirin dê li vir bên nîşandan.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
-    <string name="preferences_passwords_exceptions_description">Têketin û şîfre dê ji bo van malperan neyên tomarkirin.</string>
+    <string name="preferences_passwords_exceptions_description">Hesab û pêborîn dê ji bo van malperan neyên tomarkirin.</string>
     <!-- Text on button to remove all saved login exceptions -->
     <string name="preferences_passwords_exceptions_remove_all">Hemû istisnayan jê bibe</string>
     <!-- Hint for search box in logins list -->
@@ -1455,7 +1466,7 @@
     <!-- Option to sort logins list A-Z, alphabetically -->
     <string name="preferences_passwords_saved_logins_alphabetically">Alfabetîkî</string>
     <!-- Option to sort logins list by most recently used -->
-    <string name="preferences_passwords_saved_logins_recently_used">Dawiyê hatî bikaranîn</string>
+    <string name="preferences_passwords_saved_logins_recently_used">Bikaranînên herî dawî</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">Malper</string>
     <!-- The header for the username for a login -->
@@ -1465,9 +1476,9 @@
     <!-- Message displayed in security prompt to reenter a secret pin to access saved logins -->
     <string name="preferences_passwords_saved_logins_enter_pin">PIN’a xwe dîsa binivîse</string>
     <!-- Message displayed in security prompt to access saved logins -->
-    <string name="preferences_passwords_saved_logins_enter_pin_description">Ji bo têketinên xwe yên tomarkirî bibînî kilîdê veke</string>
+    <string name="preferences_passwords_saved_logins_enter_pin_description">Ji bo hesabên xwe yên tomarkirî bibînî, kilîdê veke</string>
     <!-- Message displayed when a connection is insecure and we detect the user is entering a password -->
-    <string name="logins_insecure_connection_warning">Ev girêdan ne ewle ye. Îhtîmal heye têketinên li virê bên bidestxistin.</string>
+    <string name="logins_insecure_connection_warning">Ev girêdan ne ewle ye. Îhtîmal heye agahiyên hesêb ên li vir hatine nivîsîn bên bidestxistin.</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">Zêdetir bizane</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)  -->
@@ -1516,7 +1527,7 @@
     <string name="saved_logins_sort_strategy_last_used">Bikaranîna dawî</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">Menuya rêzkirina têketinan</string>
+    <string name="saved_logins_menu_dropdown_chevron_icon_content_description">Menûya rêzkirina hesaban</string>
 
     <!-- Title of the Add search engine screen -->
     <string name="search_engine_add_custom_search_engine_title">Motora lêgerînê tevlî bike</string>
@@ -1537,9 +1548,9 @@
     <!-- Placeholder text shown in the Search Engine Name TextField before a user enters text -->
     <string name="search_add_custom_engine_name_hint">Nav</string>
     <!-- Placeholder text shown in the Search String TextField before a user enters text -->
-    <string name="search_add_custom_engine_search_string_hint">Rêzeya lêgerînê ya ji bo bikaranînê</string>
+    <string name="search_add_custom_engine_search_string_hint">Rêzika lêgerînê ya ji bo bikaranînê</string>
     <!-- Description text for the Search String TextField. The %s is part of the string -->
-    <string name="search_add_custom_engine_search_string_example">Daxwazê bi “%s”. Mînak:\nhttps://www.google.com/search?q=%sê biguherîne</string>
+    <string name="search_add_custom_engine_search_string_example">Lêpirsînê bi “%s”ê pev biguherîne. Mînak:\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">Zêdetir Bizane</string>
 
@@ -1553,11 +1564,11 @@
     <!-- Text shown when a user tries to add a search engine that already exists -->
     <string name="search_add_custom_engine_error_existing_name">Motora lêgerînê ya bi navê “%s” jixwe heye.</string>
     <!-- Text shown when a user leaves the search string field empty -->
-    <string name="search_add_custom_engine_error_empty_search_string">Rêzikeek lêgerînê binivîse</string>
+    <string name="search_add_custom_engine_error_empty_search_string">Rêzikeke lêgerînê binivîse</string>
     <!-- Text shown when a user leaves out the required template string -->
-    <string name="search_add_custom_engine_error_missing_template">Kontrol bike ka rêzika lêgerînê û formata Mînak li hev dikin yan na</string>
+    <string name="search_add_custom_engine_error_missing_template">Kontrol bike ka rêzika lêgerînê û formata nimûne li hev dikin an na</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">Êewtiya girêdana bi  “%s”ê ve</string>
+    <string name="search_add_custom_engine_error_cannot_reach">Li “%s”ê ve nehate girêdan</string>
     <!-- Text shown when a user creates a new search engine -->
     <string name="search_add_custom_engine_success_message">%s hat afirandin</string>
     <!-- Text shown when a user successfully edits a custom search engine -->
@@ -1566,13 +1577,13 @@
     <string name="search_delete_search_engine_success_message">%s hat jêbirin</string>
 
     <!-- Title text shown for the migration screen to the new browser. Placeholder replaced with app name -->
-    <string name="migration_title">Bi xêr hatî geroka %sê ya nipînû</string>
+    <string name="migration_title">Bi xêr hatî geroka %s’ê ya nipînû</string>
     <!-- Description text followed by a list of things migrating (e.g. Bookmarks, History). Placeholder replaced with app name-->
     <string name="migration_description">Me geroka te bi performans û taybetiyên pêşxistî ji serî heta binî nû kir ku tu dikarî li ser înternetê tiştên zêdetir bikî.\n\nTika ye heta %sê van venû bike li bendê bin...</string>
     <!-- Text on the disabled button while in progress. Placeholder replaced with app name -->
     <string name="migration_updating_app_button_text">%s tê nûvekirin…</string>
     <!-- Text on the enabled button. Placeholder replaced with app name-->
-    <string name="migration_update_app_button">%sê bide destpêkirin</string>
+    <string name="migration_update_app_button">%s’ê bide destpêkirin</string>
     <!-- Accessibility description text for a completed migration item -->
     <string name="migration_icon_description">Veguhestin qediya</string>
     <!--Text on list of migrated items (e.g. Settings, History, etc.)-->
@@ -1583,24 +1594,24 @@
     <!-- First step for the allowing a permission -->
     <string name="phone_feature_blocked_step_settings">1. Here sazkariyên Androidê</string>
     <!-- Second step for the allowing a permission -->
-    <string name="phone_feature_blocked_step_permissions"><![CDATA[2. Li <b>Destûr</b>ê bitikîne]]></string>
+    <string name="phone_feature_blocked_step_permissions"><![CDATA[2. Li <b>Destûr</b>’ê bitikîne]]></string>
     <!-- Third step for the allowing a permission (Fore example: Camera) -->
-    <string name="phone_feature_blocked_step_feature"><![CDATA[3. Rewşa <b>%1$s</b>ê bike VEKIRÎ]]></string>
+    <string name="phone_feature_blocked_step_feature"><![CDATA[3. Eyara <b>%1$s</b>’yê bike VEKIRÎ]]></string>
 
     <!-- Label that indicates a site is using a secure connection -->
     <string name="quick_settings_sheet_secure_connection">Girêdana ewle</string>
     <!-- Label that indicates a site is using a insecure connection -->
     <string name="quick_settings_sheet_insecure_connection">Girêdana neewle</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">Tu ji dil dizanî hemû destûrên li ser hemû malperan jê bibî?</string>
+    <string name="confirm_clear_permissions_on_all_sites">Tu ji dil dixwazî hemû destûrên li ser hemû malperan jê bibî?</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">Tu ji dil dizanî hemû destûran ji bo hemû malperan jê bibî?</string>
+    <string name="confirm_clear_permissions_site">Tu ji dil dixwazî hemû destûran ji bo vê malperê jê bibî?</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">Tu ji dil dixwazî vê destûrê ji bo vê malperê jê bibî?</string>
     <!-- label shown when there are not site exceptions to show in the site exception settings -->
     <string name="no_site_exceptions">Istisnayên malperê tune</string>
     <!-- Label for the Pocket default top site -->
-    <string name="pocket_top_articles">Gotarên Serekî</string>
+    <string name="pocket_top_articles">Gotarên serekî</string>
     <!-- Bookmark deletion confirmation -->
     <string name="bookmark_deletion_confirmation">Tu ji dil dixwazî vê favoriyê jê bibî?</string>
     <!-- Browser menu button that adds a top site to the home fragment -->
@@ -1622,9 +1633,9 @@
     <!--  The editable text field for a login's web address. -->
     <string name="saved_login_hostname_description">Qada nivîsê ya ji bo navnîşana webê ya têketinê</string>
     <!--  The editable text field for a login's username. -->
-    <string name="saved_login_username_description">Qada nivîsê ya ji bo navê bikarhêneriyê ya têketinê.</string>
+    <string name="saved_login_username_description">Qada nivîsê ya ji bo navê bikarhêneriyê yê têketinê.</string>
     <!--  The editable text field for a login's password. -->
-    <string name="saved_login_password_description">Qada nivîsê ya ji bo şîfreya têketinê.</string>
+    <string name="saved_login_password_description">Qada nivîsê ya ji bo pêborîna têketinê.</string>
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">Guhertinan li hesêb tomar bike.</string>
     <!--  The button description to discard changes to an edited login. -->
@@ -1648,9 +1659,9 @@
     <!-- Text displayed when user has disabled tab syncing in Firefox Sync Account -->
     <string name="synced_tabs_enable_tab_syncing">Ji kerema xwe, senkronîzekirina hilpekînê veke.</string>
     <!-- Text displayed when user has no tabs that have been synced -->
-    <string name="synced_tabs_no_tabs">Li ser amûrên din ti hilpekîneke di Firefoxê de vekirî tune ye.</string>
+    <string name="synced_tabs_no_tabs">Di Firefoxên li ser cîhazên te yên din de ti hilpekîneke vekirî tune ye.</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">Lîsteyeke hilpekînan ya ji amûrên xwe yên din bibîne.</string>
+    <string name="synced_tabs_sign_in_message">Lîsteyeke hilpekînan a ji cîhazên xwe yên din bibîne.</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">Têkeve Sync’ê</string>
     <!-- The text displayed when a synced device has no tabs to show in the list of Synced Tabs. -->
@@ -1661,7 +1672,7 @@
     <string name="top_sites_max_limit_title">Gihîşte sînorê malperên sereke</string>
 
     <!-- Content description text displayed in the dialog when top sites limit is reached. -->
-    <string name="top_sites_max_limit_content_2">Ji bo malpereke din a sereke lê zêde bikî, yekê jê bibe. Li malperê bitikîne û li ser bihêle piştre rakirinê hilbijêre.</string>
+    <string name="top_sites_max_limit_content_2">Ji bo malpereke din a sereke lê zêde bikî, yekê jê bibe. Li malperê bitikîne û li ser bihêle, piştre rakirinê hilbijêre.</string>
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">Baş e</string>
     <!-- Label for the show most visited sites preference -->
@@ -1680,7 +1691,7 @@
 
     <!-- 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 %sa xwe fêdeya herî zêde bibînin.</string>
+    <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>
@@ -1688,7 +1699,7 @@
     <!-- 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 wekî hev bi hev re bike kom da ku paşê xwe zû bigihîniyê.</string>
+    <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 ya Firefoxê de wekî %s têketiyê. Tu dixwazî bi vî hesabî têkeviyê?</string>
+    <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>
     </resources>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 33f8833f0..2f9430747 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -190,6 +190,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>
     <!-- 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>
@@ -227,6 +229,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>
@@ -911,16 +918,22 @@
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">꺼짐</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">오디오 및 비디오 허용</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 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">오디오만 차단</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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 -->
@@ -1480,7 +1493,7 @@
     <!-- 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>
+    <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 -->
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 7a58543c2..5b547d35e 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -180,6 +180,8 @@
     <!-- Browser menu button to configure reader mode appearance e.g. the used font type and size -->
     <string name="browser_menu_read_appearance">Išvaizda</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">Tinkinti skaitymo rodinį</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">Nepavyko prisijungti. Neatpažįstama URL schema.</string>
@@ -216,6 +218,11 @@
     <!-- Search suggestion onboarding hint Learn more link text -->
     <string name="search_suggestions_onboarding_learn_more_link">Sužinoti daugiau</string>
 
+    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <string name="search_engine_suggestions_title">Ieškoti „%s“</string>
+    <!-- Search engine suggestion description text -->
+    <string name="search_engine_suggestions_description">Ieškokite tiesiai iš adreso lauko</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
     <string name="search_widget_content_description">Atverti naują „Firefox“ kortelę</string>
@@ -607,6 +614,8 @@
     <string name="tab_tray_title">Atvertos kortelės</string>
     <!-- Text shown in the menu for saving tabs to a collection -->
     <string name="tab_tray_menu_item_save">Įtraukti į rinkinį</string>
+    <!-- Text shown in the menu for the collection selector -->
+    <string name="tab_tray_menu_select">Pasirinkti</string>
     <!-- Text shown in the menu for sharing all tabs -->
     <string name="tab_tray_menu_item_share">Dalintis visomis kortelėmis</string>
     <!-- Text shown in the menu to view recently closed tabs -->
@@ -887,16 +896,22 @@
     <string name="tracking_protection_on">Įjungta</string>
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Išjungta</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">Leisti garsus ir vaizdus</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Leisti garsus ir vaizdus</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Blokuoti garsus ir vaizdus tik naudojant mobilųjį ryšį</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">Garsai ir vaizdai gros tik per „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">Blokuoti tik garsus</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Blokuoti tik garsus</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Blokuoti garsus ir vaizdus</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Blokuoti garsus ir vaizdus</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">Įjungta</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 21b4ab79d..dd3a094e1 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -183,6 +183,8 @@
     <!-- Browser menu button to configure reader mode appearance e.g. the used font type and size -->
     <string name="browser_menu_read_appearance">Utseende</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">Tilpass lesevisning</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>
@@ -220,6 +222,11 @@
     <!-- Search suggestion onboarding hint Learn more link text -->
     <string name="search_suggestions_onboarding_learn_more_link">Les mer</string>
 
+    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <string name="search_engine_suggestions_title">Søk %s</string>
+    <!-- Search engine suggestion description text -->
+    <string name="search_engine_suggestions_description">Søk direkte fra adresselinjen</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
     <string name="search_widget_content_description">Åpne en ny Firefox-fane</string>
@@ -895,16 +902,22 @@
     <string name="tracking_protection_on">På</string>
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Av</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">Tillat lyd og video</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Tillat lyd og video</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Blokker lyd og video bare på mobildata</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">Lyd og video spilles av på 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">Blokker bare lyd</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Blokker bare lyd</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Blokker lyd og video</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Blokker lyd og video</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">På</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index c946b5080..c9a743d91 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -187,6 +187,8 @@
     <!-- Browser menu button to configure reader mode appearance e.g. the used font type and size -->
     <string name="browser_menu_read_appearance">Vormgeving</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">Lezerweergave aanpassen</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>
@@ -224,6 +226,11 @@
     <!-- Search suggestion onboarding hint Learn more link text -->
     <string name="search_suggestions_onboarding_learn_more_link">Meer info</string>
 
+    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <string name="search_engine_suggestions_title">%s doorzoeken</string>
+    <!-- Search engine suggestion description text -->
+    <string name="search_engine_suggestions_description">Rechtstreeks vanuit de adresbalk zoeken</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
     <string name="search_widget_content_description">Een nieuw Firefox-tabblad openen</string>
@@ -894,16 +901,22 @@
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Uit</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">Audio en video toestaan</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Audio en video toestaan</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Audio en video alleen op mobiele data blokkeren</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">Audio en video worden via wifi afgespeeld</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">Alleen audio blokkeren</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Alleen audio blokkeren</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Audio en video blokkeren</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Audio en video blokkeren</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">Aan</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
diff --git a/app/src/main/res/values-nn-rNO/strings.xml b/app/src/main/res/values-nn-rNO/strings.xml
index 0c50a0747..c5f993168 100644
--- a/app/src/main/res/values-nn-rNO/strings.xml
+++ b/app/src/main/res/values-nn-rNO/strings.xml
@@ -183,6 +183,8 @@
     <!-- Browser menu button to configure reader mode appearance e.g. the used font type and size -->
     <string name="browser_menu_read_appearance">Utsjånad</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">Tilpass lesevising</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>
@@ -219,6 +221,11 @@
     <!-- Search suggestion onboarding hint Learn more link text -->
     <string name="search_suggestions_onboarding_learn_more_link">Les meir</string>
 
+    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <string name="search_engine_suggestions_title">Søk med %s</string>
+    <!-- Search engine suggestion description text -->
+    <string name="search_engine_suggestions_description">Søk direkte frå adresselinja</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
     <string name="search_widget_content_description">Opne ei ny Firefox-fane</string>
@@ -897,16 +904,22 @@
     <string name="tracking_protection_on">På</string>
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Av</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">Tillat lyd og video</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Tillat lyd og video</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Blokker lyd og video berre på mobildata</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">Lyd og video vert spela av på 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">Blokker berre lyd</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Blokker berre lyd</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Blokker lyd og video</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Blokker lyd og video</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">På</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml
index dab397e11..cbe0452dd 100644
--- a/app/src/main/res/values-oc/strings.xml
+++ b/app/src/main/res/values-oc/strings.xml
@@ -129,6 +129,8 @@
     <string name="browser_menu_edit_bookmark">Modificar lo marcapagina</string>
     <!-- Browser menu button that opens the addon manager -->
     <string name="browser_menu_add_ons">Moduls</string>
+    <!-- Browser menu button that opens the addon extensions manager -->
+    <string name="browser_menu_extensions">Extensions</string>
     <!-- Text displayed when there are no add-ons to be shown -->
     <string name="no_add_ons">Cap d’extension aquí</string>
     <!-- Browser menu button that sends a user to help articles -->
@@ -532,6 +534,10 @@
     <string name="library_desktop_bookmarks_unfiled">Autres marcapaginas</string>
     <!-- Option in Library to open History page -->
     <string name="library_history">Istoric</string>
+    <!-- Option in Library to open a new tab -->
+    <string name="library_new_tab">Onglet novèl</string>
+    <!-- Option in Library to find text in page -->
+    <string name="library_find_in_page">Recercar dins la pagina</string>
     <!-- Option in Library to open Synced Tabs page -->
     <string name="library_synced_tabs">Onglets sincronizats</string>
     <!-- Option in Library to open Reading List -->
diff --git a/app/src/main/res/values-pa-rIN/strings.xml b/app/src/main/res/values-pa-rIN/strings.xml
index e65606abf..2c8bebf6a 100644
--- a/app/src/main/res/values-pa-rIN/strings.xml
+++ b/app/src/main/res/values-pa-rIN/strings.xml
@@ -187,6 +187,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>
     <!-- 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>
@@ -224,6 +226,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>
@@ -902,16 +909,22 @@
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">ਬੰਦ</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">ਆਡੀਓ ਅਤੇ ਵੀਡਿਓ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ</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 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">ਸਿਰਫ਼ ਆਡੀਓ ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਓ</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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 -->
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index d6ffee801..5fe83ac0e 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -183,6 +183,8 @@
     <!-- Browser menu button to configure reader mode appearance e.g. the used font type and size -->
     <string name="browser_menu_read_appearance">Wygląd</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">Dostosuj widok poprawionej czytelności</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>
@@ -220,6 +222,11 @@
     <!-- Search suggestion onboarding hint Learn more link text -->
     <string name="search_suggestions_onboarding_learn_more_link">Więcej informacji</string>
 
+    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <string name="search_engine_suggestions_title">Szukaj w %s</string>
+    <!-- Search engine suggestion description text -->
+    <string name="search_engine_suggestions_description">Szukaj prosto z paska adresu</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
     <string name="search_widget_content_description">Otwórz nową kartę w Firefoksie</string>
@@ -892,16 +899,22 @@
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Wyłączona</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">Zezwalaj na dźwięk i wideo</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Zezwalaj na dźwięk i wideo</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Blokuj dźwięk i wideo tylko w sieciach komórkowych</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">Dźwięk i wideo będą odtwarzane w sieciach 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">Blokuj tylko dźwięk</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Blokuj tylko dźwięk</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Blokuj dźwięk i wideo</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Blokuj dźwięk i wideo</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">Włączone</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index eaad1028f..9c3cb4a26 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -14,7 +14,7 @@
     <!-- Placeholder text shown in the search bar before a user enters text -->
     <string name="search_hint">Pesquise ou digite um endereço</string>
     <!-- No Open Tabs Message Description -->
-    <string name="no_open_tabs_description">Suas abas abertas serão mostradas aqui.</string>
+    <string name="no_open_tabs_description">Suas abas abertas são mostradas aqui.</string>
 
     <!-- No Private Tabs Message Description -->
     <string name="no_private_tabs_description">Suas abas privativas são mostradas aqui.</string>
@@ -181,6 +181,8 @@
     <!-- Browser menu button to configure reader mode appearance e.g. the used font type and size -->
     <string name="browser_menu_read_appearance">Aparência</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">Personalizar leitor</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>
@@ -218,6 +220,11 @@
     <!-- Search suggestion onboarding hint Learn more link text -->
     <string name="search_suggestions_onboarding_learn_more_link">Saiba mais</string>
 
+    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <string name="search_engine_suggestions_title">Pesquisar com %s</string>
+    <!-- Search engine suggestion description text -->
+    <string name="search_engine_suggestions_description">Pesquisar diretamente na barra de endereços</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
     <string name="search_widget_content_description">Abrir uma nova aba no Firefox</string>
@@ -885,16 +892,22 @@
     <string name="tracking_protection_on">Ativada</string>
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Desativada</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">Permitir áudio e vídeo</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Permitir áudio e vídeo</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Bloquear áudio e vídeo apenas em rede móvel</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">Áudio e vídeo só são reproduzidos automaticamente se o dispositivo estiver conectado a uma rede 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">Bloquear apenas áudio</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Bloquear apenas áudio</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Bloquear áudio e vídeo</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Bloquear áudio e vídeo</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">Ativado</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
@@ -1043,7 +1056,7 @@
     <!-- Tab collection deletion prompt dialog message. Placeholder will be replaced with the collection name -->
     <string name="tab_collection_dialog_message">Tem certeza que quer excluir %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">Excluir esta aba também excluirá toda a coleção. Você pode criar novas coleções quando quiser.</string>
+    <string name="delete_tab_and_collection_dialog_message">Excluir esta aba também exclui toda a coleção. Você pode criar novas coleções quando quiser.</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">Excluir %1$s?</string>
     <!-- Tab collection deletion prompt dialog option to delete the collection -->
@@ -1189,7 +1202,7 @@
     The first parameter is the name of the app (e.g. Firefox Preview) -->
     <string name="onboarding_tracking_protection_description_2">As configurações de privacidade e segurança bloqueiam rastreadores, código malicioso (malware) e empresas que seguem você.</string>
     <!-- text for tracking protection radio button option for standard level of blocking -->
-    <string name="onboarding_tracking_protection_standard_button_2">Padrão (predefinido)</string>
+    <string name="onboarding_tracking_protection_standard_button_2">Normal (padrão)</string>
     <!-- text for standard blocking option button description -->
     <string name="onboarding_tracking_protection_standard_button_description_2">Bloqueia menos rastreadores. As páginas são carregadas normalmente.</string>
     <!-- text for tracking protection radio button option for strict level of blocking -->
@@ -1289,11 +1302,11 @@
     <string name="preference_enhanced_tracking_protection_explanation_learn_more">Saiba mais</string>
 
     <!-- Preference for enhanced tracking protection for the standard protection settings -->
-    <string name="preference_enhanced_tracking_protection_standard_default_1">Padrão (predefinido)</string>
+    <string name="preference_enhanced_tracking_protection_standard_default_1">Normal (padrão)</string>
     <!-- Preference description for enhanced tracking protection for the standard protection settings -->
     <string name="preference_enhanced_tracking_protection_standard_description_3">Bloqueia menos rastreadores. As páginas são carregadas normalmente.</string>
     <!--  Accessibility text for the Standard protection information icon  -->
-    <string name="preference_enhanced_tracking_protection_standard_info_button">O que é bloqueado pela proteção padrão contra rastreamento</string>
+    <string name="preference_enhanced_tracking_protection_standard_info_button">O que é bloqueado pela proteção normal contra rastreamento</string>
     <!-- Preference for enhanced tracking protection for the strict protection settings -->
     <string name="preference_enhanced_tracking_protection_strict">Rigoroso</string>
     <!-- Preference description for enhanced tracking protection for the strict protection settings -->
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 909deec7d..882fd490d 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -181,6 +181,8 @@
     <!-- Browser menu button to configure reader mode appearance e.g. the used font type and size -->
     <string name="browser_menu_read_appearance">Aparência</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">Personalizar a vista de leitura</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>
@@ -218,6 +220,11 @@
     <!-- Search suggestion onboarding hint Learn more link text -->
     <string name="search_suggestions_onboarding_learn_more_link">Saber mais</string>
 
+    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <string name="search_engine_suggestions_title">Pesquisar %s</string>
+    <!-- Search engine suggestion description text -->
+    <string name="search_engine_suggestions_description">Pesquisar diretamente a partir da barra de endereço</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
     <string name="search_widget_content_description">Abrir um novo separador Firefox</string>
@@ -889,16 +896,22 @@
     <string name="tracking_protection_on">Ativada</string>
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Desativada</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">Permitir áudio e vídeo</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Permitir áudio e vídeo</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Bloquear áudio e vídeo apenas em dados móveis</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">Áudio e vídeo serão reproduzidos em 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">Bloquear apenas o áudio</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Bloquear apenas o áudio</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Bloquear o áudio e vídeo</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Bloquear o áudio e vídeo</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">Ativado</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
diff --git a/app/src/main/res/values-rm/strings.xml b/app/src/main/res/values-rm/strings.xml
index 7736f8f3d..c996dbdcb 100644
--- a/app/src/main/res/values-rm/strings.xml
+++ b/app/src/main/res/values-rm/strings.xml
@@ -178,6 +178,8 @@
     <!-- Browser menu button to configure reader mode appearance e.g. the used font type and size -->
     <string name="browser_menu_read_appearance">Apparientscha</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">Persunalisar la vista da lectura</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">Impussibel da connectar. Schema dad URL nunenconuschent.</string>
@@ -214,6 +216,11 @@
     <!-- Search suggestion onboarding hint Learn more link text -->
     <string name="search_suggestions_onboarding_learn_more_link">Ulteriuras infurmaziuns</string>
 
+    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <string name="search_engine_suggestions_title">Tschertgar cun %s</string>
+    <!-- Search engine suggestion description text -->
+    <string name="search_engine_suggestions_description">Tschertgar direct en la trav d\'adressas</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
     <string name="search_widget_content_description">Avrir in nov tab da Firefox</string>
@@ -879,16 +886,22 @@
     <string name="tracking_protection_on">Activà</string>
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Deactivà</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">Permetter audio e video</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Permetter audio e video</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Bloccar audio e video mo en la rait mobila</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">Audio e video vegn reproducì en cas dad ina connexiun WLAN</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">Bloccar mo l\'audio</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Bloccar mo l\'audio</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Bloccar audio e video</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Bloccar audio e video</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">Activà</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 758628cfa..be9d8929f 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -192,6 +192,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>
     <!-- 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>
@@ -229,6 +231,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>
@@ -913,16 +920,22 @@
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Отключена</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">Разрешить аудио и видео</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 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">Блокировать только аудио</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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 -->
@@ -1232,7 +1245,7 @@
     <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_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 -->
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 08904d2f5..5a6d40324 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -220,6 +220,11 @@
     <!-- Search suggestion onboarding hint Learn more link text -->
     <string name="search_suggestions_onboarding_learn_more_link">Ďalšie informácie</string>
 
+    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <string name="search_engine_suggestions_title">Hľadať cez %s</string>
+    <!-- Search engine suggestion description text -->
+    <string name="search_engine_suggestions_description">Vyhľadať na webe priamo z panela s adresou</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
     <string name="search_widget_content_description">Otvoriť novú kartu vo Firefoxe</string>
@@ -894,16 +899,22 @@
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Vypnutá</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">Povoliť zvuk a video</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Povoliť zvuk a video</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Blokovať automatické prehrávanie zvuku a videí pri pripojení cez mobilné dáta</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">Zvuk a video sa bude automaticky prehrávať len na 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">Blokovať len zvuk</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Blokovať len zvuk</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Blokovať zvuk a video</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Blokovať zvuk a video</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">Zapnuté</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index b722f3d88..7bcfaa4dc 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -181,6 +181,8 @@
     <!-- Browser menu button to configure reader mode appearance e.g. the used font type and size -->
     <string name="browser_menu_read_appearance">Videz</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">Prilagodi bralni pogled</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>
@@ -217,6 +219,11 @@
     <!-- Search suggestion onboarding hint Learn more link text -->
     <string name="search_suggestions_onboarding_learn_more_link">Več o tem</string>
 
+    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <string name="search_engine_suggestions_title">Išči z %s</string>
+    <!-- Search engine suggestion description text -->
+    <string name="search_engine_suggestions_description">Iščite neposredno iz naslovne vrstice</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
     <string name="search_widget_content_description">Odpri nov zavihek v Firefoxu</string>
@@ -896,17 +903,23 @@
     <string name="tracking_protection_on">Vklopljeno</string>
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Izklopljeno</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">Dovoli zvok in video</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Dovoli zvok in video</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Zavrni zvok in video samo na mobilnih podatkih</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">Zvok in Video se bosta predvajala na 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">Zavrni samo zvok</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Zavrni samo zvok</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Zavrni zvok in video</string>
 
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Zavrni zvok in video</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">Vključeno</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index b5c2d8f05..8df0287d8 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -128,6 +128,8 @@
     <string name="browser_menu_edit_bookmark">Përpunoni faqerojtësin</string>
     <!-- Browser menu button that opens the addon manager -->
     <string name="browser_menu_add_ons">Shtesa</string>
+    <!-- Browser menu button that opens the addon extensions manager -->
+    <string name="browser_menu_extensions">Zgjerime</string>
     <!-- Text displayed when there are no add-ons to be shown -->
     <string name="no_add_ons">S’ka shtesa këtu</string>
     <!-- Browser menu button that sends a user to help articles -->
@@ -525,6 +527,10 @@
     <string name="library_desktop_bookmarks_unfiled">Faqerojtës të Tjerë</string>
     <!-- Option in Library to open History page -->
     <string name="library_history">Historik</string>
+    <!-- Option in Library to open a new tab -->
+    <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 -->
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index bec6b2f74..e4a6bc50d 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -215,6 +215,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>
@@ -886,16 +891,22 @@
     <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 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">Дозволи звук и видео</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 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">Блокирај само звук</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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 -->
diff --git a/app/src/main/res/values-su/strings.xml b/app/src/main/res/values-su/strings.xml
index 7ce8f19e5..4dc5c7319 100644
--- a/app/src/main/res/values-su/strings.xml
+++ b/app/src/main/res/values-su/strings.xml
@@ -128,6 +128,8 @@
 
     <!-- Browser menu button that opens the addon manager -->
     <string name="browser_menu_add_ons">Émboh</string>
+    <!-- Browser menu button that opens the addon extensions manager -->
+    <string name="browser_menu_extensions">Éksténsi</string>
     <!-- Text displayed when there are no add-ons to be shown -->
     <string name="no_add_ons">Teu aya add-on di dieu</string>
     <!-- Browser menu button that sends a user to help articles -->
@@ -214,6 +216,11 @@
     <!-- Search suggestion onboarding hint Learn more link text -->
     <string name="search_suggestions_onboarding_learn_more_link">Lenyepan</string>
 
+    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <string name="search_engine_suggestions_title">Paluruh %s</string>
+    <!-- Search engine suggestion description text -->
+    <string name="search_engine_suggestions_description">Paluruh langsung tina 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 anyar</string>
@@ -533,6 +540,10 @@
     <string name="library_desktop_bookmarks_unfiled">Markah Lianna</string>
     <!-- Option in Library to open History page -->
     <string name="library_history">Jujutan</string>
+    <!-- Option in Library to open a new tab -->
+    <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 -->
@@ -887,16 +898,22 @@
     <string name="tracking_protection_on">Hurung</string>
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Pareum</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">Ngidinan sora jeung pidéo</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Idinan audio jeung pidéo</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Blokir sora jeung pidéo dina data sélulér wungkul</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">Sora jeung pidéo bakal dimaénkeun dina 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">Blokir sora hungkul</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Peungpeuk audio hungkul</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Blokir sora jueng pidéo</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Peungpeuk audio jeung pidéo</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">Hurung</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 089dd5782..6edd64c30 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -185,6 +185,8 @@
     <!-- Browser menu button to configure reader mode appearance e.g. the used font type and size -->
     <string name="browser_menu_read_appearance">Utseende</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">Anpassa läsvyn</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>
@@ -222,6 +224,11 @@
     <!-- Search suggestion onboarding hint Learn more link text -->
     <string name="search_suggestions_onboarding_learn_more_link">Läs mer</string>
 
+    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <string name="search_engine_suggestions_title">Sök med %s</string>
+    <!-- Search engine suggestion description text -->
+    <string name="search_engine_suggestions_description">Sök direkt från adressfältet</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
     <string name="search_widget_content_description">Öppna en ny Firefox-flik</string>
@@ -897,16 +904,22 @@
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Av</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">Tillåt ljud och video</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Tillåt ljud och video</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Blockera ljud och video endast vid mobildata</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">Ljud och video spelas upp på 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">Blockera ljud endast</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Blockera endast ljud</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Blockera ljud och video</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Blockera ljud och video</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">På</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
diff --git a/app/src/main/res/values-tg/strings.xml b/app/src/main/res/values-tg/strings.xml
index f380493ee..af1b29dbe 100644
--- a/app/src/main/res/values-tg/strings.xml
+++ b/app/src/main/res/values-tg/strings.xml
@@ -130,6 +130,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 +181,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>
     <!-- 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>
@@ -215,6 +219,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>
@@ -525,6 +534,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 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 -->
@@ -880,16 +893,22 @@
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Ғайрифаъол</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">Иҷозат додани аудио ва видео</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 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">Бастани танҳои аудио</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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 -->
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 434e4e567..fd57935fc 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -129,6 +129,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 -->
@@ -214,6 +216,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>
@@ -526,6 +533,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 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 -->
@@ -878,16 +889,22 @@
     <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 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">อนุญาตเสียงและวิดีโอ</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 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">ปิดกั้นเสียงเท่านั้น</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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 -->
diff --git a/app/src/main/res/values-tl/strings.xml b/app/src/main/res/values-tl/strings.xml
index 93f5ed5e4..17ede797b 100644
--- a/app/src/main/res/values-tl/strings.xml
+++ b/app/src/main/res/values-tl/strings.xml
@@ -50,14 +50,24 @@
     <string name="tab_tray_multiselect_selected_content_description">Napili</string>
 
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
-    <string name="about_content">%1$s ay gawa ng Mozilla.</string>
+    <string name="about_content">Ang %1$s ay gawa ng Mozilla.</string>
 
     <!-- Private Browsing -->
     <!-- Title for private session option -->
     <string name="private_browsing_title">Ikaw ay nasa pribadong sesyon</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">
+        Inaalis ng %1$s ang iyong bakas sa paghahanap at pag-browse sa mga pribadong tab kapag isinara mo sila o umalis sa app. Bagaman makikilala ka pa rin ng mga website o internet service provider mo, nakatutulong pa rin ito para mapanatiling pribado ang mga gawain mo online mula sa ibang gagamit ng device na ito.</string>
+    <string name="private_browsing_common_myths">
+       Mga karaniwang pamahiin tungkol sa pribadong pag-browse
+    </string>
     <!-- Delete session button to erase your history in a private session -->
     <string name="private_browsing_delete_session">Burahin ang sesyon</string>
 
+    <!-- Private mode shortcut "contextual feature recommendation" (CFR) -->
+    <!-- Text for the main message -->
+    <string name="cfr_message">Magdagdag ng shortcut para makapagbukas ng mga pribadong tab mula sa iyong Home screen.</string>
     <!-- Text for the positive button -->
     <string name="cfr_pos_button_text">Magdagdag ng shortcut</string>
     <!-- Text for the negative button -->
@@ -78,11 +88,15 @@
     <!-- Text for the negative action button to dismiss the dialog. -->
     <string name="camera_permissions_needed_negative_button_text">Alisin</string>
 
+    <!-- Text for the banner message to tell users about our auto close feature. -->
+    <string name="tab_tray_close_tabs_banner_message">Itakda na kusang magsara ang mga nakabukas na tab na hindi napansin sa nakaraang araw, linggo, o buwan.</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">Tingnan ang mga pagpipilian</string>
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
     <string name="tab_tray_close_tabs_banner_negative_button_text">Alisin</string>
 
+    <!-- Text for the banner message to tell users about our grid view feature. -->
+    <string name="tab_tray_grid_view_banner_message">Baguhin ang layout ng mga nakabukas na tab. Pumunta sa mga setting at piliin ang grid sa 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">Pumunta sa settings</string>
     <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
@@ -113,6 +127,8 @@
     <string name="browser_menu_edit_bookmark">i-Edit ang Bookmark</string>
     <!-- Browser menu button that opens the addon manager -->
     <string name="browser_menu_add_ons">Mga Add-on</string>
+    <!-- Browser menu button that opens the addon extensions manager -->
+    <string name="browser_menu_extensions">Mga extension</string>
     <!-- Text displayed when there are no add-ons to be shown -->
     <string name="no_add_ons">Walang mga add-on dito</string>
     <!-- Browser menu button that sends a user to help articles -->
@@ -149,10 +165,10 @@
     <string name="browser_menu_open_in_fenix">Buksan sa %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">POWERED BY %1$s</string>
+    <string name="browser_menu_powered_by">PINATATAKBO NG %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">Powered by %1$s</string>
+    <string name="browser_menu_powered_by2">Pinatatakbo ng %1$s</string>
     <!-- Browser menu button to put the current page in reader mode -->
     <string name="browser_menu_read">Reader view</string>
     <!-- Browser menu button content description to close reader mode and return the user to the regular browser -->
@@ -175,6 +191,9 @@
     <!-- Text for default locale item -->
     <string name="default_locale_text">Sundin ang wika sa device</string>
 
+    <!-- Placeholder text shown in the search bar before a user enters text -->
+    <string name="locale_search_hint">Wika ng paghanap</string>
+
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">i-Scan</string>
@@ -193,9 +212,16 @@
 
     <!-- Search suggestion onboarding hint title text -->
     <string name="search_suggestions_onboarding_title">Payagan ang mga mungkahi sa paghahanap sa mga pribadong session?</string>
+    <!-- Search suggestion onboarding hint description text, first parameter is the name of the app defined in app_name (for example: Fenix)-->
+    <string name="search_suggestions_onboarding_text">Ibabahagi ng %s ang lahat ng ita-type mo sa address bar sa iyong default na search engine.</string>
     <!-- Search suggestion onboarding hint Learn more link text -->
     <string name="search_suggestions_onboarding_learn_more_link">Alamin</string>
 
+    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <string name="search_engine_suggestions_title">Hanapin sa %s</string>
+    <!-- Search engine suggestion description text -->
+    <string name="search_engine_suggestions_description">Maghanap direkta mula sa address bar</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
     <string name="search_widget_content_description">Magbukas ng bagong Firefox tab</string>
@@ -216,8 +242,10 @@
     <string name="preferences_category_general">Pangkalahatan</string>
     <!-- Preference category for all links about Fenix -->
     <string name="preferences_category_about">Tungkol sa</string>
+    <!-- Preference for settings related to changing the default search engine -->
+    <string name="preferences_default_search_engine">Default na search engine</string>
     <!-- Preference for settings related to Search -->
-    <string name="preferences_search">Hanapin</string>
+    <string name="preferences_search">Paghahanap</string>
     <!-- Preference for settings related to Search address bar -->
     <string name="preferences_search_address_bar">Address bar</string>
     <!-- Preference linking to help about Fenix -->
@@ -230,13 +258,15 @@
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
     <string name="preferences_about">Tungkol sa %1$s</string>
     <!-- Preference linking to the your rights SUMO page -->
-    <string name="preferences_your_rights">Your Rights</string>
+    <string name="preferences_your_rights">Ang Iyong mga Karapatan</string>
     <!-- Preference for settings related to saved passwords -->
     <string name="preferences_passwords">Mga Password</string>
     <!-- Preference for settings related to saved credit cards and addresses -->
     <string name="preferences_credit_cards_addresses">Mga credit card at tirahan</string>
     <!-- Preference for settings related to changing the default browser -->
     <string name="preferences_set_as_default_browser">Itakda bilang default browser</string>
+    <!-- Preference category for advanced settings -->
+    <string name="preferences_category_advanced">Advanced</string>
     <!-- Preference category for privacy settings -->
     <string name="preferences_category_privacy">Pribasiya</string>
     <!-- Preference category for privacy and security settings -->
@@ -249,10 +279,18 @@
     <string name="preferences_open_links_in_a_private_tab">Buksan ang mga link sa pribadong tab</string>
     <!-- Preference for allowing screenshots to be taken while in a private tab-->
     <string name="preferences_allow_screenshots_in_private_mode">Payagan ang mga screenshot sa private browsing</string>
+    <!-- Will inform the user of the risk of activating Allow screenshots in private browsing option -->
+    <string name="preferences_screenshots_in_private_mode_disclaimer">Kapag pinayagan, makikita rin ang mga pribadong tab kapag maraming nakabukas na app</string>
     <!-- Preference for adding private browsing shortcut -->
     <string name="preferences_add_private_browsing_shortcut">Magdagdag ng private browsing shortcut</string>
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Accessibility</string>
+    <!-- Preference to override the Firefox Account server -->
+    <string name="preferences_override_fxa_server">Pasadya na Firefox Account server</string>
+    <!-- Preference to override the Sync token server -->
+    <string name="preferences_override_sync_tokenserver">Pasadya na Sync server</string>
+    <!-- Toast shown after updating the FxA/Sync server override preferences -->
+    <string name="toast_override_fxa_sync_server_done">Nabago ang Firefox Account/Sync server. Magsasara na ang application para mailapat ang mga pagbabago…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Account</string>
     <!-- Preference shown on banner to sign into account -->
@@ -264,9 +302,9 @@
     <!-- Preference for customizing the home screen -->
     <string name="preferences_home">Home</string>
     <!-- Preference for gestures based actions -->
-    <string name="preferences_gestures">Gestures</string>
+    <string name="preferences_gestures">Mga gesture</string>
     <!-- Preference for settings related to visual options -->
-    <string name="preferences_customize">Customize</string>
+    <string name="preferences_customize">Ipasadya</string>
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description">Mag-sync ng mga bookmark, kasaysayan, at iba pa gamit ang iyong Firefox Account</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
@@ -281,11 +319,13 @@
     <string name="preferences_data_choices">Mga pamimilian sa data</string>
     <!-- Preference for data collection -->
     <string name="preferences_data_collection">Pagkolekta ng data</string>
+    <!-- Preference linking to the privacy notice -->
+    <string name="preferences_privacy_link">Paunawa sa privacy</string>
     <!-- Preference category for developer tools -->
     <string name="developer_tools_category">Developer tools</string>
 
     <!-- Preference for developers -->
-    <string name="preferences_remote_debugging">Remote debugging via USB</string>
+    <string name="preferences_remote_debugging">Remote debugging sa USB</string>
     <!-- Preference title for switch preference to show search engines -->
     <string name="preferences_show_search_engines">Ipakita ang mga search engine</string>
     <!-- Preference title for switch preference to show search suggestions -->
@@ -311,11 +351,14 @@
     <!-- Preference for open download with an external download manager app -->
     <string name="preferences_external_download_manager">Hiwalay na download manager</string>
     <!-- Preference for add_ons -->
-    <string name="preferences_addons">Add-ons</string>
+    <string name="preferences_addons">Mga add-on</string>
 
     <!-- Preference for notifications -->
     <string name="preferences_notifications">Mga abiso</string>
 
+    <!-- Add-on Preferences -->
+    <!-- Preference to customize the configured AMO (addons.mozilla.org) collection -->
+    <string name="preferences_customize_amo_collection">Pasadyang koleksyon ng mga Add-on</string>
     <!-- Button caption to confirm the add-on collection configuration -->
     <string name="customize_addon_collection_ok">OK</string>
 
@@ -327,6 +370,9 @@
     <!-- Hint displayed on input field for custom collection user ID-->
     <string name="customize_addon_collection_user_hint">May-ari ng collection (User ID)</string>
 
+    <!-- Toast shown after confirming the custom add-on collection configuration -->
+    <string name="toast_customize_addon_collection_done">Nabago ang Add-on collection. Magsasara na ang application para mailapat ang mga pagbabago…</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">Hindi suportado ang add-on</string>
@@ -335,7 +381,7 @@
 
     <!-- Account Preferences -->
     <!-- Preference for triggering sync -->
-    <string name="preferences_sync_now">Sync now</string>
+    <string name="preferences_sync_now">Mag-sync na</string>
     <!-- Preference category for sync -->
     <string name="preferences_sync_category">Piliin alin ang isi-sync</string>
     <!-- Preference for syncing history -->
@@ -345,16 +391,16 @@
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Mga Login</string>
     <!-- Preference for syncing tabs -->
-    <string name="preferences_sync_tabs_2">Open tabs</string>
+    <string name="preferences_sync_tabs_2">Mga nakabukas na tab</string>
     <!-- Preference for signing out -->
-    <string name="preferences_sign_out">mag-Sign out</string>
+    <string name="preferences_sign_out">Mag-sign out</string>
     <!-- Preference displays and allows changing current FxA device name -->
     <string name="preferences_sync_device_name">Ngalan ng device</string>
 
     <!-- Text shown when user enters empty device name -->
     <string name="empty_device_name_error">Hindi maaaring blangko ang pangalan ng device.</string>
     <!-- Label indicating that sync is in progress -->
-    <string name="sync_syncing_in_progress">Syncing…</string>
+    <string name="sync_syncing_in_progress">Nagsi-Sync…</string>
     <!-- Label summary indicating that sync failed. The first parameter is the date stamp showing last time it succeeded -->
     <string name="sync_failed_summary">Bigong pag-sync. Huling matagumpay na pag-sync: %s</string>
     <!-- Label summary showing never synced -->
@@ -366,11 +412,13 @@
     <!-- 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 ng %2$s %3$s</string>
+    <string name="default_device_name_2">%1$s sa %2$s %3$s</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">Mga natanggap na tab</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">Mga abiso para sa mga tab na natanggap mula sa ibang mga Firefox device.</string>
     <!--  The body for these is the URL of the tab received  -->
     <string name="fxa_tab_received_notification_name">May natanggap na tab</string>
     <!-- When multiple tabs have been received -->
@@ -396,17 +444,28 @@
     <!-- 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">Alamin</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">Nakasara sa pangkalahatan, pumunta sa Mga Setting para buksan ito.</string>
+
     <!-- Preference switch for Telemetry -->
     <string name="preferences_telemetry">Telemetry</string>
     <!-- Preference switch for usage and technical data collection -->
     <string name="preference_usage_data">Usage at technical data</string>
+    <!-- Preference description for usage and technical data collection -->
+    <string name="preferences_usage_data_description">Ibinabahagi sa Mozilla ang datos patungkol sa performance, paggamit, hardware at customization sa browser mo para mapaganda lalo ang %1$s</string>
     <!-- Preference switch for marketing data collection -->
     <string name="preferences_marketing_data">Marketing data</string>
+    <!-- Preference description for marketing data collection, parameter is the app name (e.g. Firefox) -->
+    <string name="preferences_marketing_data_description">Ibinabahagi ang datos tungkol sa mga feature na ginagamit mo sa %1$s kay Leanplum, ang aming mobile marketing vendor.</string>
     <!-- Title for studies preferences -->
     <string name="preference_experiments_2">Mga pag-aaral</string>
+    <!-- Summary for studies preferences -->
+    <string name="preference_experiments_summary_2">Pinapayagan ang Mozilla para magkabit at magpatakbo ng mga pag-aaral</string>
     <!-- Title for experiments preferences -->
     <string name="preference_experiments">Mga eksperimento</string>
 
+    <!-- Summary for experiments preferences -->
+    <string name="preference_experiments_summary">Pinapayagan ang Mozilla para magkabit at magkolekta ng datos para sa mga eksperimental na feature</string>
     <!-- Preference switch for crash reporter -->
     <string name="preferences_crash_reporter">Crash reporter</string>
     <!-- Preference switch for Mozilla location service -->
@@ -417,19 +476,19 @@
 
     <!-- Turn On Sync Preferences -->
     <!-- Header of the Turn on Sync preference view -->
-    <string name="preferences_sync">Turn on Sync</string>
+    <string name="preferences_sync">Buksan ang Sync</string>
     <!-- Preference for pairing -->
     <string name="preferences_sync_pair">Scan pairing code in desktop Firefox</string>
     <!-- Preference for account login -->
-    <string name="preferences_sync_sign_in">Sign in</string>
+    <string name="preferences_sync_sign_in">Mag-sign in</string>
     <!-- Preference for reconnecting to FxA sync -->
-    <string name="preferences_sync_sign_in_to_reconnect">Sign in to reconnect</string>
+    <string name="preferences_sync_sign_in_to_reconnect">Mag-sign in para mag-reconnect</string>
     <!-- Preference for removing FxA account -->
-    <string name="preferences_sync_remove_account">Remove account</string>
+    <string name="preferences_sync_remove_account">Tanggalin ang account</string>
 
     <!-- Pairing Feature strings -->
     <!-- Instructions on how to access pairing -->
-    <string name="pair_instructions_2"><![CDATA[Scan the QR code shown at <b>firefox.com/pair</b>]]></string>
+    <string name="pair_instructions_2"><![CDATA[i-Scan ang QR code na ipinapakita sa <b>firefox.com/pair</b>]]></string>
     <!-- Button to open camera for pairing -->
     <string name="pair_open_camera">Buksan ang Camera</string>
     <!-- Button to cancel pairing -->
@@ -443,10 +502,12 @@
 
     <!-- Theme Preferences -->
     <!-- Preference for using light theme -->
-    <string name="preference_light_theme">Light</string>
+    <string name="preference_light_theme">Maliwanag</string>
     <!-- Preference for using dark theme -->
     <string name="preference_dark_theme">Madilim</string>
 
+    <!-- Preference for using using dark or light theme automatically set by battery -->
+    <string name="preference_auto_battery_theme">Nakatakda sa Battery Saver</string>
     <!-- Preference for using following device theme -->
     <string name="preference_follow_device_theme">Sundin ang tema ng device</string>
 
@@ -479,6 +540,10 @@
     <string name="library_desktop_bookmarks_unfiled">Iba pang mga Bookmark</string>
     <!-- Option in Library to open History page -->
     <string name="library_history">Kasaysayan</string>
+    <!-- Option in Library to open a new tab -->
+    <string name="library_new_tab">Bagong tab</string>
+    <!-- Option in Library to find text in page -->
+    <string name="library_find_in_page">Hanapin sa pahina</string>
     <!-- Option in Library to open Synced Tabs page -->
     <string name="library_synced_tabs">Mga naka-sync na tab</string>
     <!-- Option in Library to open Reading List -->
@@ -487,13 +552,15 @@
     <string name="library_search">Hanapin</string>
     <!-- Settings Page Title -->
     <string name="settings_title">Mga Setting</string>
+    <!-- Content description (not visible, for screen readers etc.): "Menu icon for items on a history item" -->
+    <string name="content_description_history_menu">Menu para sa listahan ng kasaysayan</string>
     <!-- Content description (not visible, for screen readers etc.): "Close button for library settings" -->
     <string name="content_description_close_button">Isara</string>
 
     <!-- Option in library for Recently Closed Tabs -->
     <string name="library_recently_closed_tabs">Mga isinarang tab kamakailan</string>
     <!-- Option in library to open Recently Closed Tabs page -->
-    <string name="recently_closed_show_full_history">Ipakita ang kumpletong kasaysayan</string>
+    <string name="recently_closed_show_full_history">Ipakita ang buong kasaysayan</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 mga tab</string>
@@ -507,6 +574,8 @@
     <!-- Tab Management -->
     <!-- Title of preference for tabs management -->
     <string name="preferences_tabs">Mga Tab</string>
+    <!-- Title of preference that allows a user to specify the tab view -->
+    <string name="preferences_tab_view">Tab view</string>
     <!-- Option for a list tab view -->
     <string name="tab_view_list">Listahan</string>
     <!-- Option for a grid tab view -->
@@ -562,12 +631,20 @@
     <string name="tab_tray_menu_item_close">Isara lahat ng mga tab</string>
     <!-- Shortcut action to open new tab -->
     <string name="tab_tray_menu_open_new_tab">Bagong Tab</string>
+    <!-- Shortcut action to open the home screen -->
+    <string name="tab_tray_menu_home">Pumunta sa home</string>
+    <!-- Shortcut action to toggle private mode -->
+    <string name="tab_tray_menu_toggle">i-Toggle ang tab mode</string>
     <!-- Text shown in the multiselect menu for bookmarking selected tabs. -->
     <string name="tab_tray_multiselect_menu_item_bookmark">Bookmark</string>
     <!-- Text shown in the multiselect menu for closing selected tabs. -->
     <string name="tab_tray_multiselect_menu_item_close">Isara</string>
     <!-- Content description for tabs tray multiselect share button -->
     <string name="tab_tray_multiselect_share_content_description">Ibahagi ang mga piniling mga tab</string>
+    <!-- Content description for tabs tray multiselect menu -->
+    <string name="tab_tray_multiselect_menu_content_description">Menu para sa mga napiling tab</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">Tanggalin ang tab sa collection</string>
     <!-- Text for button to enter multiselect mode in tabs tray -->
     <string name="tabs_tray_select_tabs">Piliin ang mga tab</string>
     <!-- Content description (not visible, for screen readers etc.): Close tab button. Closes the current session when pressed -->
@@ -643,7 +720,7 @@
     <string name="history_delete_item">Burahin</string>
     <!-- History multi select title in app bar
     The first parameter is the number of bookmarks selected -->
-    <string name="history_multi_select_title">Napili na ang %1$d</string>
+    <string name="history_multi_select_title">May %1$d napili</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">Burahin ang %1$d item</string>
@@ -676,7 +753,7 @@
     <string name="download_empty_message_1">Walang mga naka-download na file</string>
     <!-- History multi select title in app bar
     The first parameter is the number of downloads selected -->
-    <string name="download_multi_select_title">Napili na ang %1$d</string>
+    <string name="download_multi_select_title">May %1$d napili</string>
     <!-- History overflow menu open in new tab button -->
     <string name="download_menu_open">Buksan</string>
 
@@ -703,6 +780,11 @@
     <!-- Content Description for session item share button -->
     <string name="content_description_session_share">Ibahagi ang session</string>
 
+    <!-- Bookmarks -->
+    <!-- Content description for bookmarks library menu -->
+    <string name="bookmark_menu_content_description">Bookmark menu</string>
+    <!-- Screen title for editing bookmarks -->
+    <string name="bookmark_edit">i-Edit ang bookmark</string>
     <!-- Screen title for selecting a bookmarks folder -->
     <string name="bookmark_select_folder">Pumili ng folder</string>
     <!-- Confirmation message for a dialog confirming if the user wants to delete the selected folder -->
@@ -738,7 +820,7 @@
     <string name="bookmark_menu_save_button">i-Save</string>
     <!-- Bookmark multi select title in app bar
      The first parameter is the number of bookmarks selected -->
-    <string name="bookmarks_multi_select_title">Napili na ang %1$d</string>
+    <string name="bookmarks_multi_select_title">May %1$d napili</string>
     <!-- Bookmark editing screen title -->
     <string name="edit_bookmark_fragment_title">i-Edit ang bookmark</string>
     <!-- Bookmark folder editing screen title -->
@@ -777,45 +859,874 @@
     <string name="permissions_header">Mga permiso</string>
     <!-- Button label that take the user to the Android App setting -->
     <string name="phone_feature_go_to_settings">Pumunta sa mga Setting</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">Listahan ng mga quick setting</string>
+    <!-- Label that indicates that this option it the recommended one -->
+    <string name="phone_feature_recommended">Inirerekomenda</string>
+    <!-- button that allows editing site permissions settings -->
+    <string name="quick_settings_sheet_manage_site_permissions">i-Manage ang mga site permission</string>
+    <!-- Button label for clearing all the information of site permissions-->
+    <string name="clear_permissions">Alisin ang pahintulot</string>
+    <!-- Button label for clearing a site permission-->
+    <string name="clear_permission">Alisin ang pahintulot</string>
+    <!-- Button label for clearing all the information on all sites-->
+    <string name="clear_permissions_on_all_sites">Alisin ang mga pahintulot sa lahat ng site</string>
+    <!-- Preference for altering video and audio autoplay for all websites -->
+    <string name="preference_browser_feature_autoplay">Autoplay</string>
     <!-- Preference for altering the camera access for all websites -->
     <string name="preference_phone_feature_camera">Camera</string>
     <!-- Preference for altering the microphone access for all websites -->
     <string name="preference_phone_feature_microphone">Mikropono</string>
     <!-- Preference for altering the location access for all websites -->
     <string name="preference_phone_feature_location">Lokasyon</string>
+    <!-- Preference for altering the notification access for all websites -->
+    <string name="preference_phone_feature_notification">Mga abiso</string>
+    <!-- Preference for altering the persistent storage access for all websites -->
+    <string name="preference_phone_feature_persistent_storage">Persistent Storage</string>
+    <!-- Preference for altering the EME access for all websites -->
+    <string name="preference_phone_feature_media_key_system_access">DRM-controlled content</string>
+    <!-- Label that indicates that a permission must be asked always -->
+    <string name="preference_option_phone_feature_ask_to_allow">Tanungin para payagan</string>
+    <!-- Label that indicates that a permission must be blocked -->
+    <string name="preference_option_phone_feature_blocked">Hinarang</string>
+    <!-- Label that indicates that a permission must be allowed -->
+    <string name="preference_option_phone_feature_allowed">Pinapayagan</string>
+    <!--Label that indicates a permission is by the Android OS-->
+    <string name="phone_feature_blocked_by_android">Hinarang ng Android</string>
+    <!-- Preference for showing a list of websites that the default configurations won't apply to them -->
+    <string name="preference_exceptions">Mga exception</string>
+    <!-- Summary of tracking protection preference if tracking protection is set to on -->
+    <string name="tracking_protection_on">Nakabukas</string>
+    <!-- Summary of tracking protection preference if tracking protection is set to off -->
+    <string name="tracking_protection_off">Nakasara</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is allowed -->
+    <string name="preference_option_autoplay_allowed2">Payagan ang audio at video</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Payagan ang audio at video</string>
+    <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
+    <string name="preference_option_autoplay_allowed_wifi_only2">Harangin ang audio at video kapag naka-cellular data lamang</string>
+    <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
+    <string name="preference_option_autoplay_allowed_wifi_subtext">Aandar ang audio at video kapag naka-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">Harangin ang audio lamang</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">Harangin ang audio lamang</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
+    <string name="preference_option_autoplay_blocked3">Harangin ang audio at video</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Harangin ang audio at video</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
-    <string name="delete_browsing_data_quit_on">On</string>
+    <string name="delete_browsing_data_quit_on">Nakabukas</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
-    <string name="delete_browsing_data_quit_off">Off</string>
+    <string name="delete_browsing_data_quit_off">Nakasara</string>
 
     <!-- Collections -->
     <!-- Collections header on home fragment -->
     <string name="collections_header">Mga Koleksyon</string>
+    <!-- Content description (not visible, for screen readers etc.): Opens the collection menu when pressed -->
+    <string name="collection_menu_button_content_description">Collection menu</string>
+    <!-- Label to describe what collections are to a new user without any collections -->
+    <string name="no_collections_description2">Kolektahin ang mga bagay na mahalaga sa iyo.\nPangkatin ang mga magkakatulad na hinahanap, site, at tab para madaling makuha sa susunod.</string>
+    <!-- Title for the "select tabs" step of the collection creator -->
+    <string name="create_collection_select_tabs">Piliin ang mga Tab</string>
+    <!-- Title for the "select collection" step of the collection creator -->
+    <string name="create_collection_select_collection">Piliin ang collection</string>
+    <!-- Title for the "name collection" step of the collection creator -->
+    <string name="create_collection_name_collection">Pangalanan ang collection</string>
+    <!-- Button to add new collection for the "select collection" step of the collection creator -->
+    <string name="create_collection_add_new_collection">Magdagdag ng bagong collection</string>
     <!-- Button to select all tabs in the "select tabs" step of the collection creator -->
     <string name="create_collection_select_all">Piliin lahat</string>
+    <!-- Button to deselect all tabs in the "select tabs" step of the collection creator -->
+    <string name="create_collection_deselect_all">Tanggalin lahat sa pagkakapili</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">Piliin ang mga tab na ise-save</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 piniling mga tab</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 piniling tab</string>
+    <!-- Text shown in snackbar when multiple tabs have been saved in a collection -->
+    <string name="create_collection_tabs_saved">Na-save na ang mga tab!</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">Na-save na ang collection!</string>
+    <!-- Text shown in snackbar when one tab has been saved in a collection -->
+    <string name="create_collection_tab_saved">Na-save na ang tab!</string>
     <!-- Content description (not visible, for screen readers etc.): button to close the collection creator -->
     <string name="create_collection_close">Isara</string>
 
+    <!-- Button to save currently selected tabs in the "select tabs" step of the collection creator-->
+    <string name="create_collection_save">i-Save</string>
+    <!-- Snackbar action to view the collection the user just created or updated -->
+    <string name="create_collection_view">Tingnan</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">Ika-%d collection</string>
+
+    <!-- Share -->
+    <!-- Share screen header -->
+    <string name="share_header">Ipadala at Ibahagi</string>
     <!-- Share screen header -->
     <string name="share_header_2">Ibahagi</string>
     <!-- Content description (not visible, for screen readers etc.):
         "Share" button. Opens the share menu when pressed. -->
     <string name="share_button_content_description">Ibahagi</string>
 
+    <!-- Sub-header in the dialog to share a link to another app -->
+    <string name="share_link_subheader">Magbahagi ng link</string>
+    <!-- Sub-header in the dialog to share a link to another sync device -->
+    <string name="share_device_subheader">Ipadala sa device</string>
+    <!-- Sub-header in the dialog to share a link to an app from the full list -->
+    <string name="share_link_all_apps_subheader">Lahat ng pagkilos</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">Kagagamit lamang</string>
+    <!-- An option from the share dialog to sign into sync -->
+    <string name="sync_sign_in">Mag-sign in sa Sync</string>
+    <!-- An option from the share dialog to send link to all other sync devices -->
+    <string name="sync_send_to_all">Ipadala sa lahat ng mga device</string>
+    <!-- An option from the share dialog to reconnect to sync -->
+    <string name="sync_reconnect">Kumonekta muli sa Sync</string>
+    <!-- Text displayed when sync is offline and cannot be accessed -->
+    <string name="sync_offline">Offline</string>
+    <!-- An option to connect additional devices -->
+    <string name="sync_connect_device">Magkonekta ng isa pang device</string>
+    <!-- The dialog text shown when additional devices are not available -->
+    <string name="sync_connect_device_dialog">Para makapagpadala ng tab, mag-sign in sa Firefox sa isa pang device.</string>
+    <!-- Confirmation dialog button -->
+    <string name="sync_confirmation_button">Nakuha ko</string>
+    <!-- Share error message -->
+    <string name="share_error_snackbar">Hindi kayang maibahagi sa app na ito</string>
+    <!-- Add new device screen title -->
+    <string name="sync_add_new_device_title">Ipadala sa device</string>
+    <!-- Text for the warning message on the Add new device screen -->
+    <string name="sync_add_new_device_message">Walang Nakakonektang mga Device</string>
+    <!-- Text for the button to learn about sending tabs -->
+    <string name="sync_add_new_device_learn_button">Alamin ang Tungkol sa Pagpapadala ng mga Tab…</string>
+    <!-- Text for the button to connect another device -->
+    <string name="sync_add_new_device_connect_button">Magkonekta ng Isa Pang Device…</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">Private browsing session</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">Burahin ang mga pribadong tab</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">Isara ang mga pribadong tab</string>
+    <!-- Notification action to open Fenix and resume the current browsing session. -->
+    <string name="notification_pbm_action_open">Buksan</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">Burahin at Buksan</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">Pinatatakbo Ng</string>
+    <!-- Text shown in snackbar when user deletes a collection -->
+    <string name="snackbar_collection_deleted">Nabura na ang collection</string>
+    <!-- Text shown in snackbar when user renames a collection -->
+    <string name="snackbar_collection_renamed">Nabago na ang pangalan ng collection</string>
+    <!-- Text shown in snackbar when user deletes a tab -->
+    <string name="snackbar_tab_deleted">Nabura na ang tab</string>
+    <!-- Text shown in snackbar when user deletes all tabs -->
+    <string name="snackbar_tabs_deleted">Nabura na ang mga tab</string>
+    <!-- Text shown in snackbar when user closes a tab -->
+    <string name="snackbar_tab_closed">Naisara na ang tab</string>
+    <!-- Text shown in snackbar when user closes all tabs -->
+    <string name="snackbar_tabs_closed">Naisara na ang mga tab</string>
+    <!-- Text shown in snackbar when user closes tabs -->
+    <string name="snackbar_message_tabs_closed">Naisara na ang mga tab!</string>
+    <!-- Text shown in snackbar when user bookmarks a list of tabs -->
+    <string name="snackbar_message_bookmarks_saved">Na-save na ang mga bookmark!</string>
     <!-- Text shown in snackbar action for viewing bookmarks -->
     <string name="snackbar_message_bookmarks_view">Tingnan</string>
+    <!-- Text shown in snackbar when user adds a site to top sites -->
+    <string name="snackbar_added_to_top_sites">Naidagdag na sa mga top site!</string>
+    <!-- Text shown in snackbar when user closes a private tab -->
+    <string name="snackbar_private_tab_closed">Naisara na ang pribadong tab</string>
+    <!-- Text shown in snackbar when user closes all private tabs -->
+    <string name="snackbar_private_tabs_closed">Naisara na ang mga pribadong tab</string>
+    <!-- Text shown in snackbar when user deletes all private tabs -->
+    <string name="snackbar_private_tabs_deleted">Nabura na ang mga pribadong tab</string>
+    <!-- Text shown in snackbar to undo deleting a tab, top site or collection -->
+    <string name="snackbar_deleted_undo">i-UNDO</string>
+    <!-- Text shown in snackbar when user removes a top site -->
+    <string name="snackbar_top_site_removed">Natanggal na ang site</string>
+    <!-- Text for action to undo deleting a tab or collection shown in a11y dialog -->
+    <string name="a11y_dialog_deleted_undo">i-Undo</string>
+    <!-- Text for action to confirm deleting a tab or collection shown in a11y dialog -->
+    <string name="a11y_dialog_deleted_confirm">Kumpirmahin</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">Payagan ang %1$s na buksan ang %2$s</string>
+    <!-- QR code scanner prompt dialog positive option to allow navigation to scanned link -->
+    <string name="qr_scanner_dialog_positive">PAYAGAN</string>
+    <!-- QR code scanner prompt dialog positive option to deny navigation to scanned link -->
+    <string name="qr_scanner_dialog_negative">TANGGIHAN</string>
+    <!-- Tab collection deletion prompt dialog message. Placeholder will be replaced with the collection name -->
+    <string name="tab_collection_dialog_message">Sigurado ka bang gusto mong burahin ang %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">Ang pagbura sa tab na ito ay magdudulot ng pagkabura ng buong collection. Maaari kang gumawa ng bagong collection anumang oras.</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">Burahin ang %1$s?</string>
+    <!-- Tab collection deletion prompt dialog option to delete the collection -->
+    <string name="tab_collection_dialog_positive">Burahin</string>
+    <!-- Tab collection deletion prompt dialog option to cancel deleting the collection -->
+    <string name="tab_collection_dialog_negative">Kanselahin</string>
+    <!-- Text displayed in a notification when the user enters full screen mode -->
+    <string name="full_screen_notification">Pumapasok sa full screen mode</string>
     <!-- Message for copying the URL via long press on the toolbar -->
     <string name="url_copied">Kopyahin ang URL</string>
 
+    <!-- Sample text for accessibility font size -->
+    <string name="accessibility_text_size_sample_text_1">Ito ay halimbawa lamang. Nandito ang tekstong ito para maipakita ang itsura kapag nilakihan o niliitan ang sukat sa setting na ito.</string>
+    <!-- Summary for Accessibility Text Size Scaling Preference -->
+    <string name="preference_accessibility_text_size_summary">Palakihin o paliitin ang teksto sa mga website</string>
+    <!-- Title for Accessibility Text Size Scaling Preference -->
+    <string name="preference_accessibility_font_size_title">Laki ng Font</string>
+
+    <!-- Title for Accessibility Text Automatic Size Scaling Preference -->
+    <string name="preference_accessibility_auto_size_2">Awtomatikong sukat ng font</string>
+    <!-- Summary for Accessibility Text Automatic Size Scaling Preference -->
+    <string name="preference_accessibility_auto_size_summary">Ang laki ng font ay itatapat sa setting sa iyong Android. I-disable para ma-manage ang laki ng font dito.</string>
+
+    <!-- Title for the Delete browsing data preference -->
+    <string name="preferences_delete_browsing_data">Burahin ang browsing data</string>
+    <!-- Title for the tabs item in Delete browsing data -->
+    <string name="preferences_delete_browsing_data_tabs_title_2">Mga nakabukas na tab</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 tab</string>
+    <!-- Title for the data and history items in Delete browsing data -->
+    <string name="preferences_delete_browsing_data_browsing_data_title">Kasaysayan ng pag-browse at site data</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 address</string>
+    <!-- Title for history items in Delete browsing data -->
+    <string name="preferences_delete_browsing_data_browsing_history_title">Kasaysayan</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 pahina</string>
+    <!-- Title for the cookies item in Delete browsing data -->
+    <string name="preferences_delete_browsing_data_cookies">Mga cookie</string>
+    <!-- Subtitle for the cookies item in Delete browsing data -->
+    <string name="preferences_delete_browsing_data_cookies_subtitle">Mala-log out ka sa karamihan ng mga site</string>
+    <!-- Title for the cached images and files item in Delete browsing data -->
+    <string name="preferences_delete_browsing_data_cached_files">Mga naka-cache na larawan at file</string>
+    <!-- Subtitle for the cached images and files item in Delete browsing data -->
+    <string name="preferences_delete_browsing_data_cached_files_subtitle">Nagpapaluwag ng storage space</string>
+    <!-- Title for the site permissions item in Delete browsing data -->
+    <string name="preferences_delete_browsing_data_site_permissions">Mga site permission</string>
+    <!-- Title for the downloads item in Delete browsing data -->
+    <string name="preferences_delete_browsing_data_downloads">Mga download</string>
+    <!-- Text for the button to delete browsing data -->
+    <string name="preferences_delete_browsing_data_button">Burahin ang browsing data</string>
+    <!-- Title for the Delete browsing data on quit preference -->
+    <string name="preferences_delete_browsing_data_on_quit">Burahin ang browsing data sa pag-alis</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">Kusang magbubura ng browsing data kapag pinili mo ang &quot;Umalis&quot; mula sa main menu</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">Kusang magbubura ng browsing data kapag pinili mo ang \&quot;Umalis\&quot; mula sa main menu</string>
+    <!-- Action item in menu for the Delete browsing data on quit feature -->
+    <string name="delete_browsing_data_on_quit_action">Umalis</string>
+
+    <!-- Dialog message to the user asking to delete browsing data. -->
+    <string name="delete_browsing_data_prompt_message">Buburahin nito lahat ng iyong browsing data.</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">Buburahin ng %s ang mga napiling browsing data.</string>
+    <!-- Text for the cancel button for the data deletion dialog -->
+    <string name="delete_browsing_data_prompt_cancel">Kanselahin</string>
+    <!-- Text for the allow button for the data deletion dialog -->
+    <string name="delete_browsing_data_prompt_allow">Burahin</string>
+    <!-- Text for the snackbar confirmation that the data was deleted -->
+    <string name="preferences_delete_browsing_data_snackbar">Nabura na ang browsing data</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">Binubura ang browsing data…</string>
+
+    <!-- Tips -->
+    <!-- text for firefox preview moving tip header "Firefox Preview" and "Firefox Nightly" are intentionally hardcoded -->
+    <string name="tip_firefox_preview_moved_header">Ang Firefox Preview ay Firefox Nightly na ngayon</string>
+    <!-- text for firefox preview moving tip description -->
+    <string name="tip_firefox_preview_moved_description">
+        Gabi-gabing naa-update ang Firefox Nightly at may mga eksperimental na bagong feature.
+        Subalit maaari itong maging sirain. I-download ang aming beta browser para sa mas panatag na karanasan.</string>
+    <!-- text for firefox preview moving tip button. "Firefox for Android Beta" is intentionally hardcoded -->
+    <string name="tip_firefox_preview_moved_button_2">Kunin ang Firefox para sa Android Beta</string>
+
+    <!-- text for firefox preview moving tip header. "Firefox Nightly" is intentionally hardcoded -->
+    <string name="tip_firefox_preview_moved_header_preview_installed">Lumipat na ang Firefox Nightly</string>
+    <!-- text for firefox preview moving tip description -->
+    <string name="tip_firefox_preview_moved_description_preview_installed">
+        Ang app na ito ay hindi na makatatanggap ng mga security update. Tigilan nang gamitin ang app na ito at lumipat na sa bagong Nightly.
+        \n\nPara mailipat ang iyong mga bookmark, login, at kasaysayan sa isa pang app, gumawa ng isang Firefox account.</string>
+    <!-- text for firefox preview moving tip button  -->
+    <string name="tip_firefox_preview_moved_button_preview_installed">Lumipat na sa bagong Nightly</string>
+
+    <!-- text for firefox preview moving tip header. "Firefox Nightly" is intentionally hardcoded -->
+    <string name="tip_firefox_preview_moved_header_preview_not_installed">Lumipat na ang Firefox Nightly</string>
+    <!-- text for firefox preview moving tip description -->
+    <string name="tip_firefox_preview_moved_description_preview_not_installed">
+        Ang app na ito ay hindi na makatatanggap ng mga security update. Kunin na ang bagong Nightly at tigilan nang gamitin ang app na ito.
+        \n\nPara mailipat ang iyong mga bookmark, login, at kasaysayan sa isa pang app, gumawa ng isang Firefox account.</string>
+    <!-- text for firefox preview moving tip button  -->
+    <string name="tip_firefox_preview_moved_button_preview_not_installed">Kunin na ang bagong 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">Maligayang pagdating sa %s!</string>
+    <!-- text for the Firefox Accounts section header -->
+    <string name="onboarding_fxa_section_header">Mayroon nang account?</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">Kilalanin ang %s</string>
+    <!-- text for the "What's New" onboarding card header -->
+    <string name="onboarding_whats_new_header1">Tingnan kung ano ang bago</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">May mga katanungan tungkol sa bagong-disenyong %s? Nais malaman alin ang nabago?</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">Kumuha ng mga kasagutan dito</string>
+    <!-- text for the Firefox account onboarding sign in card header -->
+    <string name="onboarding_account_sign_in_header">Magsimulang mag-sync ng mga bookmark, password, at iba pa gamit ang iyong Firefox account.</string>
+
+    <!-- Text for the button to learn more about signing in to your Firefox account -->
+    <string name="onboarding_manual_sign_in_learn_more">Alamin</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">Naka-sign in ka bilang %s sa isa pang Firefox browser sa device na ito. Nais mo bang mag-sign in gamit ito?</string>
+    <!-- text for the button to confirm automatic sign-in -->
+    <string name="onboarding_firefox_account_auto_signin_confirm">Oo, i-sign in mo ako</string>
+    <!-- text for the automatic sign-in button while signing in is in process -->
+    <string name="onboarding_firefox_account_signing_in">Nagsa-sign 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">Mag-sign in sa 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">Manatiling naka-sign out</string>
+    <!-- text to display in the snackbar once account is signed-in -->
+    <string name="onboarding_firefox_account_sync_is_on">Nakabukas ang 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">Bigong makapag-sign-in</string>
+    <!-- text for the tracking protection onboarding card header -->
+    <string name="onboarding_tracking_protection_header_2">Awtomatikong pribasiya</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">Hinaharang ng mga setting ng pribasiya at seguridad ang mga tracker, malware, at kumpanyang nagmamanman sa iyo.</string>
+    <!-- text for tracking protection radio button option for standard level of blocking -->
+    <string name="onboarding_tracking_protection_standard_button_2">Karaniwan (default)</string>
+    <!-- text for standard blocking option button description -->
+    <string name="onboarding_tracking_protection_standard_button_description_2">Humaharang ng mas kaunting mga tracker. Normal na maglo-load ang mga pahina.</string>
+    <!-- text for tracking protection radio button option for strict level of blocking -->
+    <string name="onboarding_tracking_protection_strict_button">Mahigpit (inirerekomenda)</string>
+    <!-- text for tracking protection radio button option for strict level of blocking -->
+    <string name="onboarding_tracking_protection_strict_option">Mahigpit</string>
+    <!-- text for strict blocking option button description -->
+    <string name="onboarding_tracking_protection_strict_button_description_2">Humaharang ng mas maraming mga tracker, ad, at popup. Mas mabilis maglo-load ang mga pahina, pero baka may mga bagay na hindi gagana.</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">Makibaka</string>
+    <!-- text for the toolbar position card description -->
+    <string name="onboarding_toolbar_position_description">Subukan ang pag-browse sa isang kamay gamit ang toolbar sa ibaba o ilipat ito sa tuktok.</string>
+    <!-- text for the private browsing onboarding card header -->
+    <string name="onboarding_private_browsing_header">Mag-browse nang pribado</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">Magbukas ng isang pribadong tab: I-tap ang %s icon.</string>
+    <!-- text for the private browsing onboarding card description, explaining how to always using private browsing -->
+    <string name="onboarding_private_browsing_always_description">Magbukas ng pribadong tab sa bawat pagkakataon: I-update ang iyong mga setting sa pribadong pag-browse.</string>
+    <!-- text for the private browsing onbording card button, that launches settings -->
+    <string name="onboarding_private_browsing_button">Buksan ang mga setting</string>
+    <!-- text for the privacy notice onboarding card header -->
+    <string name="onboarding_privacy_notice_header">Ang iyong pribasiya</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_description2">Dinisenyo namin ang %s para bigyan ka ng kontrol sa mga ibinahabagi mo online at kung ano ang ibinabahagi mo sa amin.</string>
+    <!-- Text for the button to read the privacy notice -->
+    <string name="onboarding_privacy_notice_read_button">Basahin ang aming paunawa sa privacy</string>
+    <!-- Content description (not visible, for screen readers etc.): Close onboarding screen -->
+    <string name="onboarding_close">Isara</string>
+
+    <!-- text for the button to finish onboarding -->
+    <string name="onboarding_finish">Simulan nang mag-browse</string>
+
+    <!-- Onboarding theme -->
+    <!-- text for the theme picker onboarding card header -->
+    <string name="onboarding_theme_picker_header">Pumili ng iyong tema</string>
+    <!-- text for the theme picker onboarding card description -->
+    <string name="onboarding_theme_picker_description1">Makatipid sa baterya at iyong paningin gamit ang dark mode.</string>
+    <!-- Automatic theme setting (will follow device setting) -->
+    <string name="onboarding_theme_automatic_title">Kusa</string>
+    <!-- Summary of automatic theme setting (will follow device setting) -->
+    <string name="onboarding_theme_automatic_summary">Umaangkop sa mga setting ng iyong device</string>
+    <!-- Theme setting for dark mode -->
+    <string name="onboarding_theme_dark_title">Madilim na tema</string>
+    <!-- Theme setting for light mode -->
+    <string name="onboarding_theme_light_title">Maliwanag na tema</string>
+
+    <!-- Text shown in snackbar when multiple tabs have been sent to device -->
+    <string name="sync_sent_tabs_snackbar">Napadala na ang mga tab!</string>
+    <!-- Text shown in snackbar when one tab has been sent to device  -->
+    <string name="sync_sent_tab_snackbar">Napadala na ang tab!</string>
+    <!-- Text shown in snackbar when sharing tabs failed  -->
+    <string name="sync_sent_tab_error_snackbar">Bigong mapadala</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">SUBUKAN MULI</string>
+    <!-- Title of QR Pairing Fragment -->
+    <string name="sync_scan_code">i-Scan ang code</string>
+    <!-- Instructions on how to access pairing -->
+    <string name="sign_in_instructions"><![CDATA[Buksan ang Firefox sa computer mo at pumunta sa <b>https://firefox.com/pair</b>]]></string>
+    <!-- Text shown for sign in pairing when ready -->
+    <string name="sign_in_ready_for_scan">Handa nang mag-scan</string>
+    <!-- Text shown for settings option for sign with pairing -->
+    <string name="sign_in_with_camera">Mag-sign in gamit ang iyong camera</string>
+    <!-- Text shown for settings option for sign with email -->
+    <string name="sign_in_with_email">Gumamit na lang ng email</string>
+    <!-- Text shown for settings option for create new account text.'Firefox' intentionally hardcoded here.-->
+    <string name="sign_in_create_account_text"><![CDATA[Walang account? <u>Gumawa ng isa</u> para makapag-sync ng Firefox sa mga device.]]></string>
+    <!-- Text shown in confirmation dialog to sign out of account -->
+    <string name="sign_out_confirmation_message">Titigil na ang Firefox sa pag-sync sa iyong account, pero hindi nito buburahin ang kahit anong browsing data sa device na ito.</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">Titigil na ang %s sa pag-sync sa iyong account, pero hindi nito buburahin ang kahit anong browsing data sa device na ito.</string>
+    <!-- Option to continue signing out of account shown in confirmation dialog to sign out of account -->
+    <string name="sign_out_disconnect">Mag-disconnect</string>
+    <!-- Option to cancel signing out shown in confirmation dialog to sign out of account -->
+    <string name="sign_out_cancel">Kanselahin</string>
+    <!-- Error message snackbar shown after the user tried to select a default folder which cannot be altered -->
+    <string name="bookmark_cannot_edit_root">Hindi ma-edit ang mga default folder</string>
+
+    <!-- Enhanced Tracking Protection -->
+    <!-- Link displayed in enhanced tracking protection panel to access tracking protection settings -->
+    <string name="etp_settings">Mga Protection Setting</string>
+    <!-- Preference title for enhanced tracking protection settings -->
+    <string name="preference_enhanced_tracking_protection">Enhanced Tracking Protection</string>
+    <!-- Title for the description of enhanced tracking protection -->
+    <string name="preference_enhanced_tracking_protection_explanation_title">Mag-browse nang hindi sinusundan</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">Itago mo ang data na para sa iyo lamang. Pinoprotektahan ka ng %s mula sa mga pinakakaraniwang tracker na nagmamanman sa mga gawain mo online.</string>
+    <!-- Text displayed that links to website about enhanced tracking protection -->
+    <string name="preference_enhanced_tracking_protection_explanation_learn_more">Alamin</string>
+    <!-- Preference for enhanced tracking protection for the standard protection settings -->
+    <string name="preference_enhanced_tracking_protection_standard_default_1">Karaniwan (default)</string>
+    <!-- Preference description for enhanced tracking protection for the standard protection settings -->
+    <string name="preference_enhanced_tracking_protection_standard_description_3">Humaharang ng mas kaunting mga tracker. Normal na maglo-load ang mga pahina.</string>
+    <!--  Accessibility text for the Standard protection information icon  -->
+    <string name="preference_enhanced_tracking_protection_standard_info_button">Ano ang mga hinaharang sa karaniwang tracking protection</string>
+    <!-- Preference for enhanced tracking protection for the strict protection settings -->
+    <string name="preference_enhanced_tracking_protection_strict">Mahigpit</string>
+    <!-- Preference description for enhanced tracking protection for the strict protection settings -->
+    <string name="preference_enhanced_tracking_protection_strict_description_2">Humaharang ng mas maraming mga tracker, ad, at popup. Mas mabilis maglo-load ang mga pahina, pero baka may mga bagay na hindi gagana.</string>
+    <!--  Accessibility text for the Strict protection information icon  -->
+    <string name="preference_enhanced_tracking_protection_strict_info_button">Ano ang mga hinaharang sa mahigpit na tracking protection</string>
+    <!-- Preference for enhanced tracking protection for the custom protection settings -->
+    <string name="preference_enhanced_tracking_protection_custom">Pasadya</string>
+
+    <!-- Preference description for enhanced tracking protection for the strict protection settings -->
+    <string name="preference_enhanced_tracking_protection_custom_description_2">Piliin kung aling mga tracker at script ang dapat harangin.</string>
+    <!--  Accessibility text for the Strict protection information icon  -->
+    <string name="preference_enhanced_tracking_protection_custom_info_button">Ano ang mga hinaharang sa pasadyang tracking protection</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">Mga cookie</string>
+    <!-- Option for enhanced tracking protection for the custom protection settings for cookies-->
+    <string name="preference_enhanced_tracking_protection_custom_cookies_1">Mga cross-site at social media tracker</string>
+    <!-- Option for enhanced tracking protection for the custom protection settings for cookies-->
+    <string name="preference_enhanced_tracking_protection_custom_cookies_2">Mga cookie mula sa mga hindi pa nabisitang site</string>
+    <!-- Option for enhanced tracking protection for the custom protection settings for cookies-->
+    <string name="preference_enhanced_tracking_protection_custom_cookies_3">Lahat ng mga third-party na cookie (maaaring maging sanhi upang masira ang mga website)</string>
+    <!-- Option for enhanced tracking protection for the custom protection settings for cookies-->
+    <string name="preference_enhanced_tracking_protection_custom_cookies_4">Lahat ng mga cookie (tiyak na ikasisira ng mga website)</string>
+    <!-- Preference for enhanced tracking protection for the custom protection settings for tracking content -->
+    <string name="preference_enhanced_tracking_protection_custom_tracking_content">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">Sa lahat ng mga tab</string>
+    <!-- Option for enhanced tracking protection for the custom protection settings for tracking content-->
+    <string name="preference_enhanced_tracking_protection_custom_tracking_content_2">Sa mga Pribadong tab lamang</string>
+    <!-- Option for enhanced tracking protection for the custom protection settings for tracking content-->
+    <string name="preference_enhanced_tracking_protection_custom_tracking_content_3">Sa mga Pasadyang tab lamang</string>
+    <!-- Preference for enhanced tracking protection for the custom protection settings -->
+    <string name="preference_enhanced_tracking_protection_custom_cryptominers">Mga cryptominer</string>
+    <!-- Preference for enhanced tracking protection for the custom protection settings -->
+    <string name="preference_enhanced_tracking_protection_custom_fingerprinters">Mga fingerprinter</string>
+    <string name="enhanced_tracking_protection_blocked">Hinarang</string>
+    <!-- Header for categories that are being not being blocked by current Enhanced Tracking Protection settings -->
+    <string name="enhanced_tracking_protection_allowed">Pinapayagan</string>
+    <!-- Category of trackers (social media trackers) that can be blocked by Enhanced Tracking Protection -->
+    <string name="etp_social_media_trackers_title">Mga Social Media Tracker</string>
+    <!-- Description of social media trackers that can be blocked by Enhanced Tracking Protection -->
+    <string name="etp_social_media_trackers_description">Nililimitahan ang kakayahan ng mga social network para subaybayan ang iyong browsing activity sa web.</string>
+    <!-- Category of trackers (cross-site tracking cookies) that can be blocked by Enhanced Tracking Protection -->
+    <string name="etp_cookies_title">Mga Cross-Site Tracking Cookie</string>
+    <!-- Description of cross-site tracking cookies that can be blocked by Enhanced Tracking Protection -->
+    <string name="etp_cookies_description">Hinaharang ang mga cookie na ginagamit ng mga ad network at analytics company para pagsama-samahin ang iyong browsing data sa iba\'t-ibang mga site.</string>
+    <!-- Category of trackers (cryptominers) that can be blocked by Enhanced Tracking Protection -->
+    <string name="etp_cryptominers_title">Mga cryptominer</string>
+    <!-- Description of cryptominers that can be blocked by Enhanced Tracking Protection -->
+    <string name="etp_cryptominers_description">Pinipigilan ang mga mapanghamak na script sa pag-access sa device mo para magmina ng digital currency.</string>
+    <!-- Category of trackers (fingerprinters) that can be blocked by Enhanced Tracking Protection -->
+    <string name="etp_fingerprinters_title">Mga fingerprinter</string>
+    <!-- Description of fingerprinters that can be blocked by Enhanced Tracking Protection -->
+    <string name="etp_fingerprinters_description">Pinipigilang makolekta ang mga bukod-tanging data ng pagkakakilanlan sa device mo na pwedeng gamitin sa pagsubaybay.</string>
+    <!-- Category of trackers (tracking content) that can be blocked by Enhanced Tracking Protection -->
+    <string name="etp_tracking_content_title">Tracking Content</string>
+    <!-- Description of tracking content that can be blocked by Enhanced Tracking Protection -->
+    <string name="etp_tracking_content_description">Pinipigilang mag-load ang mga panlabas na mga ad, video, at iba pang content na nagtataglay ng tracking code. Maaaring maapektuhan ang ilang aspeto ng website.</string>
+    <!-- Enhanced Tracking Protection Onboarding Message shown in a dialog above the toolbar. The first parameter is the name of the application (For example: Fenix) -->
+    <string name="etp_onboarding_cfr_message">Tuwing kulay lila ang kalasag, may naharang na mga tracker ang %s sa site. I-tap para sa karagdagang impormasyon.</string>
+    <!-- Enhanced Tracking Protection message that protection is currently on for this site -->
+    <string name="etp_panel_on">NAKABUKAS ang mga protection sa site na ito</string>
+    <!-- Enhanced Tracking Protection message that protection is currently off for this site -->
+    <string name="etp_panel_off">SARADO ang mga protection sa site na ito</string>
+    <!-- Header for exceptions list for which sites enhanced tracking protection is always off -->
+    <string name="enhanced_tracking_protection_exceptions">Sarado ang Enhanced Tracking Protection sa mga website na ito</string>
+    <!-- Content description (not visible, for screen readers etc.): Navigate
+    back from ETP details (Ex: Tracking content) -->
+    <string name="etp_back_button_content_description">Bumalik</string>
+    <!-- About page Your rights link text -->
+    <string name="about_your_rights">Ang iyong mga karapatan</string>
+    <!-- About page link text to open open source licenses screen -->
+    <string name="about_open_source_licenses">Mga open source library na ginagamit namin</string>
+    <!-- About page link text to open what's new link -->
+    <string name="about_whats_new">Ano’ng bago sa %s</string>
+    <!-- Open source licenses page title
+    The first parameter is the app name -->
+    <string name="open_source_licenses_title">%s | Mga OSS Library</string>
+    <!-- Category of trackers (redirect trackers) that can be blocked by Enhanced Tracking Protection -->
+    <string name="etp_redirect_trackers_title">Mga Redirect Tracker</string>
+
+    <!-- Description of redirect tracker cookies that can be blocked by Enhanced Tracking Protection -->
+    <string name="etp_redirect_trackers_description">Inaalis ang mga cookie na itinakda ng mga redirect sa mga kilalang tracking website.</string>
+
+    <!-- About page link text to open support link -->
+    <string name="about_support">Suporta</string>
+    <!-- About page link text to list of past crashes (like about:crashes on desktop) -->
+    <string name="about_crashes">Mga crash</string>
+    <!-- About page link text to open privacy notice link -->
+    <string name="about_privacy_notice">Paunawa sa privacy</string>
+    <!-- About page link text to open know your rights link -->
+    <string name="about_know_your_rights">Alamin ang iyong mga karapatan</string>
+    <!-- About page link text to open licensing information link -->
+    <string name="about_licensing_information">Impormasyon sa paglisensiya</string>
+    <!-- About page link text to open a screen with libraries that are used -->
+    <string name="about_other_open_source_libraries">Mga library na ginagamit namin</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">Debug menu: %1$d natitirang click para ma-enable</string>
+    <string name="about_debug_menu_toast_done">Naka-enable na ang debug menu</string>
+
+    <!-- Content description of the tab counter toolbar button when one tab is open -->
+    <string name="tab_counter_content_description_one_tab">1 tab</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 tab</string>
+
     <!-- Browser long press popup menu -->
     <!-- Copy the current url -->
     <string name="browser_toolbar_long_press_popup_copy">Kopyahin</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">i-Paste at Puntahan</string>
+    <!-- Paste the text in the clipboard -->
+    <string name="browser_toolbar_long_press_popup_paste">i-Paste</string>
+    <!-- Snackbar message shown after an URL has been copied to clipboard. -->
+    <string name="browser_toolbar_url_copied_to_clipboard_snackbar">Nakopya na ang URL sa clipboard</string>
+
+    <!-- Title text for the Add To Homescreen dialog -->
+    <string name="add_to_homescreen_title">Idagdag sa Home screen</string>
+
+    <!-- Cancel button text for the Add to Homescreen dialog -->
+    <string name="add_to_homescreen_cancel">Kanselahin</string>
+    <!-- Add button text for the Add to Homescreen dialog -->
+    <string name="add_to_homescreen_add">Idagdag</string>
+    <!-- Continue to website button text for the first-time Add to Homescreen dialog -->
+    <string name="add_to_homescreen_continue">Magpatuloy sa website</string>
+    <!-- Placeholder text for the TextView in the Add to Homescreen dialog -->
+    <string name="add_to_homescreen_text_placeholder">Pangalan ng shortcut</string>
+    <!-- Describes the add to homescreen functionality -->
+    <string name="add_to_homescreen_description_2">Madali lang maidagdag ang website na ito sa Home screen ng iyong device para agarang ma-access at ma-browse na parang app lamang.</string>
+
+    <!-- Preference for managing the settings for logins and passwords in Fenix -->
+    <string name="preferences_passwords_logins_and_passwords">Mga login at password</string>
+    <!-- Preference for managing the saving of logins and passwords in Fenix -->
+    <string name="preferences_passwords_save_logins">i-Save ang mga login at password</string>
+    <!-- Preference option for asking to save passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_ask_to_save">Tanungin kung ise-save</string>
+    <!-- Preference option for never saving passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_never_save">Huwag mag-save kailanman</string>
+    <!-- Preference for autofilling saved logins in Fenix -->
+    <string name="preferences_passwords_autofill">Autofill</string>
+    <!-- Preference for syncing saved logins in Fenix -->
+    <string name="preferences_passwords_sync_logins">Mag-sync ng mga login</string>
+    <!-- Syncing saved logins in Fenix is on -->
+    <string name="preferences_passwords_sync_logins_on">Nakabukas</string>
+    <!-- Syncing saved logins in Fenix is off -->
+    <string name="preferences_passwords_sync_logins_off">Nakasara</string>
+    <!-- Syncing saved logins in Fenix needs reconnect to sync -->
+    <string name="preferences_passwords_sync_logins_reconnect">Kumonekta muli</string>
+    <!-- Syncing saved logins in Fenix needs login -->
+    <string name="preferences_passwords_sync_logins_sign_in">Mag-sign in sa Sync</string>
+    <!-- Preference to access list of saved logins -->
+    <string name="preferences_passwords_saved_logins">Mga naka-save na login</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text">Ang mga login na naka-save o naka-sync sa %s ay magpapakita rito.</string>
+    <!-- Preference to access list of saved logins -->
+    <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Alamin ang tungkol sa Sync.</string>
+    <!-- Preference to access list of login exceptions that we never save logins for -->
+    <string name="preferences_passwords_exceptions">Mag exception</string>
+    <!-- Empty description of list of login exceptions that we never save logins for -->
+    <string name="preferences_passwords_exceptions_description_empty">Ang mga login at password na hindi naka-save ay ipapakita rito.</string>
+    <!-- Description of list of login exceptions that we never save logins for -->
+    <string name="preferences_passwords_exceptions_description">Hindi ise-save ang mga login at password para sa mga site na ito.</string>
+    <!-- Text on button to remove all saved login exceptions -->
+    <string name="preferences_passwords_exceptions_remove_all">Burahin lahat ng mga exception</string>
+    <!-- Hint for search box in logins list -->
+    <string name="preferences_passwords_saved_logins_search">Hanapin sa mga login</string>
+    <!-- Option to sort logins list A-Z, alphabetically -->
+    <string name="preferences_passwords_saved_logins_alphabetically">Alpabetikal</string>
+    <!-- Option to sort logins list by most recently used -->
+    <string name="preferences_passwords_saved_logins_recently_used">Ginamit kamakailan</string>
+    <!-- The header for the site that a login is for -->
+    <string name="preferences_passwords_saved_logins_site">Site</string>
+    <!-- The header for the username for a login -->
+    <string name="preferences_passwords_saved_logins_username">Username</string>
+    <!-- The header for the password for a login -->
+    <string name="preferences_passwords_saved_logins_password">Password</string>
+    <!-- Message displayed in security prompt to reenter a secret pin to access saved logins -->
+    <string name="preferences_passwords_saved_logins_enter_pin">Muling ipasok ang PIN</string>
+    <!-- Message displayed in security prompt to access saved logins -->
+    <string name="preferences_passwords_saved_logins_enter_pin_description">i-Unlock para makita ang mga naka-save na login</string>
+    <!-- Message displayed when a connection is insecure and we detect the user is entering a password -->
+    <string name="logins_insecure_connection_warning">Ang koneksyong ito ay di-ligtas. Maaaring makompromiso ang mga login na ipapasok dito.</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">Alamin</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">Gusto mo bang i-save ng %s ang login na ito?</string>
+    <!-- Positive confirmation that Fenix should save the new or updated login -->
+    <string name="logins_doorhanger_save_confirmation">i-Save</string>
+    <!-- Negative confirmation that Fenix should not save the new or updated login -->
+    <string name="logins_doorhanger_save_dont_save">Huwag i-save</string>
+    <!-- Shown in snackbar to tell user that the password has been copied -->
+    <string name="logins_password_copied">Nakopya na ang password sa clipboard</string>
+    <!-- Shown in snackbar to tell user that the username has been copied -->
+    <string name="logins_username_copied">Nakopya na ang username sa clipboard</string>
+    <!-- Shown in snackbar to tell user that the site has been copied -->
+    <string name="logins_site_copied">Nakopya na ang site sa clipboard</string>
     <!-- Content Description (for screenreaders etc) read for the button to copy a password in logins-->
     <string name="saved_logins_copy_password">Kopyahin ang 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">Alisin ang password</string>
     <!-- Content Description (for screenreaders etc) read for the button to copy a username in logins -->
     <string name="saved_login_copy_username">Kopyahin ang 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">Alisin ang username</string>
     <!-- Content Description (for screenreaders etc) read for the button to copy a site in logins -->
     <string name="saved_login_copy_site">Kopyahin ang site</string>
 
-    </resources>
+    <!-- Content Description (for screenreaders etc) read for the button to open a site in logins -->
+    <string name="saved_login_open_site">Buksan ang site sa browser</string>
+    <!-- Content Description (for screenreaders etc) read for the button to reveal a password in logins -->
+    <string name="saved_login_reveal_password">Ipakita ang password</string>
+    <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
+    <string name="saved_login_hide_password">Itago ang password</string>
+    <!-- Message displayed in biometric prompt displayed for authentication before allowing users to view their logins -->
+    <string name="logins_biometric_prompt_message">i-Unlock para makita ang mga naka-save na login</string>
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title">Pakaingatan ang iyong mga login at password</string>
+
+    <!-- Message of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_message">Magtakda ng device lock pattern, PIN, o password para maprotektahan ang mga naka-save mong login at password sakaling may ibang may hawak sa device mo.</string>
+    <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_later">Mamaya</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">Mag-set up ngayon din</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">i-Unlock ang iyong device</string>
+    <!-- Title for Accessibility Force Enable Zoom Preference -->
+    <string name="preference_accessibility_force_enable_zoom">Mag-zoom sa lahat ng mga website</string>
+    <!-- Summary for Accessibility Force Enable Zoom Preference -->
+    <string name="preference_accessibility_force_enable_zoom_summary">Paganahin para makapag-pinch at zoom, kahit sa mga website na pinipigilan ang gesture na ito.</string>
+    <!-- Saved logins sorting strategy menu item -by name- (if selected, it will sort saved logins alphabetically) -->
+    <string name="saved_logins_sort_strategy_alphabetically">Pangalan (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">Huling ginamit</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">Menu sa pagsunud-sunod ng login</string>
+
+    <!-- Title of the Add search engine screen -->
+    <string name="search_engine_add_custom_search_engine_title">Magdagdag ng search engine</string>
+    <!-- Title of the Edit search engine screen -->
+    <string name="search_engine_edit_custom_search_engine_title">i-Edit ang search engine</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">Magdagdag</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">i-Save</string>
+    <!-- Text for the menu button to edit a search engine -->
+    <string name="search_engine_edit">i-Edit</string>
+    <!-- Text for the menu button to delete a search engine -->
+    <string name="search_engine_delete">Burahin</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">Iba pa</string>
+    <!-- Placeholder text shown in the Search Engine Name TextField before a user enters text -->
+    <string name="search_add_custom_engine_name_hint">Pangalan</string>
+
+    <!-- Placeholder text shown in the Search String TextField before a user enters text -->
+    <string name="search_add_custom_engine_search_string_hint">Gagamiting teksto ng paghahanap</string>
+    <!-- Description text for the Search String TextField. The %s is part of the string -->
+    <string name="search_add_custom_engine_search_string_example">Palitan ang query ng “%s”. Halimbawa:\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">Alamin</string>
+    <!-- Accessibility description for the form in which details about the custom search engine are entered -->
+    <string name="search_add_custom_engine_form_description">Pasadyang detalye ng search engine</string>
+
+    <!-- Accessibility description for the 'Learn more' link -->
+    <string name="search_add_custom_engine_learn_more_description">Link para sa Alamin</string>
+
+    <!-- Text shown when a user leaves the name field empty -->
+    <string name="search_add_custom_engine_error_empty_name">Ipasok ang pangalan ng search engine</string>
+    <!-- Text shown when a user tries to add a search engine that already exists -->
+    <string name="search_add_custom_engine_error_existing_name">Mayroon nang search engine na nagngangalang “%s”.</string>
+    <!-- Text shown when a user leaves the search string field empty -->
+    <string name="search_add_custom_engine_error_empty_search_string">Magpasok ng search string</string>
+    <!-- Text shown when a user leaves out the required template string -->
+    <string name="search_add_custom_engine_error_missing_template">Siguruhing tugma ang search string sa format ng halimbawa</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">Nagkaproblema kumonekta sa “%s”</string>
+    <!-- Text shown when a user creates a new search engine -->
+    <string name="search_add_custom_engine_success_message">Nalikha na ang %s</string>
+    <!-- Text shown when a user successfully edits a custom search engine -->
+    <string name="search_edit_custom_engine_success_message">Nai-save na ang %s</string>
+    <!-- Text shown when a user successfully deletes a custom search engine -->
+    <string name="search_delete_search_engine_success_message">Nabura na ang %s</string>
+
+    <!-- Title text shown for the migration screen to the new browser. Placeholder replaced with app name -->
+    <string name="migration_title">Maligayang pagdating sa isang bagung-bagong %s</string>
+    <!-- Description text followed by a list of things migrating (e.g. Bookmarks, History). Placeholder replaced with app name-->
+    <string name="migration_description">Nasa harapan mo ang isang bagong-disenyong browser, na pinaghusay ang performance at mga feature na makatutulong sa iyo nang husto online.\n\nMangyaring maghintay habang ina-update namin ang %s kasama ang iyong</string>
+    <!-- Text on the disabled button while in progress. Placeholder replaced with app name -->
+    <string name="migration_updating_app_button_text">Ina-update ang %s…</string>
+    <!-- Text on the enabled button. Placeholder replaced with app name-->
+    <string name="migration_update_app_button">Simulan ang %s</string>
+    <!-- Accessibility description text for a completed migration item -->
+    <string name="migration_icon_description">Tapos na ang pag-angkat</string>
+    <!--Text on list of migrated items (e.g. Settings, History, etc.)-->
+    <string name="migration_text_passwords">Mga password</string>
+
+    <!-- Heading for the instructions to allow a permission -->
+    <string name="phone_feature_blocked_intro">Para payagan ito:</string>
+    <!-- First step for the allowing a permission -->
+    <string name="phone_feature_blocked_step_settings">1. Pumunta sa Android Settings</string>
+    <!-- Second step for the allowing a permission -->
+    <string name="phone_feature_blocked_step_permissions"><![CDATA[2. i-Tap ang <b>Mga pahintulot</b>]]></string>
+    <!-- Third step for the allowing a permission (Fore example: Camera) -->
+    <string name="phone_feature_blocked_step_feature"><![CDATA[3. i-Toggle ang <b>%1$s</b> sa nakabukas]]></string>
+
+    <!-- Label that indicates a site is using a secure connection -->
+    <string name="quick_settings_sheet_secure_connection">Ligtas na Koneksyon</string>
+    <!-- Label that indicates a site is using a insecure connection -->
+    <string name="quick_settings_sheet_insecure_connection">Hindi Ligtas na Koneksyon</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">Sigurado ka bang gusto mong alisin lahat ng mga pahintulot sa lahat ng mga site?</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">Sigurado ka bang gusto mong alisin lahat ng mga pahintulot sa site na ito?</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">Sigurado ka bang gusto mong alisin itong pahintulot sa site na ito?</string>
+    <!-- label shown when there are not site exceptions to show in the site exception settings -->
+    <string name="no_site_exceptions">Walang mga site exception</string>
+    <!-- Label for the Pocket default top site -->
+    <string name="pocket_top_articles">Mga Pangunahing Artikulo</string>
+    <!-- Bookmark deletion confirmation -->
+    <string name="bookmark_deletion_confirmation">Sigurado ka bang gusto mong burahin itong bookmark?</string>
+    <!-- Browser menu button that adds a top site to the home fragment -->
+    <string name="browser_menu_add_to_top_sites">Idagdag sa mga top site</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">Pinatunayan Ni: %1$s</string>
+    <!-- Login overflow menu delete button -->
+    <string name="login_menu_delete_button">Burahin</string>
+    <!-- Login overflow menu edit button -->
+    <string name="login_menu_edit_button">i-Edit</string>
+    <!-- Message in delete confirmation dialog for logins -->
+    <string name="login_deletion_confirmation">Sigurado ka bang gusto mong burahin itong login?</string>
+    <!-- Positive action of a dialog asking to delete  -->
+    <string name="dialog_delete_positive">Burahin</string>
+    <!--  The saved login options menu description. -->
+    <string name="login_options_menu">Mga pagpipilian sa login</string>
+    <!--  The editable text field for a login's web address. -->
+    <string name="saved_login_hostname_description">Ang editable text field para sa web address ng login.</string>
+    <!--  The editable text field for a login's username. -->
+    <string name="saved_login_username_description">Ang editable text field para sa username ng login.</string>
+    <!--  The editable text field for a login's password. -->
+    <string name="saved_login_password_description">Ang editable text field para sa password ng login.</string>
+    <!--  The button description to save changes to an edited login. -->
+    <string name="save_changes_to_login">i-Save ang mga pagbabago sa login.</string>
+    <!--  The button description to discard changes to an edited login. -->
+    <string name="discard_changes">Isantabi ang mga pagbabago</string>
+    <!--  The page title for editing a saved login. -->
+    <string name="edit">i-Edit</string>
+    <!--  The error message in edit login view when password field is blank. -->
+    <string name="saved_login_password_required">Kinakailangan ang password</string>
+    <!-- Voice search button content description  -->
+    <string name="voice_search_content_description">Paghanap gamit ang boses</string>
+    <!-- Voice search prompt description displayed after the user presses the voice search button -->
+    <string name="voice_search_explainer">Magsalita na</string>
+    <!--  The error message in edit login view when a duplicate username exists. -->
+    <string name="saved_login_duplicate">Mayroon nang login na may ganyang username</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">Magkonekta ng isa pang device.</string>
+    <!-- Text displayed asking user to re-authenticate -->
+    <string name="synced_tabs_reauth">Mangyaring mag-re-authenticate.</string>
+    <!-- Text displayed when user has disabled tab syncing in Firefox Sync Account -->
+    <string name="synced_tabs_enable_tab_syncing">Paki-enable ang pag-sync ng tab.</string>
+    <!-- Text displayed when user has no tabs that have been synced -->
+    <string name="synced_tabs_no_tabs">Wala kang mga nakabukas na tab sa Firefox sa iba mo pang mga device.</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">Tingnan ang listahan ng mga tab mula sa iba mong mga device.</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">Mag-sign in sa sync</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">Walang nakabukas na mga tab</string>
+
+    <!-- Top Sites -->
+    <!-- Title text displayed in the dialog when top sites limit is reached. -->
+    <string name="top_sites_max_limit_title">Naabot na ang hangganan ng bilang sa top site</string>
+    <!-- Content description text displayed in the dialog when top sites limit is reached. -->
+    <string name="top_sites_max_limit_content_2">Magtanggal ng isa para makapagdagdag ng bagong pangunahing site. Pindutin nang matagal ang site at piliin ang tanggalin.</string>
+    <!-- Confirmation dialog button text when top sites limit is reached. -->
+    <string name="top_sites_max_limit_confirmation_button">OK, Nakuha ko</string>
+    <!-- Label for the show most visited sites preference -->
+    <string name="top_sites_toggle_top_frecent_sites">Ipakita ang pinakamadalas na bisitahing site</string>
+
+    <!-- Title text displayed in the rename top site dialog. -->
+	<string name="top_sites_rename_dialog_title">Pangalan</string>
+	<!-- Hint for renaming title of a top site -->
+	<string name="top_site_name_hint">Pangalan ng pangunahing site</string>
+	<!-- Button caption to confirm the renaming of the top site. -->
+	<string name="top_sites_rename_dialog_ok">OK</string>
+	<!-- Dialog button text for canceling the rename top site prompt. -->
+	<string name="top_sites_rename_dialog_cancel">Kanselahin</string>
+
+    <!-- Content description for close button in collection placeholder. -->
+    <string name="remove_home_collection_placeholder_content_description">Tanggalin</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">Sulitin ang %s.</string>
+
+    <!-- Content description radio buttons with a link to more information -->
+    <string name="radio_preference_info_content_description">Pindutin para sa karagdagang detalye</string>
+
+    <!-- Deprecated: No Open Tabs Message Header -->
+    <string name="no_collections_header1">Kolektahin ang mga bagay na mahalaga sa iyo</string>
+    <!-- Deprecated: Label to describe what collections are to a new user without any collections -->
+    <string name="no_collections_description1">Pangkatin ang mga magkakatulad na hinahanap, site, at tab para madaling makuha sa susunod.</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">Naka-sign in ka bilang %s sa isa pang Firefox browser sa teleponong ito. Nais mo bang mag-sign in gamit ito?</string>
+    <!-- Deprecated: Describes the add to homescreen functionality -->
+    <string name="add_to_homescreen_description">Madali lang maidagdag ang website na ito sa Home screen ng iyong telepono para agarang ma-access at ma-browse na parang app lamang.</string>
+</resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index f6016615c..cc9cdc8df 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -181,6 +181,8 @@
     <!-- Browser menu button to configure reader mode appearance e.g. the used font type and size -->
     <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>
     <!-- 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>
@@ -218,6 +220,11 @@
     <!-- Search suggestion onboarding hint Learn more link text -->
     <string name="search_suggestions_onboarding_learn_more_link">Daha fazla bilgi al</string>
 
+    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <string name="search_engine_suggestions_title">%s ile ara</string>
+    <!-- Search engine suggestion description text -->
+    <string name="search_engine_suggestions_description">Doğrudan adres çubuğundan arama yapın</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
     <string name="search_widget_content_description">Yeni Firefox sekmesi aç</string>
@@ -887,16 +894,22 @@
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Kapalı</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">Ses ve videoya izin ver</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Ses ve videoya izin ver</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Ses ve videoyu yalnızca hücresel veride engelle</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">Ses ve videolar yalnızca Wi-Fi’da oynatılacak</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">Yalnızca sesi engelle</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Yalnızca sesi engelle</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Ses ve videoyu engelle</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Ses ve videoyu engelle</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">Açık</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index aca454f05..984dc782d 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -69,7 +69,7 @@
 
     <!-- Private mode shortcut "contextual feature recommendation" (CFR) -->
     <!-- Text for the main message -->
-    <string name="cfr_message">Додайте ярлик для відкриття приватних вкладок з головного екрану.</string>
+    <string name="cfr_message">Додайте ярлик для відкриття приватних вкладок з головного екрана.</string>
     <!-- Text for the positive button -->
     <string name="cfr_pos_button_text">Додати ярлик</string>
     <!-- Text for the negative button -->
@@ -182,6 +182,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>
     <!-- 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>
@@ -219,6 +221,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>
@@ -522,7 +529,7 @@
     <!-- Option in Library to open Sessions page -->
     <string name="library_sessions">Сеанси</string>
     <!-- Option in Library to open Screenshots page -->
-    <string name="library_screenshots">Знімки екрану</string>
+    <string name="library_screenshots">Знімки екрана</string>
     <!-- Option in Library to open Downloads page -->
     <string name="library_downloads">Завантаження</string>
     <!-- Option in library to open Bookmarks page -->
@@ -893,16 +900,22 @@
     <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 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">Дозволити аудіо та відео</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 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">Блокувати лише аудіо</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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 -->
@@ -1079,7 +1092,7 @@
     <!-- 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>
+    <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 -->
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index 45ee1537f..d43fd38a6 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -77,6 +77,8 @@
     <!-- 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">کیمرے تک رسائی کی ضرورت ہے۔ Android کی ترتیبات پر جائیں ، اجازتیں ٹیپ کریں ، اور اجازت پر ٹیپ کریں۔</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. -->
@@ -118,6 +120,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 -->
@@ -205,6 +209,9 @@
     <!-- 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 Widget -->
     <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
     <string name="search_widget_content_description">ایک نیا Firefox ٹیب کھولیں</string>
@@ -262,6 +269,8 @@
     <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 -->
@@ -345,6 +354,12 @@
     <!-- 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">ابھی sync کریں</string>
@@ -478,6 +493,11 @@
     <!-- 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 showing the opened tabs by swiping up on the toolbar-->
     <string name="preference_gestures_swipe_toolbar_show_tabs">ٹیبز کو کھولنے کے لئے ٹول بار کو سوائپ کریں</string>
 
@@ -500,6 +520,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 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 -->
@@ -530,6 +554,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 -->
@@ -595,6 +621,8 @@
     <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 -->
@@ -693,10 +721,14 @@
     <!-- 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>
@@ -829,6 +861,8 @@
     <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 -->
@@ -846,16 +880,22 @@
     <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 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">آڈیو اور ویڈیو کی اجازت دیں</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 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">صرف آڈیو بلاک کریں</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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 -->
@@ -1050,6 +1090,8 @@
     <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 -->
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index c7ac27a9a..8d14f5ecf 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -181,6 +181,8 @@
     <!-- Browser menu button to configure reader mode appearance e.g. the used font type and size -->
     <string name="browser_menu_read_appearance">Giao diện</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">Tùy chỉnh chế độ đọc</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>
@@ -217,6 +219,11 @@
     <!-- Search suggestion onboarding hint Learn more link text -->
     <string name="search_suggestions_onboarding_learn_more_link">Tìm hiểu thêm</string>
 
+    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <string name="search_engine_suggestions_title">Tìm kiếm %s</string>
+    <!-- Search engine suggestion description text -->
+    <string name="search_engine_suggestions_description">Tìm kiếm trực tiếp từ thanh địa chỉ</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
     <string name="search_widget_content_description">Mở một thẻ Firefox mới</string>
@@ -883,16 +890,22 @@
     <string name="tracking_protection_on">Bật</string>
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Tắt</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">Cho phép âm thanh và video</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Cho phép âm thanh và video</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Chỉ chặn âm thanh và video trên dữ liệu di động</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">Âm thanh và video sẽ phát trên 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">Chỉ chặn âm thanh</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Chỉ chặn âm thanh</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Chặn âm thanh và video</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Chặn âm thanh và video</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">Bật</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
diff --git a/app/src/main/res/values-zh-rCN/mozonline_strings.xml b/app/src/main/res/values-zh-rCN/mozonline_strings.xml
new file mode 100644
index 000000000..d09a3e0b9
--- /dev/null
+++ b/app/src/main/res/values-zh-rCN/mozonline_strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Privacy Notice-->
+    <!-- Privacy Notice title-->
+    <string name="privacy_notice_title">关于您的权利</string>
+    <!-- Privacy Notice content-->
+    <string name="privacy_notice_content">Mozilla Firefox 是一款自由开源软件，由来自世界各地成千上万的社区志愿者共同完成。以下几点您应该了解：
+    \n\n•Firefox 提供给您时依照的条款为 Mozilla 公共许可证（MPL）。这表示您可以使用、复制和向他人分发 Firefox。我们也非常欢迎您按自己的需要修改 Firefox 的源代码。Mozilla 公共许可证还授予您分发您自己修改过的软件版本的权利。
+    \n•您没有获得 Mozilla 基金会或其他任何一方的商标权利或许可，这包括但不限于 Firefox 的名称或标志。有关商标的其他信息在：这里。
+    \n•Firefox 的一些功能（例如崩溃报告器）使您可以向 Mozilla 提供反馈。提交反馈的同时，您授权 Mozilla 使用反馈信息改进产品、在其网站上发布反馈信息，以及分发反馈内容。
+    \n•关于我们如何使用您通过 Firefox 提交给 Mozilla 的个人信息和反馈，请参见 Firefox 隐私权政策。</string>
+    <!-- Privacy Notice clickable-->
+    <string name="privacy_notice_clickable1">Mozilla 公共许可证（MPL）</string>
+    <!-- Privacy Notice clickable-->
+    <string name="privacy_notice_clickable2">这里</string>
+    <!-- Privacy Notice clickable-->
+    <string name="privacy_notice_clickable3">Firefox 隐私权政策</string>
+    <!-- Privacy Notice positive button-->
+    <string name="privacy_notice_positive_button">同意并继续</string>
+    <!-- Privacy Notice neutral button-->
+    <string name="privacy_notice_neutral_button">退出应用</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index d7137ead5..fe6bc4d34 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -188,6 +188,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>
     <!-- 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>
@@ -226,6 +228,12 @@
     <!-- 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>
@@ -898,7 +906,7 @@
     <!-- 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>
+    <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">被 Android 阻止</string>
     <!-- Preference for showing a list of websites that the default configurations won't apply to them -->
@@ -908,16 +916,22 @@
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">关闭</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">允许音频和视频</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 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">仅阻止音频</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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 -->
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index fc1d25a6f..c6029ca8b 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -184,6 +184,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>
     <!-- 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>
@@ -221,6 +223,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>
@@ -899,16 +906,22 @@
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">關閉</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">允許自動播放影音內容</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 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">僅封鎖音訊</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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 -->
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 169b32455..f8d09ea35 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -419,4 +419,10 @@
     <!-- Tab Counter colors -->
     <color name="mozac_ui_tabcounter_default_tint">@color/primary_text_light_theme</color>
     <color name="mozac_ui_tabcounter_default_text">@color/primary_text_light_theme</color>
+
+    <!-- App Spinners colors -->
+    <color name="spinner_selected_item">#1415141A</color>
+
+    <!-- Toolbar menu icon colors -->
+    <color name="toolbar_menu_transparent">@android:color/transparent</color>
 </resources>
diff --git a/app/src/main/res/values/mozonline_strings.xml b/app/src/main/res/values/mozonline_strings.xml
new file mode 100644
index 000000000..89c9fbc4c
--- /dev/null
+++ b/app/src/main/res/values/mozonline_strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Privacy Notice-->
+    <!-- Privacy Notice title-->
+    <string name="privacy_notice_title">About your rights</string>
+    <!-- Privacy Notice content-->
+    <string name="privacy_notice_content">Mozilla Firefox is free and open source software, built by a community of thousands from all over the world. There are a few things you should know:
+    \n\n•Firefox is made available to you under the terms of the Mozilla Public License. This means you may use, copy and distribute Firefox to others. You are also welcome to modify the source code of Firefox as you want to meet your needs. The Mozilla Public License also gives you the right to distribute your modified versions.
+    \n•You are not granted any trademark rights or licenses to the trademarks of the Mozilla Foundation or any party, including without limitation the Firefox name or logo. Additional information on trademarks may be found here.
+    \n•Some features in Firefox, such as the Crash Reporter, give you the option to provide feedback to Mozilla. By choosing to submit feedback, you give Mozilla permission to use the feedback to improve its products, to publish the feedback on its websites, and to distribute the feedback.
+    \n•How we use your personal information and feedback submitted to Mozilla through Firefox is described in the Firefox Privacy Policy.</string>
+    <!-- Privacy Notice clickable-->
+    <string name="privacy_notice_clickable1">Mozilla Public License</string>
+    <!-- Privacy Notice clickable-->
+    <string name="privacy_notice_clickable2">found here</string>
+    <!-- Privacy Notice clickable-->
+    <string name="privacy_notice_clickable3">Firefox Privacy Policy</string>
+    <!-- Privacy Notice positive button-->
+    <string name="privacy_notice_positive_button">Agree and Continue</string>
+    <!-- Privacy Notice neutral button-->
+    <string name="privacy_notice_neutral_button">Exit the App</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/preference_keys.xml b/app/src/main/res/values/preference_keys.xml
index b5d9797de..c5a0879c4 100644
--- a/app/src/main/res/values/preference_keys.xml
+++ b/app/src/main/res/values/preference_keys.xml
@@ -127,6 +127,9 @@
     <string name="pref_key_toolbar_bottom" translatable="false">pref_key_toolbar_bottom</string>
     <string name="pref_key_strip_url" translatable="false">pref_key_strip_url</string>
 
+    <!-- Privacy Pop Window -->
+    <string name="pref_key_privacy_pop_window" translatable="false">pref_key_privacy_pop_window</string>
+
     <!-- Theme Settings -->
     <string name="pref_key_light_theme" translatable="false">pref_key_light_theme</string>
     <string name="pref_key_dark_theme" translatable="false">pref_key_dark_theme</string>
@@ -220,8 +223,6 @@
     <string name="pref_key_migrating_from_fenix_tip" translatable="false">pref_key_migrating_from_fenix_tip</string>
     <string name="pref_key_master_password_tip" translatable="false">pref_key_master_password_tip</string>
 
-    <string name="pref_key_synced_tabs_tabs_tray" translatable="false">pref_key_synced_tabs_tabs_tray</string>
-
     <string name="pref_key_debug_settings" translatable="false">pref_key_debug_settings</string>
 
     <string name="pref_key_open_tabs_count" translatable="false">pref_key_open_tabs_count</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index acde8e7e8..974318c8c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -130,6 +130,8 @@
     <string name="browser_menu_edit_bookmark">Edit bookmark</string>
     <!-- Browser menu button that opens the addon manager -->
     <string name="browser_menu_add_ons">Add-ons</string>
+    <!-- Browser menu button that opens the addon extensions manager -->
+    <string name="browser_menu_extensions">Extensions</string>
     <!-- Text displayed when there are no add-ons to be shown -->
     <string name="no_add_ons">No add-ons here</string>
     <!-- Browser menu button that sends a user to help articles -->
@@ -527,6 +529,10 @@
     <string name="library_desktop_bookmarks_unfiled">Other Bookmarks</string>
     <!-- Option in Library to open History page -->
     <string name="library_history">History</string>
+    <!-- Option in Library to open a new tab -->
+    <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 -->
@@ -871,16 +877,22 @@
     <string name="tracking_protection_on">On</string>
     <!-- Summary of tracking protection preference if tracking protection is set to off -->
     <string name="tracking_protection_off">Off</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">Allow audio and video</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is allowed -->
+    <string name="quick_setting_option_autoplay_allowed">Allow audio and video</string>
     <!-- Label that indicates that video and audio autoplay is only allowed over Wi-Fi -->
     <string name="preference_option_autoplay_allowed_wifi_only2">Block audio and video on cellular data only</string>
     <!-- Subtext that explains 'autoplay on Wi-Fi only' option -->
     <string name="preference_option_autoplay_allowed_wifi_subtext">Audio and video will play on 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">Block audio only</string>
-    <!-- Label that indicates that all video and audio autoplay is blocked -->
+    <!-- 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">Block audio only</string>
+    <!-- Label for global setting that indicates that all video and audio autoplay is blocked -->
     <string name="preference_option_autoplay_blocked3">Block audio and video</string>
+    <!-- Label for site specific setting that indicates that all video and audio autoplay is blocked -->
+    <string name="quick_setting_option_autoplay_blocked">Block audio and video</string>
     <!-- Summary of delete browsing data on quit preference if it is set to on -->
     <string name="delete_browsing_data_quit_on">On</string>
     <!-- Summary of delete browsing data on quit preference if it is set to off -->
diff --git a/app/src/main/res/xml/secret_settings_preferences.xml b/app/src/main/res/xml/secret_settings_preferences.xml
index 7f9722266..c9a243d18 100644
--- a/app/src/main/res/xml/secret_settings_preferences.xml
+++ b/app/src/main/res/xml/secret_settings_preferences.xml
@@ -4,9 +4,4 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <SwitchPreference
-        android:defaultValue="false"
-        android:key="@string/pref_key_synced_tabs_tabs_tray"
-        android:title="@string/preferences_debug_synced_tabs_tabs_tray"
-        app:iconSpaceReserved="false" />
 </PreferenceScreen>
diff --git a/app/src/test/java/org/mozilla/fenix/FenixApplicationTest.kt b/app/src/test/java/org/mozilla/fenix/FenixApplicationTest.kt
new file mode 100644
index 000000000..a82099258
--- /dev/null
+++ b/app/src/test/java/org/mozilla/fenix/FenixApplicationTest.kt
@@ -0,0 +1,37 @@
+/* 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 androidx.test.core.app.ApplicationProvider
+import mozilla.components.service.glean.testing.GleanTestRule
+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.PerfStartup
+import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
+
+@RunWith(FenixRobolectricTestRunner::class)
+class FenixApplicationTest {
+
+    @get:Rule val gleanTestRule = GleanTestRule(ApplicationProvider.getApplicationContext())
+
+    private lateinit var application: FenixApplication
+
+    @Before
+    fun setUp() {
+        application = ApplicationProvider.getApplicationContext()
+    }
+
+    @Ignore("See https://github.com/mozilla-mobile/fenix/issues/18102")
+    @Test
+    fun `GIVEN onCreate is called THEN the duration is measured`() {
+        // application.onCreate is called before the test as part of test set up:
+        // https://robolectric.blogspot.com/2013/04/the-test-lifecycle-in-20.html
+        assertTrue(PerfStartup.applicationOnCreate.testHasValue())
+    }
+}
diff --git a/app/src/test/java/org/mozilla/fenix/HomeActivityTest.kt b/app/src/test/java/org/mozilla/fenix/HomeActivityTest.kt
index 9d83d5360..9c086a9f5 100644
--- a/app/src/test/java/org/mozilla/fenix/HomeActivityTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/HomeActivityTest.kt
@@ -6,10 +6,12 @@ package org.mozilla.fenix
 
 import android.content.Intent
 import android.os.Bundle
+import androidx.test.core.app.ApplicationProvider
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.spyk
 import io.mockk.verify
+import mozilla.components.service.glean.testing.GleanTestRule
 import mozilla.components.support.test.robolectric.testContext
 import mozilla.components.support.utils.toSafeIntent
 import org.junit.Assert.assertEquals
@@ -18,8 +20,10 @@ import org.junit.Assert.assertNotEquals
 import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
 import org.junit.Before
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.mozilla.fenix.GleanMetrics.PerfStartup
 import org.mozilla.fenix.HomeActivity.Companion.PRIVATE_BROWSING_MODE
 import org.mozilla.fenix.browser.browsingmode.BrowsingMode
 import org.mozilla.fenix.browser.browsingmode.BrowsingModeManager
@@ -28,10 +32,13 @@ import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
 import org.mozilla.fenix.utils.Settings
+import org.robolectric.Robolectric
 
 @RunWith(FenixRobolectricTestRunner::class)
 class HomeActivityTest {
 
+    @get:Rule val gleanTestRule = GleanTestRule(ApplicationProvider.getApplicationContext())
+
     private lateinit var activity: HomeActivity
 
     @Before
@@ -131,4 +138,20 @@ class HomeActivityTest {
 
         assertFalse(activity.isActivityColdStarted(startingIntent, Bundle()))
     }
+
+    @Test
+    fun `WHEN onCreate is called THEN the duration is measured`() {
+        assertFalse(PerfStartup.homeActivityOnCreate.testHasValue()) // sanity check.
+
+        // For some reason, the androidx replacement for this method, ActivityScenario, fails so we
+        // use the old Robolectric version. Perhaps it's because it forces the Activity to the
+        // RESUMED state (unlike Robolectric where we can get to CREATED) so not enough code is
+        // mocked for that to work.
+        //
+        // There are various exceptions thrown on background threads when this test runs but it
+        // doesn't seem to impact correctness so we ignore them.
+        Robolectric.buildActivity(HomeActivity::class.java)
+            .create()
+        assertTrue(PerfStartup.homeActivityOnCreate.testHasValue())
+    }
 }
diff --git a/app/src/test/java/org/mozilla/fenix/TelemetryMiddlewareTest.kt b/app/src/test/java/org/mozilla/fenix/TelemetryMiddlewareTest.kt
index 37fb3c1af..3f086f68f 100644
--- a/app/src/test/java/org/mozilla/fenix/TelemetryMiddlewareTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/TelemetryMiddlewareTest.kt
@@ -4,21 +4,33 @@
 
 package org.mozilla.fenix
 
+import androidx.test.core.app.ApplicationProvider
 import io.mockk.mockk
 import io.mockk.verify
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.TestCoroutineDispatcher
+import mozilla.components.browser.session.engine.EngineMiddleware
 import mozilla.components.browser.state.action.ContentAction
 import mozilla.components.browser.state.action.DownloadAction
+import mozilla.components.browser.state.action.EngineAction
 import mozilla.components.browser.state.action.TabListAction
+import mozilla.components.browser.state.state.BrowserState
 import mozilla.components.browser.state.state.LoadRequestState
 import mozilla.components.browser.state.state.createTab
 import mozilla.components.browser.state.store.BrowserStore
+import mozilla.components.service.glean.testing.GleanTestRule
+import mozilla.components.support.base.android.Clock
 import mozilla.components.support.test.ext.joinBlocking
 import mozilla.components.support.test.mock
 import mozilla.components.support.test.robolectric.testContext
+import mozilla.components.support.test.rule.MainCoroutineRule
+import org.junit.After
+import org.junit.Assert
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertNull
 import org.junit.Before
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mozilla.fenix.components.metrics.Event
@@ -26,8 +38,10 @@ import org.mozilla.fenix.components.metrics.MetricController
 import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
 import org.mozilla.fenix.search.telemetry.ads.AdsTelemetry
 import org.mozilla.fenix.utils.Settings
+import org.mozilla.fenix.GleanMetrics.Engine as EngineMetrics
 
 @RunWith(FenixRobolectricTestRunner::class)
+@ExperimentalCoroutinesApi
 class TelemetryMiddlewareTest {
 
     private lateinit var store: BrowserStore
@@ -35,18 +49,37 @@ class TelemetryMiddlewareTest {
     private lateinit var telemetryMiddleware: TelemetryMiddleware
     private lateinit var metrics: MetricController
     private lateinit var adsTelemetry: AdsTelemetry
+    private val testDispatcher = TestCoroutineDispatcher()
+
+    @get:Rule
+    val coroutinesTestRule = MainCoroutineRule(testDispatcher)
+
+    @get:Rule
+    val gleanRule = GleanTestRule(ApplicationProvider.getApplicationContext())
+
+    private val clock = FakeClock()
 
     @Before
     fun setUp() {
+        Clock.delegate = clock
+
         settings = Settings(testContext)
-        metrics = mockk()
+        metrics = mockk(relaxed = true)
         adsTelemetry = mockk()
         telemetryMiddleware = TelemetryMiddleware(
             settings,
             adsTelemetry,
             metrics
         )
-        store = BrowserStore(middleware = listOf(telemetryMiddleware))
+        store = BrowserStore(
+            middleware = listOf(telemetryMiddleware) + EngineMiddleware.create(engine = mockk(), sessionLookup = { null }),
+            initialState = BrowserState()
+        )
+    }
+
+    @After
+    fun tearDown() {
+        Clock.reset()
     }
 
     @Test
@@ -55,6 +88,7 @@ class TelemetryMiddlewareTest {
 
         store.dispatch(TabListAction.AddTabAction(createTab("https://mozilla.org"))).joinBlocking()
         assertEquals(1, settings.openTabsCount)
+        verify(exactly = 1) { metrics.track(Event.HaveOpenTabs) }
     }
 
     @Test
@@ -63,6 +97,7 @@ class TelemetryMiddlewareTest {
 
         store.dispatch(TabListAction.AddTabAction(createTab("https://mozilla.org", private = true))).joinBlocking()
         assertEquals(0, settings.openTabsCount)
+        verify(exactly = 1) { metrics.track(Event.HaveNoOpenTabs) }
     }
 
     @Test
@@ -76,6 +111,7 @@ class TelemetryMiddlewareTest {
         ).joinBlocking()
 
         assertEquals(2, settings.openTabsCount)
+        verify(exactly = 1) { metrics.track(Event.HaveOpenTabs) }
     }
 
     @Test
@@ -87,9 +123,11 @@ class TelemetryMiddlewareTest {
             )
         ).joinBlocking()
         assertEquals(2, settings.openTabsCount)
+        verify(exactly = 1) { metrics.track(Event.HaveOpenTabs) }
 
         store.dispatch(TabListAction.RemoveTabAction("1")).joinBlocking()
         assertEquals(1, settings.openTabsCount)
+        verify(exactly = 2) { metrics.track(Event.HaveOpenTabs) }
     }
 
     @Test
@@ -101,9 +139,11 @@ class TelemetryMiddlewareTest {
             )
         ).joinBlocking()
         assertEquals(2, settings.openTabsCount)
+        verify(exactly = 1) { metrics.track(Event.HaveOpenTabs) }
 
         store.dispatch(TabListAction.RemoveAllTabsAction).joinBlocking()
         assertEquals(0, settings.openTabsCount)
+        verify(exactly = 1) { metrics.track(Event.HaveNoOpenTabs) }
     }
 
     @Test
@@ -116,9 +156,11 @@ class TelemetryMiddlewareTest {
             )
         ).joinBlocking()
         assertEquals(2, settings.openTabsCount)
+        verify(exactly = 1) { metrics.track(Event.HaveOpenTabs) }
 
         store.dispatch(TabListAction.RemoveAllNormalTabsAction).joinBlocking()
         assertEquals(0, settings.openTabsCount)
+        verify(exactly = 1) { metrics.track(Event.HaveNoOpenTabs) }
     }
 
     @Test
@@ -131,6 +173,7 @@ class TelemetryMiddlewareTest {
 
         store.dispatch(TabListAction.RestoreAction(tabsToRestore)).joinBlocking()
         assertEquals(2, settings.openTabsCount)
+        verify(exactly = 1) { metrics.track(Event.HaveOpenTabs) }
     }
 
     @Test
@@ -139,9 +182,11 @@ class TelemetryMiddlewareTest {
         store.dispatch(TabListAction.AddTabAction(tab)).joinBlocking()
         store.dispatch(ContentAction.UpdateLoadingStateAction(tab.id, true)).joinBlocking()
         verify(exactly = 0) { metrics.track(Event.UriOpened) }
+        verify(exactly = 0) { metrics.track(Event.NormalAndPrivateUriOpened) }
 
         store.dispatch(ContentAction.UpdateLoadingStateAction(tab.id, false)).joinBlocking()
         verify(exactly = 1) { metrics.track(Event.UriOpened) }
+        verify(exactly = 1) { metrics.track(Event.NormalAndPrivateUriOpened) }
     }
 
     @Test
@@ -150,9 +195,11 @@ class TelemetryMiddlewareTest {
         store.dispatch(TabListAction.AddTabAction(tab)).joinBlocking()
         store.dispatch(ContentAction.UpdateLoadingStateAction(tab.id, true)).joinBlocking()
         verify(exactly = 0) { metrics.track(Event.UriOpened) }
+        verify(exactly = 0) { metrics.track(Event.NormalAndPrivateUriOpened) }
 
         store.dispatch(ContentAction.UpdateLoadingStateAction(tab.id, false)).joinBlocking()
         verify(exactly = 0) { metrics.track(Event.UriOpened) }
+        verify(exactly = 1) { metrics.track(Event.NormalAndPrivateUriOpened) }
     }
 
     @Test
@@ -225,4 +272,125 @@ class TelemetryMiddlewareTest {
 
         verify { metrics.track(Event.DownloadAdded) }
     }
+
+    @Test
+    fun `WHEN foreground tab getting killed THEN middleware counts it`() {
+        store.dispatch(TabListAction.RestoreAction(
+            listOf(
+                createTab("https://www.mozilla.org", id = "foreground"),
+                createTab("https://getpocket.com", id = "background_pocket"),
+                createTab("https://theverge.com", id = "background_verge")
+            ),
+            selectedTabId = "foreground"
+        )).joinBlocking()
+
+        Assert.assertFalse(EngineMetrics.tabKills["foreground"].testHasValue())
+        Assert.assertFalse(EngineMetrics.tabKills["background"].testHasValue())
+
+        store.dispatch(
+            EngineAction.KillEngineSessionAction("foreground")
+        ).joinBlocking()
+
+        Assert.assertTrue(EngineMetrics.tabKills["foreground"].testHasValue())
+    }
+
+    @Test
+    fun `WHEN background tabs getting killed THEN middleware counts it`() {
+        store.dispatch(TabListAction.RestoreAction(
+            listOf(
+                createTab("https://www.mozilla.org", id = "foreground"),
+                createTab("https://getpocket.com", id = "background_pocket"),
+                createTab("https://theverge.com", id = "background_verge")
+            ),
+            selectedTabId = "foreground"
+        )).joinBlocking()
+
+        Assert.assertFalse(EngineMetrics.tabKills["foreground"].testHasValue())
+        Assert.assertFalse(EngineMetrics.tabKills["background"].testHasValue())
+
+        store.dispatch(
+            EngineAction.KillEngineSessionAction("background_pocket")
+        ).joinBlocking()
+
+        Assert.assertFalse(EngineMetrics.tabKills["foreground"].testHasValue())
+        Assert.assertTrue(EngineMetrics.tabKills["background"].testHasValue())
+        assertEquals(1, EngineMetrics.tabKills["background"].testGetValue())
+
+        store.dispatch(
+            EngineAction.KillEngineSessionAction("background_verge")
+        ).joinBlocking()
+
+        Assert.assertFalse(EngineMetrics.tabKills["foreground"].testHasValue())
+        Assert.assertTrue(EngineMetrics.tabKills["background"].testHasValue())
+        assertEquals(2, EngineMetrics.tabKills["background"].testGetValue())
+    }
+
+    @Test
+    fun `WHEN foreground tab gets killed THEN middleware records foreground age`() {
+        store.dispatch(TabListAction.RestoreAction(
+            listOf(
+                createTab("https://www.mozilla.org", id = "foreground"),
+                createTab("https://getpocket.com", id = "background_pocket"),
+                createTab("https://theverge.com", id = "background_verge")
+            ),
+            selectedTabId = "foreground"
+        )).joinBlocking()
+
+        clock.elapsedTime = 100
+
+        store.dispatch(EngineAction.LinkEngineSessionAction(
+            sessionId = "foreground",
+            engineSession = mock()
+        )).joinBlocking()
+
+        Assert.assertFalse(EngineMetrics.killForegroundAge.testHasValue())
+        Assert.assertFalse(EngineMetrics.killBackgroundAge.testHasValue())
+
+        clock.elapsedTime = 500
+
+        store.dispatch(
+            EngineAction.KillEngineSessionAction("foreground")
+        ).joinBlocking()
+
+        Assert.assertTrue(EngineMetrics.killForegroundAge.testHasValue())
+        Assert.assertFalse(EngineMetrics.killBackgroundAge.testHasValue())
+        assertEquals(400, EngineMetrics.killForegroundAge.testGetValue())
+    }
+
+    @Test
+    fun `WHEN background tab gets killed THEN middleware records background age`() {
+        store.dispatch(TabListAction.RestoreAction(
+            listOf(
+                createTab("https://www.mozilla.org", id = "foreground"),
+                createTab("https://getpocket.com", id = "background_pocket"),
+                createTab("https://theverge.com", id = "background_verge")
+            ),
+            selectedTabId = "foreground"
+        )).joinBlocking()
+
+        clock.elapsedTime = 100
+
+        store.dispatch(EngineAction.LinkEngineSessionAction(
+            sessionId = "background_pocket",
+            engineSession = mock()
+        )).joinBlocking()
+
+        clock.elapsedTime = 700
+
+        Assert.assertFalse(EngineMetrics.killForegroundAge.testHasValue())
+        Assert.assertFalse(EngineMetrics.killBackgroundAge.testHasValue())
+
+        store.dispatch(
+            EngineAction.KillEngineSessionAction("background_pocket")
+        ).joinBlocking()
+
+        Assert.assertTrue(EngineMetrics.killBackgroundAge.testHasValue())
+        Assert.assertFalse(EngineMetrics.killForegroundAge.testHasValue())
+        assertEquals(600, EngineMetrics.killBackgroundAge.testGetValue())
+    }
+}
+
+private class FakeClock : Clock.Delegate {
+    var elapsedTime: Long = 0
+    override fun elapsedRealtime(): Long = elapsedTime
 }
diff --git a/app/src/test/java/org/mozilla/fenix/browser/BaseBrowserFragmentTest.kt b/app/src/test/java/org/mozilla/fenix/browser/BaseBrowserFragmentTest.kt
new file mode 100644
index 000000000..c0d486e17
--- /dev/null
+++ b/app/src/test/java/org/mozilla/fenix/browser/BaseBrowserFragmentTest.kt
@@ -0,0 +1,217 @@
+/* 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.browser
+
+import android.content.Context
+import android.view.View
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.slot
+import io.mockk.spyk
+import io.mockk.verify
+import junit.framework.TestCase.assertFalse
+import junit.framework.TestCase.assertTrue
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import mozilla.components.browser.state.state.SessionState
+import mozilla.components.browser.state.state.content.DownloadState
+import mozilla.components.browser.state.state.createTab
+import mozilla.components.concept.engine.EngineView
+import mozilla.components.feature.contextmenu.ContextMenuCandidate
+import mozilla.components.feature.session.behavior.EngineViewBrowserToolbarBehavior
+import mozilla.components.feature.sitepermissions.SitePermissions
+import mozilla.components.support.test.robolectric.testContext
+import mozilla.components.ui.widgets.VerticalSwipeRefreshLayout
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mozilla.fenix.ext.settings
+import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
+
+@ExperimentalCoroutinesApi
+@RunWith(FenixRobolectricTestRunner::class)
+class BaseBrowserFragmentTest {
+    private lateinit var fragment: TestBaseBrowserFragment
+    private lateinit var swipeRefreshLayout: VerticalSwipeRefreshLayout
+    private lateinit var engineView: EngineView
+
+    @Before
+    fun setup() {
+        fragment = spyk(TestBaseBrowserFragment())
+        swipeRefreshLayout = mockk(relaxed = true)
+        engineView = mockk(relaxed = true)
+        every { fragment.isAdded } returns true
+        every { fragment.activity } returns mockk()
+        every { fragment.requireContext() } returns testContext
+        every { fragment.getEngineView() } returns engineView
+        every { fragment.getSwipeRefreshLayout() } returns swipeRefreshLayout
+        every { swipeRefreshLayout.layoutParams } returns mockk<CoordinatorLayout.LayoutParams>(relaxed = true)
+    }
+
+    @Test
+    fun `initializeEngineView should setDynamicToolbarMaxHeight to 0 if top toolbar is forced for a11y`() {
+        every { testContext.settings().shouldUseBottomToolbar } returns false
+        every { testContext.settings().shouldUseFixedTopToolbar } returns true
+
+        fragment.initializeEngineView(13)
+
+        verify { engineView.setDynamicToolbarMaxHeight(0) }
+    }
+
+    @Test
+    fun `initializeEngineView should setDynamicToolbarMaxHeight to 0 if bottom toolbar is forced for a11y`() {
+        every { testContext.settings().shouldUseBottomToolbar } returns true
+        every { testContext.settings().shouldUseFixedTopToolbar } returns true
+
+        fragment.initializeEngineView(13)
+
+        verify { engineView.setDynamicToolbarMaxHeight(0) }
+    }
+
+    @Test
+    fun `initializeEngineView should setDynamicToolbarMaxHeight to toolbar height if dynamic toolbar is enabled`() {
+        every { testContext.settings().shouldUseFixedTopToolbar } returns false
+        every { testContext.settings().isDynamicToolbarEnabled } returns true
+
+        fragment.initializeEngineView(13)
+
+        verify { engineView.setDynamicToolbarMaxHeight(13) }
+    }
+
+    @Test
+    fun `initializeEngineView should setDynamicToolbarMaxHeight to 0 if dynamic toolbar is disabled`() {
+        every { testContext.settings().shouldUseFixedTopToolbar } returns false
+        every { testContext.settings().isDynamicToolbarEnabled } returns false
+
+        fragment.initializeEngineView(13)
+
+        verify { engineView.setDynamicToolbarMaxHeight(0) }
+    }
+
+    @Test
+    fun `initializeEngineView should set EngineViewBrowserToolbarBehavior when dynamic toolbar is enabled`() {
+        every { testContext.settings().shouldUseFixedTopToolbar } returns false
+        every { testContext.settings().isDynamicToolbarEnabled } returns true
+        val params: CoordinatorLayout.LayoutParams = mockk(relaxed = true)
+        every { params.behavior } returns mockk(relaxed = true)
+        every { swipeRefreshLayout.layoutParams } returns params
+        val behavior = slot<EngineViewBrowserToolbarBehavior>()
+
+        fragment.initializeEngineView(13)
+
+        // EngineViewBrowserToolbarBehavior constructor parameters are not properties, we cannot check them.
+        // Ensure just that the right behavior is set.
+        verify { params.behavior = capture(behavior) }
+    }
+
+    @Test
+    fun `initializeEngineView should set toolbar height as EngineView parent's bottom margin when using bottom toolbar`() {
+        every { testContext.settings().isDynamicToolbarEnabled } returns false
+        every { testContext.settings().shouldUseBottomToolbar } returns true
+
+        fragment.initializeEngineView(13)
+
+        verify { (swipeRefreshLayout.layoutParams as CoordinatorLayout.LayoutParams).bottomMargin = 13 }
+    }
+
+    @Test
+    fun `initializeEngineView should set toolbar height as EngineView parent's bottom margin if top toolbar is forced for a11y`() {
+        every { testContext.settings().shouldUseBottomToolbar } returns false
+        every { testContext.settings().shouldUseFixedTopToolbar } returns true
+
+        fragment.initializeEngineView(13)
+
+        verify { (swipeRefreshLayout.layoutParams as CoordinatorLayout.LayoutParams).bottomMargin = 13 }
+    }
+
+    @Test
+    fun `initializeEngineView should set toolbar height as EngineView parent's bottom margin if bottom toolbar is forced for a11y`() {
+        every { testContext.settings().shouldUseBottomToolbar } returns true
+        every { testContext.settings().shouldUseFixedTopToolbar } returns true
+
+        fragment.initializeEngineView(13)
+
+        verify { (swipeRefreshLayout.layoutParams as CoordinatorLayout.LayoutParams).bottomMargin = 13 }
+    }
+
+    @Test
+    fun `WHEN status is equals to FAILED or COMPLETED and it is the same tab then shouldShowCompletedDownloadDialog will be true`() {
+        every { fragment.getCurrentTab() } returns createTab(id = "1", url = "")
+
+        val download = DownloadState(
+            url = "",
+            sessionId = "1"
+        )
+
+        val status = DownloadState.Status.values()
+            .filter { it == DownloadState.Status.COMPLETED && it == DownloadState.Status.FAILED }
+
+        status.forEach {
+            val result =
+                fragment.shouldShowCompletedDownloadDialog(download, it)
+
+            assertTrue(result)
+        }
+    }
+
+    @Test
+    fun `WHEN status is different from FAILED or COMPLETED then shouldShowCompletedDownloadDialog will be false`() {
+        every { fragment.getCurrentTab() } returns createTab(id = "1", url = "")
+
+        val download = DownloadState(
+            url = "",
+            sessionId = "1"
+        )
+
+        val status = DownloadState.Status.values()
+            .filter { it != DownloadState.Status.COMPLETED && it != DownloadState.Status.FAILED }
+
+        status.forEach {
+            val result =
+                fragment.shouldShowCompletedDownloadDialog(download, it)
+
+            assertFalse(result)
+        }
+    }
+
+    @Test
+    fun `WHEN the tab is different from the initial one then shouldShowCompletedDownloadDialog will be false`() {
+        every { fragment.getCurrentTab() } returns createTab(id = "1", url = "")
+
+        val download = DownloadState(
+            url = "",
+            sessionId = "2"
+        )
+
+        val status = DownloadState.Status.values()
+            .filter { it != DownloadState.Status.COMPLETED && it != DownloadState.Status.FAILED }
+
+        status.forEach {
+            val result =
+                fragment.shouldShowCompletedDownloadDialog(download, it)
+
+            assertFalse(result)
+        }
+    }
+}
+
+@ExperimentalCoroutinesApi
+private class TestBaseBrowserFragment : BaseBrowserFragment() {
+    override fun getContextMenuCandidates(
+        context: Context,
+        view: View
+    ): List<ContextMenuCandidate> {
+        // no-op
+        return emptyList()
+    }
+
+    override fun navToQuickSettingsSheet(tab: SessionState, sitePermissions: SitePermissions?) {
+        // no-op
+    }
+
+    override fun navToTrackingProtectionPanel(tab: SessionState) {
+        // no-op
+    }
+}
diff --git a/app/src/test/java/org/mozilla/fenix/browser/BrowserFragmentTest.kt b/app/src/test/java/org/mozilla/fenix/browser/BrowserFragmentTest.kt
index dd4774766..cd32d5ee0 100644
--- a/app/src/test/java/org/mozilla/fenix/browser/BrowserFragmentTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/browser/BrowserFragmentTest.kt
@@ -347,44 +347,14 @@ class BrowserFragmentTest {
     }
 
     @Test
-    fun `WHEN fragment is not attached THEN toolbar invalidation does nothing`() {
+    fun `WHEN fragment configuration changed THEN menu is dismissed`() {
         val browserToolbarView: BrowserToolbarView = mockk(relaxed = true)
-        val browserToolbar: BrowserToolbar = mockk(relaxed = true)
-        val toolbarIntegration: ToolbarIntegration = mockk(relaxed = true)
-        every { browserToolbarView.view } returns browserToolbar
-        every { browserToolbarView.toolbarIntegration } returns toolbarIntegration
         every { browserFragment.context } returns null
         browserFragment._browserToolbarView = browserToolbarView
-        browserFragment.safeInvalidateBrowserToolbarView()
 
-        verify(exactly = 0) { browserToolbar.invalidateActions() }
-        verify(exactly = 0) { toolbarIntegration.invalidateMenu() }
-    }
+        browserFragment.onConfigurationChanged(mockk(relaxed = true))
 
-    @Test
-    @Suppress("TooGenericExceptionCaught")
-    fun `WHEN fragment is attached and toolbar view is null THEN toolbar invalidation is safe`() {
-        every { browserFragment.context } returns mockk(relaxed = true)
-        try {
-            browserFragment.safeInvalidateBrowserToolbarView()
-        } catch (e: Exception) {
-            fail("Exception thrown when invalidating toolbar")
-        }
-    }
-
-    @Test
-    fun `WHEN fragment and view are attached THEN toolbar invalidation is triggered`() {
-        val browserToolbarView: BrowserToolbarView = mockk(relaxed = true)
-        val browserToolbar: BrowserToolbar = mockk(relaxed = true)
-        val toolbarIntegration: ToolbarIntegration = mockk(relaxed = true)
-        every { browserToolbarView.view } returns browserToolbar
-        every { browserToolbarView.toolbarIntegration } returns toolbarIntegration
-        every { browserFragment.context } returns mockk(relaxed = true)
-        browserFragment._browserToolbarView = browserToolbarView
-        browserFragment.safeInvalidateBrowserToolbarView()
-
-        verify(exactly = 1) { browserToolbar.invalidateActions() }
-        verify(exactly = 1) { toolbarIntegration.invalidateMenu() }
+        verify(exactly = 1) { browserToolbarView.dismissMenu() }
     }
 
     private fun addAndSelectTab(tab: TabSessionState) {
diff --git a/app/src/test/java/org/mozilla/fenix/browser/OpenInAppOnboardingObserverTest.kt b/app/src/test/java/org/mozilla/fenix/browser/OpenInAppOnboardingObserverTest.kt
index ce0cf7f01..3645bf604 100644
--- a/app/src/test/java/org/mozilla/fenix/browser/OpenInAppOnboardingObserverTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/browser/OpenInAppOnboardingObserverTest.kt
@@ -11,7 +11,9 @@ import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LifecycleRegistry
 import androidx.navigation.NavController
 import io.mockk.every
+import io.mockk.just
 import io.mockk.mockk
+import io.mockk.runs
 import io.mockk.spyk
 import io.mockk.verify
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -22,12 +24,17 @@ import mozilla.components.browser.state.state.createTab
 import mozilla.components.browser.state.store.BrowserStore
 import mozilla.components.feature.app.links.AppLinksUseCases
 import mozilla.components.support.test.ext.joinBlocking
+import mozilla.components.support.test.robolectric.testContext
 import mozilla.components.support.test.rule.MainCoroutineRule
 import org.junit.After
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.mozilla.fenix.browser.infobanner.DynamicInfoBanner
+import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
 import org.mozilla.fenix.utils.Settings
 
@@ -43,7 +50,7 @@ class OpenInAppOnboardingObserverTest {
     private lateinit var appLinksUseCases: AppLinksUseCases
     private lateinit var context: Context
     private lateinit var container: ViewGroup
-    private lateinit var infoBanner: InfoBanner
+    private lateinit var infoBanner: DynamicInfoBanner
 
     private val testDispatcher = TestCoroutineDispatcher()
 
@@ -73,7 +80,8 @@ class OpenInAppOnboardingObserverTest {
             navController = navigationController,
             settings = settings,
             appLinksUseCases = appLinksUseCases,
-            container = container
+            container = container,
+            shouldScrollWithTopToolbar = true
         ))
         every { openInAppOnboardingObserver.createInfoBanner() } returns infoBanner
     }
@@ -138,6 +146,7 @@ class OpenInAppOnboardingObserverTest {
         every { settings.openLinksInExternalApp } returns false
         every { settings.shouldShowOpenInAppCfr } returns true
         every { appLinksUseCases.appLinkRedirect.invoke(any()).hasExternalApp() } returns true
+        every { context.components.analytics.metrics.track(any()) } just runs
         store.dispatch(ContentAction.UpdateLoadingStateAction("1", true)).joinBlocking()
 
         openInAppOnboardingObserver.start()
@@ -153,6 +162,24 @@ class OpenInAppOnboardingObserverTest {
         verify(exactly = 1) { infoBanner.dismiss() }
     }
 
+    @Test
+    fun `GIVEN a observer WHEN createInfoBanner() THEN the scrollWithTopToolbar is passed to the DynamicInfoBanner`() {
+        // Mockk currently doesn't support verifying constructor parameters
+        // But we can check the values found in the constructed objects
+
+        openInAppOnboardingObserver = spyk(OpenInAppOnboardingObserver(
+            testContext, mockk(), mockk(), mockk(), mockk(), mockk(), mockk(), shouldScrollWithTopToolbar = true
+        ))
+        val banner1 = openInAppOnboardingObserver.createInfoBanner()
+        assertTrue(banner1.shouldScrollWithTopToolbar)
+
+        openInAppOnboardingObserver = spyk(OpenInAppOnboardingObserver(
+            testContext, mockk(), mockk(), mockk(), mockk(), mockk(), mockk(), shouldScrollWithTopToolbar = false
+        ))
+        val banner2 = openInAppOnboardingObserver.createInfoBanner()
+        assertFalse(banner2.shouldScrollWithTopToolbar)
+    }
+
     internal class MockedLifecycleOwner(initialState: Lifecycle.State) : LifecycleOwner {
         val lifecycleRegistry = LifecycleRegistry(this).apply {
             currentState = initialState
diff --git a/app/src/test/java/org/mozilla/fenix/browser/infobanner/DynamicInfoBannerBehaviorTest.kt b/app/src/test/java/org/mozilla/fenix/browser/infobanner/DynamicInfoBannerBehaviorTest.kt
new file mode 100644
index 000000000..69fd5d8ca
--- /dev/null
+++ b/app/src/test/java/org/mozilla/fenix/browser/infobanner/DynamicInfoBannerBehaviorTest.kt
@@ -0,0 +1,72 @@
+/* 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.browser.infobanner
+
+import android.view.View
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.spyk
+import io.mockk.verify
+import mozilla.components.browser.toolbar.BrowserToolbar
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
+
+@RunWith(FenixRobolectricTestRunner::class)
+class DynamicInfoBannerBehaviorTest {
+    @Test
+    fun `layoutDependsOn should not do anything if not for BrowserToolbar as a dependency`() {
+        val behavior = spyk(DynamicInfoBannerBehavior(mockk(), null))
+
+        behavior.layoutDependsOn(mockk(), mockk(), mockk())
+
+        verify(exactly = 0) { behavior.toolbarHeight }
+        verify(exactly = 0) { behavior.toolbarHeight = any() }
+        verify(exactly = 0) { behavior.setBannerYTranslation(any(), any()) }
+    }
+
+    @Test
+    fun `layoutDependsOn should update toolbarHeight and translate the banner`() {
+        val behavior = spyk(DynamicInfoBannerBehavior(mockk(), null))
+        val banner: View = mockk(relaxed = true)
+        val toolbar: BrowserToolbar = mockk {
+            every { height } returns 99
+            every { translationY } returns -33f
+        }
+
+        assertEquals(0, behavior.toolbarHeight)
+
+        behavior.layoutDependsOn(mockk(), banner, toolbar)
+
+        assertEquals(99, behavior.toolbarHeight)
+        verify { behavior.setBannerYTranslation(banner, -33f) }
+    }
+
+    @Test
+    fun `onDependentViewChanged should translate the banner`() {
+        val behavior = spyk(DynamicInfoBannerBehavior(mockk(), null))
+        val banner: View = mockk(relaxed = true)
+        val toolbar: BrowserToolbar = mockk {
+            every { height } returns 50
+            every { translationY } returns -23f
+        }
+
+        behavior.layoutDependsOn(mockk(), banner, toolbar)
+
+        verify { behavior.setBannerYTranslation(banner, -23f) }
+    }
+
+    @Test
+    fun `setBannerYTranslation should set banner translation to be toolbarHeight + it's translation`() {
+        val behavior = spyk(DynamicInfoBannerBehavior(mockk(), null))
+        val banner: View = mockk(relaxed = true)
+        behavior.toolbarHeight = 30
+
+        behavior.setBannerYTranslation(banner, -20f)
+
+        verify { banner.translationY = 10f }
+    }
+}
diff --git a/app/src/test/java/org/mozilla/fenix/browser/infobanner/DynamicInfoBannerTest.kt b/app/src/test/java/org/mozilla/fenix/browser/infobanner/DynamicInfoBannerTest.kt
new file mode 100644
index 000000000..d894071ab
--- /dev/null
+++ b/app/src/test/java/org/mozilla/fenix/browser/infobanner/DynamicInfoBannerTest.kt
@@ -0,0 +1,39 @@
+/* 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.browser.infobanner
+
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import io.mockk.spyk
+import mozilla.components.support.test.robolectric.testContext
+import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
+
+@RunWith(FenixRobolectricTestRunner::class)
+class DynamicInfoBannerTest {
+    @Test
+    fun `showBanner should set DynamicInfoBannerBehavior as behavior if scrollWithTopToolbar`() {
+        val banner = spyk(DynamicInfoBanner(
+            testContext, CoordinatorLayout(testContext), true, "", ""
+        ))
+
+        banner.showBanner()
+
+        assertTrue((banner.bannerLayout.layoutParams as CoordinatorLayout.LayoutParams).behavior is DynamicInfoBannerBehavior)
+    }
+
+    @Test
+    fun `showBanner should not set a behavior if not scrollWithTopToolbar`() {
+        val banner = spyk(DynamicInfoBanner(
+            testContext, CoordinatorLayout(testContext), false, "", ""
+        ))
+
+        banner.showBanner()
+
+        assertNull((banner.bannerLayout.layoutParams as CoordinatorLayout.LayoutParams).behavior)
+    }
+}
diff --git a/app/src/test/java/org/mozilla/fenix/collections/DefaultCollectionCreationControllerTest.kt b/app/src/test/java/org/mozilla/fenix/collections/DefaultCollectionCreationControllerTest.kt
index 5af2f79a6..5d04f96b6 100644
--- a/app/src/test/java/org/mozilla/fenix/collections/DefaultCollectionCreationControllerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/collections/DefaultCollectionCreationControllerTest.kt
@@ -15,7 +15,6 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.TestCoroutineScope
 import kotlinx.coroutines.test.runBlockingTest
 import mozilla.components.browser.state.action.TabListAction
-import mozilla.components.browser.state.state.MediaState
 import mozilla.components.browser.state.state.createTab
 import mozilla.components.browser.state.store.BrowserStore
 import mozilla.components.feature.tab.collections.TabCollection
@@ -80,8 +79,8 @@ class DefaultCollectionCreationControllerTest {
         ).joinBlocking()
 
         val tabs = listOf(
-            Tab("session-1", "", "", "", mediaState = MediaState.State.NONE),
-            Tab("null-session", "", "", "", mediaState = MediaState.State.NONE)
+            Tab("session-1", "", "", ""),
+            Tab("null-session", "", "", "")
         )
 
         controller.saveCollectionName(tabs, "name")
@@ -173,7 +172,7 @@ class DefaultCollectionCreationControllerTest {
         ).joinBlocking()
 
         val tabs = listOf(
-            Tab("session-1", "", "", "", mediaState = MediaState.State.NONE)
+            Tab("session-1", "", "", "")
         )
         val collection = mockk<TabCollection>()
 
diff --git a/app/src/test/java/org/mozilla/fenix/components/TestComponents.kt b/app/src/test/java/org/mozilla/fenix/components/TestComponents.kt
index 577790914..dfc88b0e9 100644
--- a/app/src/test/java/org/mozilla/fenix/components/TestComponents.kt
+++ b/app/src/test/java/org/mozilla/fenix/components/TestComponents.kt
@@ -16,6 +16,7 @@ class TestComponents(private val context: Context) : Components(context) {
     }
     override val services by lazy { Services(context, backgroundServices.accountManager) }
     override val core by lazy { TestCore(context, analytics.crashReporter) }
+    @Suppress("Deprecation")
     override val useCases by lazy {
         UseCases(
             context,
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 97934c541..be97fd8a3 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,7 +10,12 @@ import io.mockk.impl.annotations.MockK
 import io.mockk.mockk
 import io.mockk.verify
 import io.mockk.verifyAll
+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 org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
 
@@ -167,4 +172,59 @@ class MetricControllerTest {
         controller.track(Event.TabMediaPause)
         verify { marketingService1.track(Event.TabMediaPause) }
     }
+
+    @Test
+    fun `topsites fact should convert to the right events`() {
+        var enabled = true
+        val controller = ReleaseMetricController(
+            services = listOf(dataService1),
+            isDataTelemetryEnabled = { enabled },
+            isMarketingDataTelemetryEnabled = { enabled }
+        )
+
+        var fact = Fact(
+            Component.FEATURE_TOP_SITES,
+            Action.INTERACTION,
+            TopSitesFacts.Items.COUNT,
+            "1"
+        )
+
+        assertEquals(controller.factToEvent(fact), Event.HaveTopSites)
+
+        fact = Fact(
+            Component.FEATURE_TOP_SITES,
+            Action.INTERACTION,
+            TopSitesFacts.Items.COUNT,
+            "0"
+        )
+
+        assertEquals(controller.factToEvent(fact), Event.HaveNoTopSites)
+
+        fact = Fact(
+            Component.FEATURE_TOP_SITES,
+            Action.INTERACTION,
+            TopSitesFacts.Items.COUNT,
+            "10"
+        )
+
+        assertEquals(controller.factToEvent(fact), Event.HaveTopSites)
+
+        fact = Fact(
+            Component.FEATURE_TOP_SITES,
+            Action.INTERACTION,
+            TopSitesFacts.Items.COUNT,
+            "-4"
+        )
+
+        assertEquals(controller.factToEvent(fact), Event.HaveNoTopSites)
+
+        fact = Fact(
+            Component.FEATURE_TOP_SITES,
+            Action.INTERACTION,
+            TopSitesFacts.Items.COUNT,
+            "test"
+        )
+
+        assertEquals(controller.factToEvent(fact), Event.HaveNoTopSites)
+    }
 }
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
new file mode 100644
index 000000000..0c91f91d0
--- /dev/null
+++ b/app/src/test/java/org/mozilla/fenix/components/settings/sitepermissions/ExtensionsTest.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.components.settings.sitepermissions
+
+import io.mockk.every
+import io.mockk.mockk
+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 org.junit.Test
+import org.junit.runner.RunWith
+import org.mozilla.fenix.components.Components
+import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
+import org.mozilla.fenix.settings.sitepermissions.tryReloadTabBy
+
+@RunWith(FenixRobolectricTestRunner::class)
+class ExtensionsTest {
+
+    @Test
+    fun `tryReloadTabBy reloads latest tab matching origin`() {
+        val store = BrowserStore(
+            BrowserState(tabs = listOf(
+                    createTab(id = "1", url = "https://www.mozilla.org/1", lastAccess = 1),
+                    createTab(id = "2", url = "https://www.mozilla.org/2", lastAccess = 2),
+                    createTab(id = "3", url = "https://www.firefox.com")
+                )
+            )
+        )
+
+        val components: Components = mockk(relaxed = true)
+        every { components.core.store } returns store
+
+        components.tryReloadTabBy("www.getpocket.com")
+        verify(exactly = 0) { components.useCases.sessionUseCases.reload(any<String>()) }
+
+        components.tryReloadTabBy("www.mozilla.org")
+        verify { components.useCases.sessionUseCases.reload("2") }
+
+        components.tryReloadTabBy("www.firefox.com")
+        verify { components.useCases.sessionUseCases.reload("3") }
+    }
+}
diff --git a/app/src/test/java/org/mozilla/fenix/components/toolbar/BrowserToolbarViewTest.kt b/app/src/test/java/org/mozilla/fenix/components/toolbar/BrowserToolbarViewTest.kt
new file mode 100644
index 000000000..727f4f6a8
--- /dev/null
+++ b/app/src/test/java/org/mozilla/fenix/components/toolbar/BrowserToolbarViewTest.kt
@@ -0,0 +1,279 @@
+/* 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.toolbar
+
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import io.mockk.confirmVerified
+
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.spyk
+import io.mockk.verify
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import mozilla.components.support.test.robolectric.testContext
+import org.junit.Test
+import org.junit.runner.RunWith
+import mozilla.components.browser.toolbar.BrowserToolbar
+import mozilla.components.browser.toolbar.behavior.BrowserToolbarBehavior
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertNull
+import org.junit.Before
+import org.mozilla.fenix.ext.settings
+import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
+import mozilla.components.browser.toolbar.behavior.ToolbarPosition as MozacToolbarPosition
+
+@ExperimentalCoroutinesApi
+@RunWith(FenixRobolectricTestRunner::class)
+class BrowserToolbarViewTest {
+    private lateinit var toolbarView: BrowserToolbarView
+    private lateinit var toolbar: BrowserToolbar
+    private lateinit var behavior: BrowserToolbarBehavior
+
+    @Before
+    fun `setup`() {
+        toolbar = BrowserToolbar(testContext)
+        toolbar.layoutParams = CoordinatorLayout.LayoutParams(100, 100)
+        behavior = spyk(BrowserToolbarBehavior(testContext, null, MozacToolbarPosition.BOTTOM))
+        (toolbar.layoutParams as CoordinatorLayout.LayoutParams).behavior = behavior
+
+        toolbarView = BrowserToolbarView(
+            container = CoordinatorLayout(testContext),
+            toolbarPosition = ToolbarPosition.BOTTOM,
+            interactor = mockk(),
+            customTabSession = mockk(relaxed = true),
+            lifecycleOwner = mockk()
+        )
+
+        toolbarView.view = toolbar
+    }
+
+    @Test
+    fun `setToolbarBehavior(false) should setDynamicToolbarBehavior if no a11y, bottom toolbar is dynamic and the tab is not for a PWA or TWA`() {
+        val toolbarViewSpy = spyk(toolbarView)
+        every { testContext.settings().toolbarPosition } returns ToolbarPosition.BOTTOM
+        every { testContext.settings().isDynamicToolbarEnabled } returns true
+        every { toolbarViewSpy.isPwaTabOrTwaTab } returns false
+        every { testContext.settings().shouldUseFixedTopToolbar } returns false
+
+        toolbarViewSpy.setToolbarBehavior(false)
+
+        verify { toolbarViewSpy.setDynamicToolbarBehavior(MozacToolbarPosition.BOTTOM) }
+    }
+
+    @Test
+    fun `setToolbarBehavior(false) should expandToolbarAndMakeItFixed if bottom toolbar is not set as dynamic`() {
+        val toolbarViewSpy = spyk(toolbarView)
+        every { testContext.settings().toolbarPosition } returns ToolbarPosition.BOTTOM
+        every { testContext.settings().isDynamicToolbarEnabled } returns false
+        every { toolbarViewSpy.isPwaTabOrTwaTab } returns false
+        every { testContext.settings().shouldUseFixedTopToolbar } returns false
+
+        toolbarViewSpy.setToolbarBehavior(false)
+
+        verify { toolbarViewSpy.expandToolbarAndMakeItFixed() }
+    }
+
+    @Test
+    fun `setToolbarBehavior(false) should expandToolbarAndMakeItFixed if bottom toolbar is dynamic but the tab is for a PWA or TWA`() {
+        val toolbarViewSpy = spyk(toolbarView)
+        every { testContext.settings().toolbarPosition } returns ToolbarPosition.BOTTOM
+        every { testContext.settings().isDynamicToolbarEnabled } returns true
+        every { toolbarViewSpy.isPwaTabOrTwaTab } returns true
+        every { testContext.settings().shouldUseFixedTopToolbar } returns false
+
+        toolbarViewSpy.setToolbarBehavior(false)
+
+        verify { toolbarViewSpy.expandToolbarAndMakeItFixed() }
+    }
+
+    @Test
+    fun `setToolbarBehavior(false) should expandToolbarAndMakeItFixed if bottom toolbar is dynamic tab is not for a PWA or TWA but a11y is enabled`() {
+        val toolbarViewSpy = spyk(toolbarView)
+        every { testContext.settings().toolbarPosition } returns ToolbarPosition.BOTTOM
+        every { testContext.settings().isDynamicToolbarEnabled } returns true
+        every { toolbarViewSpy.isPwaTabOrTwaTab } returns false
+        every { testContext.settings().shouldUseFixedTopToolbar } returns true
+
+        toolbarViewSpy.setToolbarBehavior(false)
+
+        verify { toolbarViewSpy.expandToolbarAndMakeItFixed() }
+    }
+
+    @Test
+    fun `setToolbarBehavior(true) should expandToolbarAndMakeItFixed bottom toolbar is dynamic, the tab is not for a PWA or TWA and a11y is disabled`() {
+        // All intrinsic checks are met but the method was called with `shouldDisableScroll` = true
+
+        val toolbarViewSpy = spyk(toolbarView)
+        every { testContext.settings().toolbarPosition } returns ToolbarPosition.BOTTOM
+        every { testContext.settings().isDynamicToolbarEnabled } returns true
+        every { toolbarViewSpy.isPwaTabOrTwaTab } returns false
+        every { testContext.settings().shouldUseFixedTopToolbar } returns false
+
+        toolbarViewSpy.setToolbarBehavior(false)
+
+        verify { toolbarViewSpy.setDynamicToolbarBehavior(MozacToolbarPosition.BOTTOM) }
+    }
+
+    @Test
+    fun `setToolbarBehavior(true) should expandToolbarAndMakeItFixed if bottom toolbar is not set as dynamic`() {
+        val toolbarViewSpy = spyk(toolbarView)
+        every { testContext.settings().toolbarPosition } returns ToolbarPosition.BOTTOM
+        every { testContext.settings().isDynamicToolbarEnabled } returns false
+        every { toolbarViewSpy.isPwaTabOrTwaTab } returns false
+        every { testContext.settings().shouldUseFixedTopToolbar } returns false
+
+        toolbarViewSpy.setToolbarBehavior(false)
+
+        verify { toolbarViewSpy.expandToolbarAndMakeItFixed() }
+    }
+
+    @Test
+    fun `setToolbarBehavior(true) should expandToolbarAndMakeItFixed if bottom toolbar is dynamic but the tab is for a PWA or TWA`() {
+        val toolbarViewSpy = spyk(toolbarView)
+        every { testContext.settings().toolbarPosition } returns ToolbarPosition.BOTTOM
+        every { testContext.settings().isDynamicToolbarEnabled } returns true
+        every { toolbarViewSpy.isPwaTabOrTwaTab } returns true
+        every { testContext.settings().shouldUseFixedTopToolbar } returns false
+
+        toolbarViewSpy.setToolbarBehavior(false)
+
+        verify { toolbarViewSpy.expandToolbarAndMakeItFixed() }
+    }
+
+    @Test
+    fun `setToolbarBehavior(true) should expandToolbarAndMakeItFixed if bottom toolbar is dynamic, the tab is for a PWA or TWA and a11 is enabled`() {
+        val toolbarViewSpy = spyk(toolbarView)
+        every { testContext.settings().toolbarPosition } returns ToolbarPosition.BOTTOM
+        every { testContext.settings().isDynamicToolbarEnabled } returns true
+        every { toolbarViewSpy.isPwaTabOrTwaTab } returns false
+        every { testContext.settings().shouldUseFixedTopToolbar } returns true
+
+        toolbarViewSpy.setToolbarBehavior(false)
+
+        verify { toolbarViewSpy.expandToolbarAndMakeItFixed() }
+    }
+
+    @Test
+    fun `setToolbarBehavior(true) should expandToolbarAndMakeItFixed for top toolbar if shouldUseFixedTopToolbar`() {
+        val toolbarViewSpy = spyk(toolbarView)
+        every { testContext.settings().toolbarPosition } returns ToolbarPosition.TOP
+        every { testContext.settings().shouldUseFixedTopToolbar } returns true
+
+        toolbarViewSpy.setToolbarBehavior(true)
+
+        verify { toolbarViewSpy.expandToolbarAndMakeItFixed() }
+    }
+
+    @Test
+    fun `setToolbarBehavior(true) should expandToolbarAndMakeItFixed for top toolbar if it is not dynamic`() {
+        val toolbarViewSpy = spyk(toolbarView)
+        every { testContext.settings().toolbarPosition } returns ToolbarPosition.TOP
+        every { testContext.settings().isDynamicToolbarEnabled } returns false
+
+        toolbarViewSpy.setToolbarBehavior(true)
+
+        verify { toolbarViewSpy.expandToolbarAndMakeItFixed() }
+    }
+
+    @Test
+    fun `setToolbarBehavior(true) should expandToolbarAndMakeItFixed for top toolbar if shouldDisableScroll`() {
+        val toolbarViewSpy = spyk(toolbarView)
+        every { testContext.settings().toolbarPosition } returns ToolbarPosition.TOP
+
+        toolbarViewSpy.setToolbarBehavior(true)
+
+        verify { toolbarViewSpy.expandToolbarAndMakeItFixed() }
+    }
+
+    @Test
+    fun `setToolbarBehavior(false) should setDynamicToolbarBehavior for top toolbar`() {
+        val toolbarViewSpy = spyk(toolbarView)
+        every { testContext.settings().toolbarPosition } returns ToolbarPosition.TOP
+        every { testContext.settings().shouldUseFixedTopToolbar } returns true
+        every { testContext.settings().isDynamicToolbarEnabled } returns true
+
+        toolbarViewSpy.setToolbarBehavior(true)
+
+        verify { toolbarViewSpy.expandToolbarAndMakeItFixed() }
+    }
+
+    @Test
+    fun `expandToolbarAndMakeItFixed should expand the toolbar and and disable the dynamic behavior`() {
+        val toolbarViewSpy = spyk(toolbarView)
+
+        assertNotNull((toolbar.layoutParams as CoordinatorLayout.LayoutParams).behavior)
+
+        toolbarViewSpy.expandToolbarAndMakeItFixed()
+
+        verify { toolbarViewSpy.expand() }
+        assertNull((toolbar.layoutParams as CoordinatorLayout.LayoutParams).behavior)
+    }
+
+    @Test
+    fun `setDynamicToolbarBehavior should set a BrowserToolbarBehavior for the bottom toolbar`() {
+        val toolbarViewSpy = spyk(toolbarView)
+        (toolbar.layoutParams as CoordinatorLayout.LayoutParams).behavior = null
+
+        toolbarViewSpy.setDynamicToolbarBehavior(MozacToolbarPosition.BOTTOM)
+
+        assertNotNull((toolbar.layoutParams as CoordinatorLayout.LayoutParams).behavior)
+    }
+
+    @Test
+    fun `setDynamicToolbarBehavior should set a BrowserToolbarBehavior for the top toolbar`() {
+        val toolbarViewSpy = spyk(toolbarView)
+        (toolbar.layoutParams as CoordinatorLayout.LayoutParams).behavior = null
+
+        toolbarViewSpy.setDynamicToolbarBehavior(MozacToolbarPosition.TOP)
+
+        assertNotNull((toolbar.layoutParams as CoordinatorLayout.LayoutParams).behavior)
+    }
+
+    @Test
+    fun `expand should not do anything if isPwaTabOrTwaTab`() {
+        val toolbarViewSpy = spyk(toolbarView)
+        every { toolbarViewSpy.isPwaTabOrTwaTab } returns true
+
+        toolbarViewSpy.expand()
+
+        verify { toolbarViewSpy.expand() }
+        verify { toolbarViewSpy.isPwaTabOrTwaTab }
+        // verify that no other interactions than the expected ones took place
+        confirmVerified(toolbarViewSpy)
+    }
+
+    @Test
+    fun `expand should call forceExpand if not isPwaTabOrTwaTab`() {
+        val toolbarViewSpy = spyk(toolbarView)
+        every { toolbarViewSpy.isPwaTabOrTwaTab } returns false
+
+        toolbarViewSpy.expand()
+
+        verify { behavior.forceExpand(toolbar) }
+    }
+
+    @Test
+    fun `collapse should not do anything if isPwaTabOrTwaTab`() {
+        val toolbarViewSpy = spyk(toolbarView)
+        every { toolbarViewSpy.isPwaTabOrTwaTab } returns true
+
+        toolbarViewSpy.collapse()
+
+        verify { toolbarViewSpy.collapse() }
+        verify { toolbarViewSpy.isPwaTabOrTwaTab }
+        // verify that no other interactions than the expected ones took place
+        confirmVerified(toolbarViewSpy)
+    }
+
+    @Test
+    fun `collapse should call forceExpand if not isPwaTabOrTwaTab`() {
+        val toolbarViewSpy = spyk(toolbarView)
+        every { toolbarViewSpy.isPwaTabOrTwaTab } returns false
+
+        toolbarViewSpy.collapse()
+
+        verify { behavior.forceCollapse(toolbar) }
+    }
+}
diff --git a/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt b/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt
index ab7cacbbc..546ae4fea 100644
--- a/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt
@@ -15,17 +15,19 @@ import io.mockk.just
 import io.mockk.mockk
 import io.mockk.slot
 import io.mockk.verify
-import mozilla.components.browser.session.Session
-import mozilla.components.browser.session.SessionManager
 import mozilla.components.browser.state.action.BrowserAction
 import mozilla.components.browser.state.action.ContentAction
+import mozilla.components.browser.state.action.TabListAction
 import mozilla.components.browser.state.state.BrowserState
+import mozilla.components.browser.state.state.SessionState
 import mozilla.components.browser.state.state.createTab
 import mozilla.components.browser.state.store.BrowserStore
 import mozilla.components.concept.engine.EngineView
 import mozilla.components.feature.search.SearchUseCases
 import mozilla.components.feature.session.SessionUseCases
+import mozilla.components.feature.tabs.TabsUseCases
 import mozilla.components.feature.top.sites.TopSitesUseCases
+import mozilla.components.support.test.ext.joinBlocking
 import mozilla.components.support.test.libstate.ext.waitUntilIdle
 import mozilla.components.support.test.middleware.CaptureActionsMiddleware
 import mozilla.components.ui.tabcounter.TabCounterMenu
@@ -61,17 +63,11 @@ class DefaultBrowserToolbarControllerTest {
     private lateinit var onTabCounterClicked: () -> Unit
 
     @RelaxedMockK
-    private lateinit var onCloseTab: (Session) -> Unit
-
-    @RelaxedMockK
-    private lateinit var sessionManager: SessionManager
+    private lateinit var onCloseTab: (SessionState) -> Unit
 
     @MockK(relaxUnitFun = true)
     private lateinit var engineView: EngineView
 
-    @MockK
-    private lateinit var currentSession: Session
-
     @RelaxedMockK
     private lateinit var metrics: MetricController
 
@@ -81,6 +77,9 @@ class DefaultBrowserToolbarControllerTest {
     @RelaxedMockK
     private lateinit var sessionUseCases: SessionUseCases
 
+    @RelaxedMockK
+    private lateinit var tabsUseCases: TabsUseCases
+
     @RelaxedMockK
     private lateinit var browserAnimator: BrowserAnimator
 
@@ -103,12 +102,9 @@ class DefaultBrowserToolbarControllerTest {
         every { activity.components.useCases.sessionUseCases } returns sessionUseCases
         every { activity.components.useCases.searchUseCases } returns searchUseCases
         every { activity.components.useCases.topSitesUseCase } returns topSitesUseCase
-        every { sessionManager.selectedSession } returns currentSession
         every { navController.currentDestination } returns mockk {
             every { id } returns R.id.browserFragment
         }
-        every { currentSession.id } returns "1"
-        every { currentSession.private } returns false
 
         val onComplete = slot<() -> Unit>()
         every { browserAnimator.captureEngineViewAndDrawStatically(capture(onComplete)) } answers { onComplete.captured.invoke() }
@@ -248,14 +244,6 @@ class DefaultBrowserToolbarControllerTest {
     @Test
     fun handleToolbarCloseTabPressWithLastPrivateSession() {
         val item = TabCounterMenu.Item.CloseTab
-        val sessions = listOf(
-            mockk<Session> {
-                every { private } returns true
-            }
-        )
-
-        every { currentSession.private } returns true
-        every { sessionManager.sessions } returns sessions
 
         val controller = createController()
         controller.handleTabCounterItemInteraction(item)
@@ -269,11 +257,13 @@ class DefaultBrowserToolbarControllerTest {
     fun handleToolbarCloseTabPress() {
         val item = TabCounterMenu.Item.CloseTab
 
-        every { sessionManager.sessions } returns emptyList()
+        val testTab = createTab("https://www.firefox.com")
+        store.dispatch(TabListAction.AddTabAction(testTab)).joinBlocking()
+        store.dispatch(TabListAction.SelectTabAction(testTab.id)).joinBlocking()
 
         val controller = createController()
         controller.handleTabCounterItemInteraction(item)
-        verify { sessionManager.remove(currentSession, selectParentIfExists = true) }
+        verify { tabsUseCases.removeTab(testTab.id, selectParentIfExists = true) }
     }
 
     @Test
@@ -324,17 +314,17 @@ class DefaultBrowserToolbarControllerTest {
 
     private fun createController(
         activity: HomeActivity = this.activity,
-        customTabSession: Session? = null
+        customTabSessionId: String? = null
     ) = DefaultBrowserToolbarController(
         store = store,
+        tabsUseCases = tabsUseCases,
         activity = activity,
         navController = navController,
         metrics = metrics,
         engineView = engineView,
         homeViewModel = homeViewModel,
-        customTabSession = customTabSession,
+        customTabSessionId = customTabSessionId,
         readerModeController = readerModeController,
-        sessionManager = sessionManager,
         onTabCounterClicked = onTabCounterClicked,
         onCloseTab = onCloseTab
     )
diff --git a/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarMenuControllerTest.kt b/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarMenuControllerTest.kt
index 4082077ae..da473a25d 100644
--- a/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarMenuControllerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarMenuControllerTest.kt
@@ -24,10 +24,11 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runBlockingTest
 import mozilla.appservices.places.BookmarkRoot
-import mozilla.components.browser.session.Session
-import mozilla.components.browser.session.SessionManager
+import mozilla.components.browser.state.action.CustomTabListAction
 import mozilla.components.browser.state.state.BrowserState
 import mozilla.components.browser.state.state.ReaderState
+import mozilla.components.browser.state.state.TabSessionState
+import mozilla.components.browser.state.state.createCustomTab
 import mozilla.components.browser.state.state.createTab
 import mozilla.components.browser.state.store.BrowserStore
 import mozilla.components.concept.engine.EngineSession
@@ -36,15 +37,18 @@ import mozilla.components.feature.search.SearchUseCases
 import mozilla.components.feature.session.SessionFeature
 import mozilla.components.feature.session.SessionUseCases
 import mozilla.components.feature.tab.collections.TabCollection
+import mozilla.components.feature.tabs.CustomTabsUseCases
 import mozilla.components.feature.top.sites.DefaultTopSitesStorage
 import mozilla.components.feature.top.sites.TopSitesUseCases
 import mozilla.components.support.base.feature.ViewBoundFeatureWrapper
+import mozilla.components.support.test.ext.joinBlocking
 import mozilla.components.support.test.rule.MainCoroutineRule
 import org.junit.After
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.mozilla.fenix.FeatureFlags
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.NavGraphDirections
 import org.mozilla.fenix.R
@@ -64,6 +68,7 @@ import org.mozilla.fenix.utils.Settings
 
 @OptIn(ExperimentalCoroutinesApi::class)
 @RunWith(FenixRobolectricTestRunner::class)
+@Suppress("ForbiddenComment")
 class DefaultBrowserToolbarMenuControllerTest {
 
     @get:Rule
@@ -74,13 +79,12 @@ class DefaultBrowserToolbarMenuControllerTest {
     @RelaxedMockK private lateinit var navController: NavController
     @RelaxedMockK private lateinit var findInPageLauncher: () -> Unit
     @RelaxedMockK private lateinit var bookmarkTapped: (String, String) -> Unit
-    @RelaxedMockK private lateinit var sessionManager: SessionManager
-    @RelaxedMockK private lateinit var currentSession: Session
     @RelaxedMockK private lateinit var openInFenixIntent: Intent
     @RelaxedMockK private lateinit var metrics: MetricController
     @RelaxedMockK private lateinit var settings: Settings
     @RelaxedMockK private lateinit var searchUseCases: SearchUseCases
     @RelaxedMockK private lateinit var sessionUseCases: SessionUseCases
+    @RelaxedMockK private lateinit var customTabUseCases: CustomTabsUseCases
     @RelaxedMockK private lateinit var browserAnimator: BrowserAnimator
     @RelaxedMockK private lateinit var snackbar: FenixSnackbar
     @RelaxedMockK private lateinit var tabCollectionStorage: TabCollectionStorage
@@ -89,7 +93,9 @@ class DefaultBrowserToolbarMenuControllerTest {
     @MockK private lateinit var sessionFeatureWrapper: ViewBoundFeatureWrapper<SessionFeature>
     @RelaxedMockK private lateinit var sessionFeature: SessionFeature
     @RelaxedMockK private lateinit var topSitesStorage: DefaultTopSitesStorage
-    @RelaxedMockK private lateinit var browserStore: BrowserStore
+
+    private lateinit var browserStore: BrowserStore
+    private lateinit var selectedTab: TabSessionState
 
     @Before
     fun setUp() {
@@ -104,18 +110,25 @@ class DefaultBrowserToolbarMenuControllerTest {
         every { FenixSnackbar.make(any(), any(), any(), any()) } returns snackbar
 
         every { activity.components.useCases.sessionUseCases } returns sessionUseCases
+        every { activity.components.useCases.customTabsUseCases } returns customTabUseCases
         every { activity.components.useCases.searchUseCases } returns searchUseCases
         every { activity.components.useCases.topSitesUseCase } returns topSitesUseCase
-        every { sessionManager.selectedSession } returns currentSession
         every { sessionFeatureWrapper.get() } returns sessionFeature
         every { navController.currentDestination } returns mockk {
             every { id } returns R.id.browserFragment
         }
-        every { currentSession.id } returns "1"
         every { settings.topSitesMaxLimit } returns 16
 
         val onComplete = slot<() -> Unit>()
         every { browserAnimator.captureEngineViewAndDrawStatically(capture(onComplete)) } answers { onComplete.captured.invoke() }
+
+        selectedTab = createTab("https://www.mozilla.org", id = "1")
+        browserStore = BrowserStore(
+            initialState = BrowserState(
+                tabs = listOf(selectedTab),
+                selectedTabId = selectedTab.id
+            )
+        )
     }
 
     @After
@@ -124,22 +137,133 @@ class DefaultBrowserToolbarMenuControllerTest {
         unmockkObject(FenixSnackbar.Companion)
     }
 
+    // TODO: These can be removed for https://github.com/mozilla-mobile/fenix/issues/17870
+    // todo === Start ===
+    @Test
+    fun handleToolbarBookmarkPressWithReaderModeInactive() = runBlockingTest {
+        if (!FeatureFlags.toolbarMenuFeature) {
+            val item = ToolbarMenu.Item.Bookmark
+
+            val title = "Mozilla"
+            val url = "https://mozilla.org"
+            val regularTab = createTab(
+                url = url,
+                readerState = ReaderState(active = false, activeUrl = "https://1234.org"),
+                title = title
+            )
+            val store =
+                BrowserStore(BrowserState(tabs = listOf(regularTab), selectedTabId = regularTab.id))
+
+            val controller = createController(scope = this, store = store)
+            controller.handleToolbarItemInteraction(item)
+
+            verify { metrics.track(Event.BrowserMenuItemTapped(Event.BrowserMenuItemTapped.Item.BOOKMARK)) }
+            verify { bookmarkTapped(url, title) }
+        }
+    }
+
+    @Test
+    fun `IF reader mode is active WHEN bookmark menu item is pressed THEN menu item is handled`() = runBlockingTest {
+        if (!FeatureFlags.toolbarMenuFeature) {
+            val item = ToolbarMenu.Item.Bookmark
+            val title = "Mozilla"
+            val readerUrl = "moz-extension://1234"
+            val readerTab = createTab(
+                url = readerUrl,
+                readerState = ReaderState(active = true, activeUrl = "https://mozilla.org"),
+                title = title
+            )
+            browserStore =
+                BrowserStore(BrowserState(tabs = listOf(readerTab), selectedTabId = readerTab.id))
+
+            val controller = createController(scope = this, store = browserStore)
+            controller.handleToolbarItemInteraction(item)
+
+            verify { metrics.track(Event.BrowserMenuItemTapped(Event.BrowserMenuItemTapped.Item.BOOKMARK)) }
+            verify { bookmarkTapped("https://mozilla.org", title) }
+        }
+    }
+
+    @Test
+    fun `WHEN open in Fenix menu item is pressed THEN menu item is handled correctly`() = runBlockingTest {
+        if (!FeatureFlags.toolbarMenuFeature) {
+
+            val customTab = createCustomTab("https://mozilla.org")
+            browserStore.dispatch(CustomTabListAction.AddCustomTabAction(customTab)).joinBlocking()
+            val controller = createController(
+                scope = this,
+                store = browserStore,
+                customTabSessionId = customTab.id
+            )
+
+            val item = ToolbarMenu.Item.OpenInFenix
+
+            every { activity.startActivity(any()) } just Runs
+            controller.handleToolbarItemInteraction(item)
+
+            verify { sessionFeature.release() }
+            verify { customTabUseCases.migrate(customTab.id, true) }
+            verify { activity.startActivity(openInFenixIntent) }
+            verify { activity.finishAndRemoveTask() }
+        }
+    }
+
+    @Test
+    fun `WHEN quit menu item is pressed THEN menu item is handled correctly`() = runBlockingTest {
+        if (!FeatureFlags.toolbarMenuFeature) {
+            val item = ToolbarMenu.Item.Quit
+            val testScope = this
+
+            val controller = createController(scope = this, store = browserStore)
+
+            controller.handleToolbarItemInteraction(item)
+
+            verify { deleteAndQuit(activity, testScope, null) }
+        }
+    }
+
+    @Test
+    fun handleToolbarOpenInAppPress() = runBlockingTest {
+        if (!FeatureFlags.toolbarMenuFeature) {
+            val item = ToolbarMenu.Item.OpenInApp
+
+            val controller = createController(scope = this, store = browserStore)
+
+            controller.handleToolbarItemInteraction(item)
+
+            verify { settings.openInAppOpened = true }
+        }
+    }
+
+    @Test
+    fun `WHEN reader mode menu item is pressed THEN handle appearance change`() = runBlockingTest {
+        val item = ToolbarMenu.Item.ReaderModeAppearance
+
+        val controller = createController(scope = this, store = browserStore)
+
+        controller.handleToolbarItemInteraction(item)
+
+        verify { readerModeController.showControls() }
+        verify { metrics.track(Event.ReaderModeAppearanceOpened) }
+    }
+    // todo === End ===
+
     @Test
-    fun handleToolbarBackPress() = runBlockingTest {
+    fun `WHEN backwards nav menu item is pressed THEN the session navigates back with active session`() = runBlockingTest {
         val item = ToolbarMenu.Item.Back(false)
 
-        val controller = createController(scope = this)
+        val controller = createController(scope = this, store = browserStore)
         controller.handleToolbarItemInteraction(item)
 
         verify { metrics.track(Event.BrowserMenuItemTapped(Event.BrowserMenuItemTapped.Item.BACK)) }
-        verify { sessionUseCases.goBack(currentSession) }
+        verify { sessionUseCases.goBack(browserStore.state.selectedTabId!!) }
     }
 
     @Test
-    fun handleToolbarBackLongPress() = runBlockingTest {
+    fun `WHEN backwards nav menu item is long pressed THEN the session navigates back with no active session`() = runBlockingTest {
         val item = ToolbarMenu.Item.Back(true)
 
-        val controller = createController(scope = this)
+        val controller = createController(scope = this, store = browserStore)
         controller.handleToolbarItemInteraction(item)
 
         val directions = BrowserFragmentDirections.actionGlobalTabHistoryDialogFragment(null)
@@ -149,21 +273,21 @@ class DefaultBrowserToolbarMenuControllerTest {
     }
 
     @Test
-    fun handleToolbarForwardPress() = runBlockingTest {
+    fun `WHEN forward nav menu item is pressed THEN the session navigates forward to active session`() = runBlockingTest {
         val item = ToolbarMenu.Item.Forward(false)
 
-        val controller = createController(scope = this)
+        val controller = createController(scope = this, store = browserStore)
         controller.handleToolbarItemInteraction(item)
 
         verify { metrics.track(Event.BrowserMenuItemTapped(Event.BrowserMenuItemTapped.Item.FORWARD)) }
-        verify { sessionUseCases.goForward(currentSession) }
+        verify { sessionUseCases.goForward(selectedTab.id) }
     }
 
     @Test
-    fun handleToolbarForwardLongPress() = runBlockingTest {
+    fun `WHEN forward nav menu item is long pressed THEN the browser navigates forward with no active session`() = runBlockingTest {
         val item = ToolbarMenu.Item.Forward(true)
 
-        val controller = createController(scope = this)
+        val controller = createController(scope = this, store = browserStore)
         controller.handleToolbarItemInteraction(item)
 
         val directions = BrowserFragmentDirections.actionGlobalTabHistoryDialogFragment(null)
@@ -173,48 +297,48 @@ class DefaultBrowserToolbarMenuControllerTest {
     }
 
     @Test
-    fun handleToolbarReloadPress() = runBlockingTest {
+    fun `WHEN reload nav menu item is pressed THEN the session reloads from cache`() = runBlockingTest {
         val item = ToolbarMenu.Item.Reload(false)
 
-        val controller = createController(scope = this)
+        val controller = createController(scope = this, store = browserStore)
         controller.handleToolbarItemInteraction(item)
 
         verify { metrics.track(Event.BrowserMenuItemTapped(Event.BrowserMenuItemTapped.Item.RELOAD)) }
-        verify { sessionUseCases.reload(currentSession) }
+        verify { sessionUseCases.reload(selectedTab.id) }
     }
 
     @Test
-    fun handleToolbarReloadLongPress() = runBlockingTest {
+    fun `WHEN reload nav menu item is long pressed THEN the session reloads with no cache`() = runBlockingTest {
         val item = ToolbarMenu.Item.Reload(true)
 
-        val controller = createController(scope = this)
+        val controller = createController(scope = this, store = browserStore)
         controller.handleToolbarItemInteraction(item)
 
         verify { metrics.track(Event.BrowserMenuItemTapped(Event.BrowserMenuItemTapped.Item.RELOAD)) }
         verify {
             sessionUseCases.reload(
-                currentSession,
+                selectedTab.id,
                 EngineSession.LoadUrlFlags.select(EngineSession.LoadUrlFlags.BYPASS_CACHE)
             )
         }
     }
 
     @Test
-    fun handleToolbarStopPress() = runBlockingTest {
+    fun `WHEN stop nav menu item is pressed THEN the session stops loading`() = runBlockingTest {
         val item = ToolbarMenu.Item.Stop
 
-        val controller = createController(scope = this)
+        val controller = createController(scope = this, store = browserStore)
         controller.handleToolbarItemInteraction(item)
 
         verify { metrics.track(Event.BrowserMenuItemTapped(Event.BrowserMenuItemTapped.Item.STOP)) }
-        verify { sessionUseCases.stopLoading(currentSession) }
+        verify { sessionUseCases.stopLoading(selectedTab.id) }
     }
 
     @Test
-    fun handleToolbarSettingsPress() = runBlockingTest {
+    fun `WHEN settings menu item is pressed THEN menu item is handled`() = runBlockingTest {
         val item = ToolbarMenu.Item.Settings
 
-        val controller = createController(scope = this)
+        val controller = createController(scope = this, store = browserStore)
         controller.handleToolbarItemInteraction(item)
 
         val directions = BrowserFragmentDirections.actionBrowserFragmentToSettingsFragment()
@@ -224,55 +348,10 @@ class DefaultBrowserToolbarMenuControllerTest {
     }
 
     @Test
-    fun handleToolbarBookmarkPressWithReaderModeInactive() = runBlockingTest {
-        val item = ToolbarMenu.Item.Bookmark
-        val title = "Mozilla"
-        val readerUrl = "moz-extension://1234"
-        val readerTab = createTab(
-            url = readerUrl,
-            readerState = ReaderState(active = false, activeUrl = "https://1234.org"),
-            title = title
-        )
-        browserStore =
-            BrowserStore(BrowserState(tabs = listOf(readerTab), selectedTabId = readerTab.id))
-        every { currentSession.id } returns readerTab.id
-        every { currentSession.title } returns title
-        every { currentSession.url } returns "https://mozilla.org"
-
-        val controller = createController(scope = this)
-        controller.handleToolbarItemInteraction(item)
-
-        verify { metrics.track(Event.BrowserMenuItemTapped(Event.BrowserMenuItemTapped.Item.BOOKMARK)) }
-        verify { bookmarkTapped("https://mozilla.org", title) }
-    }
-
-    @Test
-    fun handleToolbarBookmarkPressWithReaderModeActive() = runBlockingTest {
-        val item = ToolbarMenu.Item.Bookmark
-        val title = "Mozilla"
-        val readerUrl = "moz-extension://1234"
-        val readerTab = createTab(
-            url = readerUrl,
-            readerState = ReaderState(active = true, activeUrl = "https://mozilla.org"),
-            title = title
-        )
-        browserStore = BrowserStore(BrowserState(tabs = listOf(readerTab), selectedTabId = readerTab.id))
-        every { currentSession.id } returns readerTab.id
-        every { currentSession.title } returns title
-        every { currentSession.url } returns readerUrl
-
-        val controller = createController(scope = this)
-        controller.handleToolbarItemInteraction(item)
-
-        verify { metrics.track(Event.BrowserMenuItemTapped(Event.BrowserMenuItemTapped.Item.BOOKMARK)) }
-        verify { bookmarkTapped("https://mozilla.org", title) }
-    }
-
-    @Test
-    fun handleToolbarBookmarksPress() = runBlockingTest {
+    fun `WHEN bookmark menu item is pressed THEN navigate to bookmarks page`() = runBlockingTest {
         val item = ToolbarMenu.Item.Bookmarks
 
-        val controller = createController(scope = this)
+        val controller = createController(scope = this, store = browserStore)
         controller.handleToolbarItemInteraction(item)
 
         val directions = BrowserFragmentDirections.actionGlobalBookmarkFragment(BookmarkRoot.Mobile.id)
@@ -282,10 +361,10 @@ class DefaultBrowserToolbarMenuControllerTest {
     }
 
     @Test
-    fun handleToolbarHistoryPress() = runBlockingTest {
+    fun `WHEN history menu item is pressed THEN navigate to history page`() = runBlockingTest {
         val item = ToolbarMenu.Item.History
 
-        val controller = createController(scope = this)
+        val controller = createController(scope = this, store = browserStore)
         controller.handleToolbarItemInteraction(item)
 
         val directions = BrowserFragmentDirections.actionGlobalHistoryFragment()
@@ -295,47 +374,47 @@ class DefaultBrowserToolbarMenuControllerTest {
     }
 
     @Test
-    fun handleToolbarRequestDesktopOnPress() = runBlockingTest {
+    fun `WHEN request desktop menu item is toggled On THEN desktop site is requested for the session`() = runBlockingTest {
         val requestDesktopSiteUseCase: SessionUseCases.RequestDesktopSiteUseCase =
             mockk(relaxed = true)
         val item = ToolbarMenu.Item.RequestDesktop(true)
 
         every { sessionUseCases.requestDesktopSite } returns requestDesktopSiteUseCase
 
-        val controller = createController(scope = this)
+        val controller = createController(scope = this, store = browserStore)
         controller.handleToolbarItemInteraction(item)
 
         verify { metrics.track(Event.BrowserMenuItemTapped(Event.BrowserMenuItemTapped.Item.DESKTOP_VIEW_ON)) }
         verify {
             requestDesktopSiteUseCase.invoke(
                 true,
-                currentSession
+                selectedTab.id
             )
         }
     }
 
     @Test
-    fun handleToolbarRequestDesktopOffPress() = runBlockingTest {
+    fun `WHEN request desktop menu item is toggled Off THEN mobile site is requested for the session`() = runBlockingTest {
         val requestDesktopSiteUseCase: SessionUseCases.RequestDesktopSiteUseCase =
             mockk(relaxed = true)
         val item = ToolbarMenu.Item.RequestDesktop(false)
 
         every { sessionUseCases.requestDesktopSite } returns requestDesktopSiteUseCase
 
-        val controller = createController(scope = this)
+        val controller = createController(scope = this, store = browserStore)
         controller.handleToolbarItemInteraction(item)
 
         verify { metrics.track(Event.BrowserMenuItemTapped(Event.BrowserMenuItemTapped.Item.DESKTOP_VIEW_OFF)) }
         verify {
             requestDesktopSiteUseCase.invoke(
                 false,
-                currentSession
+                selectedTab.id
             )
         }
     }
 
     @Test
-    fun handleToolbarAddToTopSitesPressed() = runBlockingTest {
+    fun `WHEN Add To Top Sites menu item is pressed THEN add site AND show snackbar`() = runBlockingTest {
         val item = ToolbarMenu.Item.AddToTopSites
         val addPinnedSiteUseCase: TopSitesUseCases.AddPinnedSiteUseCase = mockk(relaxed = true)
 
@@ -344,50 +423,46 @@ class DefaultBrowserToolbarMenuControllerTest {
             swipeRefreshLayout.context.getString(R.string.snackbar_added_to_top_sites)
         } returns "Added to top sites!"
 
-        val controller = createController(scope = this)
+        val controller = createController(scope = this, store = browserStore)
         controller.handleToolbarItemInteraction(item)
 
-        verify { addPinnedSiteUseCase.invoke(currentSession.title, currentSession.url) }
+        verify { addPinnedSiteUseCase.invoke(selectedTab.content.title, selectedTab.content.url) }
         verify { snackbar.setText("Added to top sites!") }
         verify { metrics.track(Event.BrowserMenuItemTapped(Event.BrowserMenuItemTapped.Item.ADD_TO_TOP_SITES)) }
     }
 
     @Test
-    fun handleToolbarAddonsManagerPress() = runBlockingTest {
+    fun `WHEN addon extensions menu item is pressed THEN navigate to addons manager`() = runBlockingTest {
         val item = ToolbarMenu.Item.AddonsManager
 
-        val controller = createController(scope = this)
+        val controller = createController(scope = this, store = browserStore)
         controller.handleToolbarItemInteraction(item)
 
         verify { metrics.track(Event.BrowserMenuItemTapped(Event.BrowserMenuItemTapped.Item.ADDONS_MANAGER)) }
     }
 
     @Test
-    fun handleToolbarAddToHomeScreenPress() = runBlockingTest {
+    fun `WHEN Add To Home Screen menu item is pressed THEN add site`() = runBlockingTest {
         val item = ToolbarMenu.Item.AddToHomeScreen
 
-        val controller = createController(scope = this)
+        val controller = createController(scope = this, store = browserStore)
         controller.handleToolbarItemInteraction(item)
 
         verify { metrics.track(Event.BrowserMenuItemTapped(Event.BrowserMenuItemTapped.Item.ADD_TO_HOMESCREEN)) }
     }
 
     @Test
-    fun handleToolbarSharePressWithReaderModeInactive() = runBlockingTest {
+    fun `IF reader mode is inactive WHEN share menu item is pressed THEN navigate to share screen`() = runBlockingTest {
         val item = ToolbarMenu.Item.Share
         val title = "Mozilla"
-        val readerUrl = "moz-extension://1234"
-        val readerTab = createTab(
-            url = readerUrl,
+        val url = "https://mozilla.org"
+        val regularTab = createTab(
+            url = url,
             readerState = ReaderState(active = false, activeUrl = "https://1234.org"),
             title = title
         )
-        browserStore = BrowserStore(BrowserState(tabs = listOf(readerTab), selectedTabId = readerTab.id))
-        every { currentSession.id } returns readerTab.id
-        every { currentSession.title } returns title
-        every { currentSession.url } returns "https://mozilla.org"
-
-        val controller = createController(scope = this)
+        browserStore = BrowserStore(BrowserState(tabs = listOf(regularTab), selectedTabId = regularTab.id))
+        val controller = createController(scope = this, store = browserStore)
         controller.handleToolbarItemInteraction(item)
 
         verify { metrics.track(Event.BrowserMenuItemTapped(Event.BrowserMenuItemTapped.Item.SHARE)) }
@@ -404,7 +479,7 @@ class DefaultBrowserToolbarMenuControllerTest {
     }
 
     @Test
-    fun handleToolbarSharePressWithReaderModeActive() = runBlockingTest {
+    fun `IF reader mode is active WHEN share menu item is pressed THEN navigate to share screen`() = runBlockingTest {
         val item = ToolbarMenu.Item.Share
         val title = "Mozilla"
         val readerUrl = "moz-extension://1234"
@@ -414,11 +489,7 @@ class DefaultBrowserToolbarMenuControllerTest {
             title = title
         )
         browserStore = BrowserStore(BrowserState(tabs = listOf(readerTab), selectedTabId = readerTab.id))
-        every { currentSession.id } returns readerTab.id
-        every { currentSession.title } returns title
-        every { currentSession.url } returns readerUrl
-
-        val controller = createController(scope = this)
+        val controller = createController(scope = this, store = browserStore)
         controller.handleToolbarItemInteraction(item)
 
         verify { metrics.track(Event.BrowserMenuItemTapped(Event.BrowserMenuItemTapped.Item.SHARE)) }
@@ -435,10 +506,10 @@ class DefaultBrowserToolbarMenuControllerTest {
     }
 
     @Test
-    fun handleToolbarFindInPagePress() = runBlockingTest {
+    fun `WHEN Find In Page menu item is pressed THEN launch finder`() = runBlockingTest {
         val item = ToolbarMenu.Item.FindInPage
 
-        val controller = createController(scope = this)
+        val controller = createController(scope = this, store = browserStore)
         controller.handleToolbarItemInteraction(item)
 
         verify { findInPageLauncher() }
@@ -446,12 +517,12 @@ class DefaultBrowserToolbarMenuControllerTest {
     }
 
     @Test
-    fun handleToolbarSaveToCollectionPressWhenAtLeastOneCollectionExists() = runBlockingTest {
+    fun `IF one or more collection exists WHEN Save To Collection menu item is pressed THEN navigate to save collection page`() = runBlockingTest {
         val item = ToolbarMenu.Item.SaveToCollection
         val cachedTabCollections: List<TabCollection> = mockk(relaxed = true)
         every { tabCollectionStorage.cachedTabCollections } returns cachedTabCollections
 
-        val controller = createController(scope = this)
+        val controller = createController(scope = this, store = browserStore)
         controller.handleToolbarItemInteraction(item)
 
         verify {
@@ -467,19 +538,19 @@ class DefaultBrowserToolbarMenuControllerTest {
 
         val directions = BrowserFragmentDirections.actionGlobalCollectionCreationFragment(
             saveCollectionStep = SaveCollectionStep.SelectCollection,
-            tabIds = arrayOf(currentSession.id),
-            selectedTabIds = arrayOf(currentSession.id)
+            tabIds = arrayOf(selectedTab.id),
+            selectedTabIds = arrayOf(selectedTab.id)
         )
         verify { navController.navigate(directionsEq(directions), null) }
     }
 
     @Test
-    fun handleToolbarSaveToCollectionPressWhenNoCollectionsExists() = runBlockingTest {
+    fun `IF no collection exists WHEN Save To Collection menu item is pressed THEN navigate to create collection page`() = runBlockingTest {
         val item = ToolbarMenu.Item.SaveToCollection
         val cachedTabCollectionsEmpty: List<TabCollection> = emptyList()
         every { tabCollectionStorage.cachedTabCollections } returns cachedTabCollectionsEmpty
 
-        val controller = createController(scope = this)
+        val controller = createController(scope = this, store = browserStore)
         controller.handleToolbarItemInteraction(item)
 
         verify { metrics.track(Event.BrowserMenuItemTapped(Event.BrowserMenuItemTapped.Item.SAVE_TO_COLLECTION)) }
@@ -492,84 +563,51 @@ class DefaultBrowserToolbarMenuControllerTest {
         }
         val directions = BrowserFragmentDirections.actionGlobalCollectionCreationFragment(
             saveCollectionStep = SaveCollectionStep.NameCollection,
-            tabIds = arrayOf(currentSession.id),
-            selectedTabIds = arrayOf(currentSession.id)
+            tabIds = arrayOf(selectedTab.id),
+            selectedTabIds = arrayOf(selectedTab.id)
         )
         verify { navController.navigate(directionsEq(directions), null) }
     }
 
     @Test
-    fun handleToolbarOpenInFenixPress() = runBlockingTest {
-        val controller = createController(scope = this, customTabSession = currentSession)
-
-        val item = ToolbarMenu.Item.OpenInFenix
+    fun `WHEN New Tab menu item is pressed THEN navigate to a new tab home`() = runBlockingTest {
+        val item = ToolbarMenu.Item.NewTab
 
-        every { currentSession.customTabConfig } returns mockk()
-        every { activity.startActivity(any()) } just Runs
+        val controller = createController(scope = this, store = browserStore)
 
         controller.handleToolbarItemInteraction(item)
 
-        verify { sessionFeature.release() }
-        verify { currentSession.customTabConfig = null }
-        verify { sessionManager.select(currentSession) }
-        verify { activity.startActivity(openInFenixIntent) }
-        verify { activity.finishAndRemoveTask() }
-    }
-
-    @Test
-    fun handleToolbarQuitPress() = runBlockingTest {
-        val item = ToolbarMenu.Item.Quit
-        val testScope = this
-
-        val controller = createController(scope = testScope)
-
-        controller.handleToolbarItemInteraction(item)
-
-        verify { deleteAndQuit(activity, testScope, null) }
-    }
-
-    @Test
-    fun handleToolbarReaderModeAppearancePress() = runBlockingTest {
-        val item = ToolbarMenu.Item.ReaderModeAppearance
-
-        val controller = createController(scope = this)
-
-        controller.handleToolbarItemInteraction(item)
-
-        verify { readerModeController.showControls() }
-        verify { metrics.track(Event.ReaderModeAppearanceOpened) }
-    }
-
-    @Test
-    fun handleToolbarOpenInAppPress() = runBlockingTest {
-        val item = ToolbarMenu.Item.OpenInApp
-
-        val controller = createController(scope = this)
-
-        controller.handleToolbarItemInteraction(item)
-
-        verify { settings.openInAppOpened = true }
+        verify {
+            navController.navigate(
+                directionsEq(
+                    NavGraphDirections.actionGlobalHome(
+                        focusOnAddressBar = true
+                    )
+                )
+            )
+        }
     }
 
     private fun createController(
         scope: CoroutineScope,
+        store: BrowserStore,
         activity: HomeActivity = this.activity,
-        customTabSession: Session? = null
+        customTabSessionId: String? = null
     ) = DefaultBrowserToolbarMenuController(
+        store = store,
         activity = activity,
         navController = navController,
         metrics = metrics,
         settings = settings,
         findInPageLauncher = findInPageLauncher,
         browserAnimator = browserAnimator,
-        customTabSession = customTabSession,
+        customTabSessionId = customTabSessionId,
         openInFenixIntent = openInFenixIntent,
         scope = scope,
         swipeRefresh = swipeRefreshLayout,
         tabCollectionStorage = tabCollectionStorage,
         bookmarkTapped = bookmarkTapped,
         readerModeController = readerModeController,
-        sessionManager = sessionManager,
         sessionFeature = sessionFeatureWrapper,
         topSitesStorage = topSitesStorage,
         browserStore = browserStore
diff --git a/app/src/test/java/org/mozilla/fenix/downloads/DynamicDownloadDialogBehaviorTest.kt b/app/src/test/java/org/mozilla/fenix/downloads/DynamicDownloadDialogBehaviorTest.kt
index 526125006..6b55b53d5 100644
--- a/app/src/test/java/org/mozilla/fenix/downloads/DynamicDownloadDialogBehaviorTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/downloads/DynamicDownloadDialogBehaviorTest.kt
@@ -60,7 +60,7 @@ class DynamicDownloadDialogBehaviorTest {
     }
 
     @Test
-    fun `Behavior will snap the dialog up if it is more than 50% visible`() {
+    fun `Behavior will snap the dialog up if it is more than 50 percent visible`() {
         val behavior = spyk(DynamicDownloadDialogBehavior<View>(testContext, attrs = null,
         bottomToolbarHeight = 10f))
         every { behavior.shouldScroll } returns true
diff --git a/app/src/test/java/org/mozilla/fenix/ext/BookmarkNodeTest.kt b/app/src/test/java/org/mozilla/fenix/ext/BookmarkNodeTest.kt
index 5f291061a..0f15ea076 100644
--- a/app/src/test/java/org/mozilla/fenix/ext/BookmarkNodeTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/ext/BookmarkNodeTest.kt
@@ -5,22 +5,21 @@
 package org.mozilla.fenix.ext
 
 import mozilla.components.concept.storage.BookmarkNode
-import mozilla.components.concept.storage.BookmarkNodeType
 import org.junit.Assert.assertEquals
 import org.junit.Test
+import org.mozilla.fenix.library.bookmarks.testBookmarkItem
+import org.mozilla.fenix.library.bookmarks.testFolder
 
 class BookmarkNodeTest {
 
-    private val bookmarkChild1 = newBookmarkNode("Child 1", 1, null)
-    private val bookmarkChild2 = newBookmarkNode("Child 2", 2, null)
-    private val bookmarkChild3 = newBookmarkNode("Child 3", 3, null)
+    private val bookmarkChild1 = testBookmarkItem("someFolder", "http://www.mockurl.com/1", "Child 1")
+    private val bookmarkChild2 = testBookmarkItem("someFolder", "http://www.mockurl.com/2", "Child 2")
+    private val bookmarkChild3 = testBookmarkItem("someFolder", "http://www.mockurl.com/3", "Child 3")
     private val allChildren = listOf(bookmarkChild1, bookmarkChild2)
 
-    private var uniqueId = 0
-
     @Test
     fun `GIVEN a bookmark node with children WHEN minusing a sub set of children THEN the children subset is removed and rest remains`() {
-        val bookmarkNode = newBookmarkNode("Parent 1", 0, allChildren)
+        val bookmarkNode = testFolder("parent1", "root", allChildren)
         val subsetToSubtract = setOf(bookmarkChild1)
         val expectedRemainingSubset = listOf(bookmarkChild2)
         val bookmarkNodeSubsetRemoved = bookmarkNode.minus(subsetToSubtract)
@@ -29,7 +28,7 @@ class BookmarkNodeTest {
 
     @Test
     fun `GIVEN a bookmark node with children WHEN minusing a set of all children THEN all children are removed and empty list remains`() {
-        val bookmarkNode = newBookmarkNode("Parent 1", 0, allChildren)
+        val bookmarkNode = testFolder("parent1", "root", allChildren)
         val setofAllChildren = setOf(bookmarkChild1, bookmarkChild2)
         val bookmarkNodeAllChildrenRemoved = bookmarkNode.minus(setofAllChildren)
         assertEquals(emptyList<BookmarkNode>(), bookmarkNodeAllChildrenRemoved.children)
@@ -38,21 +37,21 @@ class BookmarkNodeTest {
     @Test
     fun `GIVEN a bookmark node with children WHEN minusing a set of non-children THEN no children are removed`() {
         val setofNonChildren = setOf(bookmarkChild3)
-        val bookmarkNode = newBookmarkNode("Parent 1", 0, allChildren)
+        val bookmarkNode = testFolder("parent1", "root", allChildren)
         val bookmarkNodeNonChildrenRemoved = bookmarkNode.minus(setofNonChildren)
         assertEquals(allChildren, bookmarkNodeNonChildrenRemoved.children)
     }
 
     @Test
     fun `GIVEN a bookmark node with children WHEN minusing an empty set THEN no children are removed`() {
-        val bookmarkNode = newBookmarkNode("Parent 1", 0, allChildren)
+        val bookmarkNode = testFolder("parent1", "root", allChildren)
         val bookmarkNodeEmptySetRemoved = bookmarkNode.minus(emptySet())
         assertEquals(allChildren, bookmarkNodeEmptySetRemoved.children)
     }
 
     @Test
     fun `GIVEN a bookmark node with an empty list as children WHEN minusing a set of non-children from an empty parent THEN an empty list remains`() {
-        val parentWithEmptyList = newBookmarkNode("Parent 1", 0, emptyList<BookmarkNode>())
+        val parentWithEmptyList = testFolder("parent1", "root", emptyList())
         val setofAllChildren = setOf(bookmarkChild1, bookmarkChild2)
         val parentWithEmptyListNonChildRemoved = parentWithEmptyList.minus(setofAllChildren)
         assertEquals(emptyList<BookmarkNode>(), parentWithEmptyListNonChildRemoved.children)
@@ -60,14 +59,14 @@ class BookmarkNodeTest {
 
     @Test
     fun `GIVEN a bookmark node with null as children WHEN minusing a set of non-children from a parent with null children THEN null remains`() {
-        val parentWithNullList = newBookmarkNode("Parent 1", 0, null)
+        val parentWithNullList = testFolder("parent1", "root", null)
         val parentWithNullListNonChildRemoved = parentWithNullList.minus(allChildren.toSet())
         assertEquals(null, parentWithNullListNonChildRemoved.children)
     }
 
     @Test
     fun `GIVEN a bookmark node with children WHEN minusing a sub-set of children THEN the rest of the parents object should remain the same`() {
-        val bookmarkNode = newBookmarkNode("Parent 1", 0, allChildren)
+        val bookmarkNode = testFolder("parent1", "root", allChildren)
         val subsetToSubtract = setOf(bookmarkChild1)
         val expectedRemainingSubset = listOf(bookmarkChild2)
         val resultBookmarkNode = bookmarkNode.minus(subsetToSubtract)
@@ -77,14 +76,4 @@ class BookmarkNodeTest {
         val restofOriginal = bookmarkNode.copy(children = expectedRemainingSubset)
         assertEquals(restOfResult, restofOriginal)
     }
-
-    private fun newBookmarkNode(title: String, position: Int, children: List<BookmarkNode>?) = BookmarkNode(
-            type = BookmarkNodeType.ITEM,
-            guid = uniqueId++.toString(),
-            parentGuid = "12",
-            position = position,
-            title = title,
-            url = "www.mockurl.com",
-            children = children
-    )
 }
diff --git a/app/src/test/java/org/mozilla/fenix/ext/BrowserStateTest.kt b/app/src/test/java/org/mozilla/fenix/ext/BrowserStateTest.kt
deleted file mode 100644
index 7c2c0a1d1..000000000
--- a/app/src/test/java/org/mozilla/fenix/ext/BrowserStateTest.kt
+++ /dev/null
@@ -1,37 +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.ext
-
-import mozilla.components.browser.state.state.BrowserState
-import mozilla.components.browser.state.state.MediaState
-import mozilla.components.browser.state.state.createTab
-import org.junit.Assert.assertEquals
-import org.junit.Test
-
-private const val SESSION_ID_MOZILLA = "0"
-private const val SESSION_ID_BCC = "1"
-private const val SESSION_ID_BAD = "not a real session id"
-
-class BrowserStateTest {
-
-    private val sessionMozilla = createTab(url = "www.mozilla.org", id = SESSION_ID_MOZILLA)
-    private val sessionBcc = createTab(url = "www.bcc.co.uk", id = SESSION_ID_BCC)
-
-    @Test
-    fun `return media state if it matches tab id`() {
-        val state = BrowserState(
-            tabs = listOf(sessionBcc, sessionMozilla),
-            media = MediaState(
-                MediaState.Aggregate(
-                state = MediaState.State.PLAYING,
-                activeTabId = SESSION_ID_MOZILLA
-            ))
-        )
-
-        assertEquals(MediaState.State.PLAYING, state.getMediaStateForSession(SESSION_ID_MOZILLA))
-        assertEquals(MediaState.State.NONE, state.getMediaStateForSession(SESSION_ID_BCC))
-        assertEquals(MediaState.State.NONE, state.getMediaStateForSession(SESSION_ID_BAD))
-    }
-}
diff --git a/app/src/test/java/org/mozilla/fenix/helpers/StackTraces.kt b/app/src/test/java/org/mozilla/fenix/helpers/StackTraces.kt
new file mode 100644
index 000000000..19fc97f62
--- /dev/null
+++ b/app/src/test/java/org/mozilla/fenix/helpers/StackTraces.kt
@@ -0,0 +1,39 @@
+/* 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.helpers
+
+/**
+ * A collection of test helper functions for manipulating stack traces.
+ */
+object StackTraces {
+
+    /**
+     * Gets a stack trace from logcat output. To use this, you should remove the name of the
+     * Exception or "Caused by" lines causing the problem and only use the stack trace lines below
+     * it. See src/test/resources/EdmStorageProviderBaseLogcat.txt for an example.
+     */
+    fun getStackTraceFromLogcat(logcatResourcePath: String): Array<StackTraceElement> {
+        val logcat = javaClass.classLoader!!.getResource(logcatResourcePath).readText()
+        val lines = logcat.split('\n').filter(String::isNotBlank)
+        return lines.map(::logcatLineToStackTraceElement).toTypedArray()
+    }
+
+    private fun logcatLineToStackTraceElement(line: String): StackTraceElement {
+        // Expected format:
+        // 02-08 10:56:02.185 21990 21990 E AndroidRuntime: 	at android.os.StrictMode$AndroidBlockGuardPolicy.onReadFromDisk(StrictMode.java:1556)
+
+        // Expected: android.os.StrictMode$AndroidBlockGuardPolicy.onReadFromDisk
+        val methodInfo = line.substringBefore('(').substringAfterLast(' ')
+        val methodName = methodInfo.substringAfterLast('.')
+        val declaringClass = methodInfo.substringBeforeLast('.')
+
+        // Expected: StrictMode.java:1556
+        val fileInfo = line.substringAfter('(').substringBefore(')')
+        val fileName = fileInfo.substringBefore(':')
+        val lineNumber = fileInfo.substringAfter(':').toInt()
+
+        return StackTraceElement(declaringClass, methodName, fileName, lineNumber)
+    }
+}
diff --git a/app/src/test/java/org/mozilla/fenix/home/DefaultSessionControlControllerTest.kt b/app/src/test/java/org/mozilla/fenix/home/DefaultSessionControlControllerTest.kt
index 6025ba8b3..794d34039 100644
--- a/app/src/test/java/org/mozilla/fenix/home/DefaultSessionControlControllerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/home/DefaultSessionControlControllerTest.kt
@@ -468,7 +468,7 @@ class DefaultSessionControlControllerTest {
                 )
             }
         } finally {
-            unmockkStatic(SearchState::class)
+            unmockkStatic("mozilla.components.browser.state.state.SearchStateKt")
         }
     }
 
diff --git a/app/src/test/java/org/mozilla/fenix/home/HomeFragmentTest.kt b/app/src/test/java/org/mozilla/fenix/home/HomeFragmentTest.kt
index 8f24fa8e8..b201fd2e5 100644
--- a/app/src/test/java/org/mozilla/fenix/home/HomeFragmentTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/home/HomeFragmentTest.kt
@@ -8,7 +8,9 @@ import android.content.Context
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.spyk
+import io.mockk.verify
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import mozilla.components.browser.menu.view.MenuButton
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
@@ -65,4 +67,13 @@ class HomeFragmentTest {
 
         Assert.assertEquals(topSitesMaxLimit, topSitesConfig.totalSites)
     }
+
+    @Test
+    fun `WHEN configuration changed menu is dismissed`() {
+        val menuButton: MenuButton = mockk(relaxed = true)
+        homeFragment.getMenuButton = { menuButton }
+        homeFragment.onConfigurationChanged(mockk(relaxed = true))
+
+        verify(exactly = 1) { menuButton.dismissMenu() }
+    }
 }
diff --git a/app/src/test/java/org/mozilla/fenix/home/intent/OpenSpecificTabIntentProcessorTest.kt b/app/src/test/java/org/mozilla/fenix/home/intent/OpenSpecificTabIntentProcessorTest.kt
index ea155c2fc..045f5d680 100644
--- a/app/src/test/java/org/mozilla/fenix/home/intent/OpenSpecificTabIntentProcessorTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/home/intent/OpenSpecificTabIntentProcessorTest.kt
@@ -14,7 +14,6 @@ import io.mockk.verifyOrder
 import mozilla.components.browser.state.state.BrowserState
 import mozilla.components.browser.state.state.createTab
 import mozilla.components.browser.state.store.BrowserStore
-import mozilla.components.feature.media.service.AbstractMediaService
 import mozilla.components.feature.media.service.AbstractMediaSessionService
 import mozilla.components.feature.tabs.TabsUseCases
 import org.junit.Assert.assertFalse
@@ -23,7 +22,6 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mozilla.fenix.BrowserDirection
-import org.mozilla.fenix.FeatureFlags.newMediaSessionApi
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@@ -68,9 +66,14 @@ class OpenSpecificTabIntentProcessorTest {
     @Test
     fun `GIVEN an intent with null extra string WHEN it is processed THEN openToBrowser should not be called`() {
         val intent = Intent().apply {
-            action = AbstractMediaService.Companion.ACTION_SWITCH_TAB
+            action = AbstractMediaSessionService.Companion.ACTION_SWITCH_TAB
         }
 
+        val store = BrowserStore(BrowserState(tabs = listOf(createTab(id = TEST_SESSION_ID, url = "https:mozilla.org"))))
+        val tabUseCases: TabsUseCases = mockk(relaxed = true)
+        every { activity.components.core.store } returns store
+        every { activity.components.useCases.tabsUseCases } returns tabUseCases
+
         assertFalse(processor.process(intent, navController, out))
 
         verify(exactly = 0) { activity.openToBrowser(BrowserDirection.FromGlobal) }
@@ -81,13 +84,8 @@ class OpenSpecificTabIntentProcessorTest {
     @Test
     fun `GIVEN an intent with correct action and extra string WHEN it is processed THEN session should be selected and openToBrowser should be called`() {
         val intent = Intent().apply {
-            if (newMediaSessionApi) {
-                action = AbstractMediaSessionService.Companion.ACTION_SWITCH_TAB
-                putExtra(AbstractMediaSessionService.Companion.EXTRA_TAB_ID, TEST_SESSION_ID)
-            } else {
-                action = AbstractMediaService.Companion.ACTION_SWITCH_TAB
-                putExtra(AbstractMediaService.Companion.EXTRA_TAB_ID, TEST_SESSION_ID)
-            }
+            action = AbstractMediaSessionService.Companion.ACTION_SWITCH_TAB
+            putExtra(AbstractMediaSessionService.Companion.EXTRA_TAB_ID, TEST_SESSION_ID)
         }
         val store = BrowserStore(BrowserState(tabs = listOf(createTab(id = TEST_SESSION_ID, url = "https:mozilla.org"))))
         val tabUseCases: TabsUseCases = mockk(relaxed = true)
diff --git a/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkAdapterTest.kt b/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkAdapterTest.kt
index b80e584a7..bc04b618b 100644
--- a/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkAdapterTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkAdapterTest.kt
@@ -8,29 +8,20 @@ import io.mockk.mockk
 import io.mockk.spyk
 import io.mockk.verifyOrder
 import mozilla.components.concept.storage.BookmarkNode
-import mozilla.components.concept.storage.BookmarkNodeType
-import org.junit.Assert.assertFalse
+import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
+import org.junit.Assert.assertFalse
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
+import org.mozilla.fenix.library.bookmarks.viewholders.BookmarkNodeViewHolder
 
 @RunWith(FenixRobolectricTestRunner::class)
 internal class BookmarkAdapterTest {
 
     private lateinit var bookmarkAdapter: BookmarkAdapter
 
-    private val item = BookmarkNode(
-        BookmarkNodeType.ITEM,
-        "456",
-        "123",
-        0,
-        "Mozilla",
-        "http://mozilla.org",
-        null
-    )
-
     @Before
     fun setup() {
         bookmarkAdapter = spyk(
@@ -40,33 +31,83 @@ internal class BookmarkAdapterTest {
 
     @Test
     fun `update adapter from tree of bookmark nodes, null tree returns empty list`() {
-        val tree = BookmarkNode(
-            BookmarkNodeType.FOLDER, "123", null, 0, "Mobile", null, listOf(
-                item,
-                BookmarkNode(BookmarkNodeType.SEPARATOR, "789", "123", 1, null, null, null),
-                BookmarkNode(
-                    BookmarkNodeType.ITEM,
-                    "987",
-                    "123",
-                    2,
-                    "Firefox",
-                    "https://www.mozilla.org/en-US/firefox/",
-                    null
-                )
+        val tree = testFolder("123", "root", listOf(
+            testBookmarkItem("someFolder", "http://mozilla.org"),
+            testSeparator("123"),
+            testBookmarkItem("123", "https://www.mozilla.org/en-US/firefox/")
             )
         )
         bookmarkAdapter.updateData(tree, BookmarkFragmentState.Mode.Normal())
         bookmarkAdapter.updateData(null, BookmarkFragmentState.Mode.Normal())
         verifyOrder {
             bookmarkAdapter.updateData(tree, BookmarkFragmentState.Mode.Normal())
-            bookmarkAdapter.notifyItemRangeInserted(0, 3)
+            bookmarkAdapter.notifyItemRangeInserted(0, 2)
             bookmarkAdapter.updateData(null, BookmarkFragmentState.Mode.Normal())
-            bookmarkAdapter.notifyItemRangeRemoved(0, 3)
+            bookmarkAdapter.notifyItemRangeRemoved(0, 2)
         }
     }
 
+    @Test
+    fun `update adapter from tree of bookmark nodes, separators are excluded`() {
+        val sep1 = testSeparator("123")
+        val sep2 = testSeparator("123")
+        val item1 = testBookmarkItem("123", "http://mozilla.org")
+        val item2 = testBookmarkItem("123", "https://www.mozilla.org/en-US/firefox/")
+        val folder = testFolder("123", "root", title = "Mobile", children = listOf(item1, sep1, item2, sep2))
+        bookmarkAdapter.updateData(folder, BookmarkFragmentState.Mode.Normal())
+        verifyOrder {
+            bookmarkAdapter.updateData(folder, BookmarkFragmentState.Mode.Normal())
+            bookmarkAdapter.notifyItemRangeInserted(0, 2)
+        }
+
+        assertEquals(2, bookmarkAdapter.itemCount)
+        assertEquals(listOf(item1, item2), bookmarkAdapter.tree)
+    }
+
+    @Test
+    fun `update adapter from tree of bookmark nodes, folders are moved to the top`() {
+        val sep1 = testSeparator("123")
+        val item1 = testBookmarkItem("123", "http://mozilla.org")
+        val item2 = testBookmarkItem("123", "https://www.mozilla.org/en-US/firefox/")
+        val item3 = testBookmarkItem("123", "https://www.mozilla.org/en-US/firefox/2")
+        val item4 = testBookmarkItem("125", "https://www.mozilla.org/en-US/firefox/3")
+        val folder2 = testFolder("124", "123", title = "Mobile 2", children = emptyList())
+        val folder3 = testFolder("125", "123", title = "Mobile 3", children = listOf(item4))
+        val folder4 = testFolder("126", "123", title = "Mobile 3", children = emptyList())
+        val folder = testFolder("123", "root", title = "Mobile", children = listOf(
+            folder4, item1, sep1, item2, folder2, folder3, item3
+        ))
+        bookmarkAdapter.updateData(folder, BookmarkFragmentState.Mode.Normal())
+        verifyOrder {
+            bookmarkAdapter.updateData(folder, BookmarkFragmentState.Mode.Normal())
+            bookmarkAdapter.notifyItemRangeInserted(0, 6)
+        }
+
+        assertEquals(6, bookmarkAdapter.itemCount)
+        assertEquals(listOf(folder4, folder2, folder3, item1, item2, item3), bookmarkAdapter.tree)
+    }
+
+    @Test
+    fun `get item view type for different types of nodes`() {
+        val sep1 = testSeparator("123")
+        val item1 = testBookmarkItem("123", "https://www.mozilla.org/en-US/firefox/")
+        val folder1 = testFolder("124", "123", title = "Mobile 2", children = emptyList())
+        bookmarkAdapter.updateData(
+            testFolder("123", "root", listOf(sep1, item1, folder1)),
+            BookmarkFragmentState.Mode.Normal()
+        )
+
+        assertEquals(2, bookmarkAdapter.itemCount)
+        // item1
+        assertEquals(BookmarkNodeViewHolder.LAYOUT_ID, bookmarkAdapter.getItemViewType(0))
+        // folder1
+        assertEquals(BookmarkNodeViewHolder.LAYOUT_ID, bookmarkAdapter.getItemViewType(1))
+        // sep is dropped during update
+    }
+
     @Test
     fun `items are the same if they have the same guids`() {
+        val item = testBookmarkItem("someFolder", "http://mozilla.org")
         assertTrue(createSingleItemDiffUtil(item, item).areItemsTheSame(0, 0))
         assertTrue(
             createSingleItemDiffUtil(
@@ -84,6 +125,7 @@ internal class BookmarkAdapterTest {
 
     @Test
     fun `equal items have same contents unless their selected state changes`() {
+        val item = testBookmarkItem("someFolder", "http://mozilla.org")
         assertTrue(createSingleItemDiffUtil(item, item).areContentsTheSame(0, 0))
         assertFalse(
             createSingleItemDiffUtil(item, item.copy(position = 1)).areContentsTheSame(0, 0)
diff --git a/app/src/test/java/org/mozilla/fenix/library/bookmarks/UtilsKtTest.kt b/app/src/test/java/org/mozilla/fenix/library/bookmarks/UtilsKtTest.kt
index 42f185f32..3ea5539dc 100644
--- a/app/src/test/java/org/mozilla/fenix/library/bookmarks/UtilsKtTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/library/bookmarks/UtilsKtTest.kt
@@ -16,26 +16,10 @@ import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
 class UtilsKtTest {
     @Test
     fun `friendly root titles`() {
-        val url = BookmarkNode(
-            BookmarkNodeType.ITEM,
-            "456",
-            "folder",
-            0,
-            "Mozilla",
-            "http://mozilla.org",
-            null
-        )
+        val url = testBookmarkItem("folder", "http://mozilla.org", "Mozilla")
         assertEquals("Mozilla", friendlyRootTitle(testContext, url))
 
-        val folder = BookmarkNode(
-            BookmarkNodeType.FOLDER,
-            "456",
-            "folder",
-            0,
-            "Folder",
-            null,
-            null
-        )
+        val folder = testFolder("456", "folder", null, "Folder")
         assertEquals("Folder", friendlyRootTitle(testContext, folder))
 
         val root = folder.copy(guid = "root________", title = "root")
@@ -65,67 +49,17 @@ class UtilsKtTest {
 
     @Test
     fun `flatNodeList various cases`() {
-        val url = BookmarkNode(
-            BookmarkNodeType.ITEM,
-            "456",
-            "folder",
-            0,
-            "Mozilla",
-            "http://mozilla.org",
-            null
-        )
-        val url2 = BookmarkNode(
-            BookmarkNodeType.ITEM,
-            "8674",
-            "folder2",
-            0,
-            "Mozilla",
-            "http://mozilla.org",
-            null
-        )
+        val url = testBookmarkItem("folder", "http://mozilla.org")
+        val url2 = testBookmarkItem("folder2", "http://mozilla.org")
         assertEquals(emptyList<BookmarkNodeWithDepth>(), url.flatNodeList(null))
 
-        val root = BookmarkNode(
-            BookmarkNodeType.FOLDER,
-            "root",
-            null,
-            0,
-            "root",
-            null,
-            null
-        )
+        val root = testFolder("root", null, null)
         assertEquals(listOf(BookmarkNodeWithDepth(0, root, null)), root.flatNodeList(null))
         assertEquals(emptyList<BookmarkNodeWithDepth>(), root.flatNodeList("root"))
 
-        val folder = BookmarkNode(
-            BookmarkNodeType.FOLDER,
-            "folder",
-            root.guid,
-            0,
-            "folder",
-            null,
-            listOf(url)
-        )
-
-        val folder3 = BookmarkNode(
-            BookmarkNodeType.FOLDER,
-            "folder3",
-            "folder2",
-            0,
-            "folder3",
-            null,
-            null
-        )
-
-        val folder2 = BookmarkNode(
-            BookmarkNodeType.FOLDER,
-            "folder2",
-            root.guid,
-            0,
-            "folder2",
-            null,
-            listOf(folder3, url2)
-        )
+        val folder = testFolder("folder", root.guid, listOf(url))
+        val folder3 = testFolder("folder3", "folder2", null)
+        val folder2 = testFolder("folder2", root.guid, listOf(folder3, url2))
 
         val rootWithChildren = root.copy(children = listOf(folder, folder2))
         assertEquals(
@@ -145,3 +79,27 @@ class UtilsKtTest {
         )
     }
 }
+
+internal fun testBookmarkItem(parentGuid: String, url: String, title: String = "Item for $url") = BookmarkNode(
+    BookmarkNodeType.ITEM,
+    "guid#${Math.random() * 1000}",
+    parentGuid,
+    0,
+    title,
+    url,
+    null
+)
+
+internal fun testFolder(guid: String, parentGuid: String?, children: List<BookmarkNode>?, title: String = "Folder: $guid") = BookmarkNode(
+    BookmarkNodeType.FOLDER,
+    guid,
+    parentGuid,
+    0,
+    title,
+    null,
+    children
+)
+
+internal fun testSeparator(parentGuid: String) = BookmarkNode(
+    BookmarkNodeType.SEPARATOR, "guid#${Math.random() * 1000}", parentGuid, null, null, null, null
+)
diff --git a/app/src/test/java/org/mozilla/fenix/perf/PerformanceInflaterTest.kt b/app/src/test/java/org/mozilla/fenix/perf/PerformanceInflaterTest.kt
index 59698c783..dc09d1fba 100644
--- a/app/src/test/java/org/mozilla/fenix/perf/PerformanceInflaterTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/perf/PerformanceInflaterTest.kt
@@ -26,7 +26,8 @@ class PerformanceInflaterTest {
 
     private val layoutsNotToTest = setOf(
         "fragment_browser",
-        "fragment_add_on_internal_settings"
+        "fragment_add_on_internal_settings",
+        "activity_privacy_content_display"
     )
 
     @Before
diff --git a/app/src/test/java/org/mozilla/fenix/perf/ProfilerMarkerFactProcessorTest.kt b/app/src/test/java/org/mozilla/fenix/perf/ProfilerMarkerFactProcessorTest.kt
new file mode 100644
index 000000000..d0763e75a
--- /dev/null
+++ b/app/src/test/java/org/mozilla/fenix/perf/ProfilerMarkerFactProcessorTest.kt
@@ -0,0 +1,89 @@
+/* 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.perf
+
+import android.os.Handler
+import android.os.Looper
+import io.mockk.Called
+import io.mockk.MockKAnnotations
+import io.mockk.every
+import io.mockk.impl.annotations.RelaxedMockK
+import io.mockk.mockk
+import io.mockk.slot
+import io.mockk.verify
+import mozilla.components.concept.base.profiler.Profiler
+import mozilla.components.support.base.Component
+import mozilla.components.support.base.facts.Action
+import mozilla.components.support.base.facts.Fact
+import org.junit.Before
+import org.junit.Test
+
+class ProfilerMarkerFactProcessorTest {
+
+    @RelaxedMockK lateinit var profiler: Profiler
+    @RelaxedMockK lateinit var mainHandler: Handler
+    lateinit var processor: ProfilerMarkerFactProcessor
+
+    var myLooper: Looper? = null
+
+    @Before
+    fun setUp() {
+        MockKAnnotations.init(this)
+        myLooper = null
+        processor = ProfilerMarkerFactProcessor({ profiler }, mainHandler, { myLooper })
+    }
+
+    @Test
+    fun `GIVEN we are on the main thread WHEN a fact with an implementation detail action is received THEN a profiler marker is added now`() {
+        myLooper = mainHandler.looper // main thread
+
+        val fact = newFact(Action.IMPLEMENTATION_DETAIL)
+        processor.process(fact)
+
+        verify { profiler.addMarker(fact.item) }
+    }
+
+    @Test
+    fun `GIVEN we are not on the main thread WHEN a fact with an implementation detail action is received THEN adding the marker is posted to the main thread`() {
+        myLooper = mockk() // off main thread
+        val mainThreadPostedSlot = slot<Runnable>()
+        every { profiler.getProfilerTime() } returns 100.0
+
+        val fact = newFact(Action.IMPLEMENTATION_DETAIL)
+        processor.process(fact)
+
+        verify { mainHandler.post(capture(mainThreadPostedSlot)) }
+        verifyProfilerAddMarkerWasNotCalled()
+
+        mainThreadPostedSlot.captured.run() // call the captured function posted to the main thread.
+        verify { profiler.addMarker(fact.item, 100.0, 100.0, null) }
+    }
+
+    @Test
+    fun `WHEN a fact with a non-implementation detail action is received THEN no profiler marker is added`() {
+        val fact = newFact(Action.CANCEL)
+        processor.process(fact)
+        verify { profiler wasNot Called }
+    }
+
+    private fun verifyProfilerAddMarkerWasNotCalled() {
+        verify(exactly = 0) {
+            profiler.addMarker(any())
+            profiler.addMarker(any(), any() as Double?)
+            profiler.addMarker(any(), any() as String?)
+            profiler.addMarker(any(), any(), any())
+            profiler.addMarker(any(), any(), any(), any())
+        }
+    }
+}
+
+private fun newFact(
+    action: Action,
+    item: String = "itemName"
+) = Fact(
+    Component.BROWSER_SESSION,
+    action,
+    item
+)
diff --git a/app/src/test/java/org/mozilla/fenix/perf/StartupFrameworkStartMeasurementTest.kt b/app/src/test/java/org/mozilla/fenix/perf/StartupFrameworkStartMeasurementTest.kt
index 7fadf1f28..fa465b2fb 100644
--- a/app/src/test/java/org/mozilla/fenix/perf/StartupFrameworkStartMeasurementTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/perf/StartupFrameworkStartMeasurementTest.kt
@@ -17,7 +17,8 @@ import org.junit.Before
 import org.junit.Test
 import org.mozilla.fenix.GleanMetrics.StartupTimeline as Telemetry
 
-private const val CLOCK_TICKS_PER_SECOND = 100L
+private const val PRIMARY_TICKS = 100L
+private const val SECONDARY_TICKS = 50L
 
 class StartupFrameworkStartMeasurementTest {
 
@@ -27,10 +28,13 @@ class StartupFrameworkStartMeasurementTest {
     // We'd prefer to use the Glean test methods over these mocks but they require us to add
     // Robolectric and it's not worth the impact on test duration.
     @MockK private lateinit var telemetry: Telemetry
-    @MockK(relaxed = true) private lateinit var frameworkStart: TimespanMetricType
+    @MockK(relaxed = true) private lateinit var frameworkPrimary: TimespanMetricType
+    @MockK(relaxed = true) private lateinit var frameworkSecondary: TimespanMetricType
     @MockK(relaxed = true) private lateinit var frameworkStartError: BooleanMetricType
     @MockK(relaxed = true) private lateinit var clockTicksPerSecond: CounterMetricType
 
+    private var clockTicksPerSecondValue = -1L
+
     private var elapsedRealtimeNanos = -1L
     private var processStartTimeTicks = -1L
 
@@ -41,13 +45,17 @@ class StartupFrameworkStartMeasurementTest {
         elapsedRealtimeNanos = -1
         processStartTimeTicks = -1
 
+        // This value is hard-coded in the OS so we default to it as it's the expected value.
+        clockTicksPerSecondValue = PRIMARY_TICKS
+
         stat = spyk(object : Stat() {
-            override val clockTicksPerSecond: Long get() = CLOCK_TICKS_PER_SECOND
+            override val clockTicksPerSecond: Long get() = clockTicksPerSecondValue
         })
         every { stat.getProcessStartTimeTicks(any()) } answers { processStartTimeTicks }
         val getElapsedRealtimeNanos = { elapsedRealtimeNanos }
 
-        every { telemetry.frameworkStart } returns frameworkStart
+        every { telemetry.frameworkPrimary } returns frameworkPrimary
+        every { telemetry.frameworkSecondary } returns frameworkSecondary
         every { telemetry.frameworkStartError } returns frameworkStartError
         every { telemetry.clockTicksPerSecond } returns clockTicksPerSecond
 
@@ -67,13 +75,32 @@ class StartupFrameworkStartMeasurementTest {
     }
 
     @Test
-    fun `GIVEN app init is set to valid values WHEN metrics are set THEN frameworkStart is set with the correct value`() {
+    fun `GIVEN app init is set to valid values and clock ticks per second is 100 WHEN metrics are set THEN frameworkPrimary is set with the correct value`() {
+        clockTicksPerSecondValue = PRIMARY_TICKS
+        setProcessAppInitAndMetrics(processStart = 166_636_813, appInit = 1_845_312_345_673_925)
+        verifyFrameworkStartSuccess(178_944_220_000_000, isPrimary = true) // calculated by hand.
+    }
+
+    @Test
+    fun `GIVEN app init is set to valid values and clock ticks per second is not 100 WHEN metrics are set THEN frameworkSecondary is set with the correct value`() {
+        clockTicksPerSecondValue = SECONDARY_TICKS
         setProcessAppInitAndMetrics(processStart = 166_636_813, appInit = 1_845_312_345_673_925)
-        verifyFrameworkStartSuccess(178_944_220_000_000) // calculated by hand.
+        verifyFrameworkStartSuccess(178_944_220_000_000, isPrimary = false) // calculated by hand.
     }
 
     @Test // this overlaps with the success case test.
-    fun `GIVEN app init has valid values WHEN onAppInit is called twice and metrics are set THEN frameworkStart uses the first app init value`() {
+    fun `GIVEN app init has valid values and clock ticks per second is 100 WHEN onAppInit is called twice and metrics are set THEN frameworkPrimary uses the first app init value`() {
+        clockTicksPerSecondValue = PRIMARY_TICKS
+        testAppInitCalledTwice(isPrimary = true)
+    }
+
+    @Test // this overlaps with the success case test.
+    fun `GIVEN app init has valid values and clock ticks per second is not 100 WHEN onAppInit is called twice and metrics are set THEN frameworkSecondary uses the first app init value`() {
+        clockTicksPerSecondValue = SECONDARY_TICKS
+        testAppInitCalledTwice(isPrimary = false)
+    }
+
+    private fun testAppInitCalledTwice(isPrimary: Boolean) {
         processStartTimeTicks = 166_636_813
 
         elapsedRealtimeNanos = 1_845_312_345_673_925
@@ -82,14 +109,28 @@ class StartupFrameworkStartMeasurementTest {
         metrics.onApplicationInit()
 
         metrics.setExpensiveMetric()
-        verifyFrameworkStartSuccess(178_944_220_000_000) // calculated by hand.
+        verifyFrameworkStartSuccess(178_944_220_000_000, isPrimary) // calculated by hand.
     }
 
     @Test
-    fun `GIVEN app init have valid values WHEN metrics are set twice THEN frameworkStart is only set once`() {
+    fun `GIVEN app init have valid values and clock ticks per second is 100 WHEN metrics are set twice THEN frameworkPrimary is only set once`() {
+        clockTicksPerSecondValue = PRIMARY_TICKS
+        testMetricsSetTwice(isPrimary = true)
+    }
+
+    @Test
+    fun `GIVEN app init have valid values and clock ticks per second is not 100 WHEN metrics are set twice THEN frameworkSecondary is only set once`() {
+        clockTicksPerSecondValue = SECONDARY_TICKS
+        testMetricsSetTwice(isPrimary = false)
+    }
+
+    private fun testMetricsSetTwice(isPrimary: Boolean) {
         setProcessAppInitAndMetrics(10, 100)
         metrics.setExpensiveMetric()
-        verify(exactly = 1) { frameworkStart.setRawNanos(any()) }
+
+        val (setMetric, unsetMetric) = getSetAndUnsetMetric(isPrimary)
+        verify(exactly = 1) { setMetric.setRawNanos(any()) }
+        verify { unsetMetric wasNot Called }
         verify(exactly = 1) { clockTicksPerSecond.add(any()) }
         verify { frameworkStartError wasNot Called }
     }
@@ -103,15 +144,33 @@ class StartupFrameworkStartMeasurementTest {
         metrics.setExpensiveMetric()
     }
 
-    private fun verifyFrameworkStartSuccess(nanos: Long) {
-        verify { frameworkStart.setRawNanos(nanos) }
-        verify { clockTicksPerSecond.add(CLOCK_TICKS_PER_SECOND.toInt()) }
+    private fun verifyFrameworkStartSuccess(nanos: Long, isPrimary: Boolean) {
+        val (setMetric, unsetMetric) = getSetAndUnsetMetric(isPrimary)
+        verify { setMetric.setRawNanos(nanos) }
+        verify { unsetMetric wasNot Called }
+
+        val expectedClockTicksPerSecond = getExpectedClockTicksPerSecond(isPrimary)
+        verify { clockTicksPerSecond.add(expectedClockTicksPerSecond.toInt()) }
         verify { frameworkStartError wasNot Called }
     }
 
     private fun verifyFrameworkStartError() {
         verify { frameworkStartError.set(true) }
-        verify { frameworkStart wasNot Called }
+        verify { frameworkPrimary wasNot Called }
+        verify { frameworkSecondary wasNot Called }
         verify { clockTicksPerSecond wasNot Called }
     }
+
+    private fun getSetAndUnsetMetric(isPrimary: Boolean): Pair<TimespanMetricType, TimespanMetricType> {
+        return if (isPrimary) {
+            Pair(frameworkPrimary, frameworkSecondary)
+        } else {
+            Pair(frameworkSecondary, frameworkPrimary)
+        }
+    }
+
+    // This hard-codes some data that's passed into the test but I don't want to spend more time
+    // so I don't bother cleaning it up now.
+    private fun getExpectedClockTicksPerSecond(isPrimary: Boolean): Long =
+        if (isPrimary) PRIMARY_TICKS else SECONDARY_TICKS
 }
diff --git a/app/src/test/java/org/mozilla/fenix/perf/ThreadPenaltyDeathWithIgnoresListenerTest.kt b/app/src/test/java/org/mozilla/fenix/perf/ThreadPenaltyDeathWithIgnoresListenerTest.kt
new file mode 100644
index 000000000..f046e406c
--- /dev/null
+++ b/app/src/test/java/org/mozilla/fenix/perf/ThreadPenaltyDeathWithIgnoresListenerTest.kt
@@ -0,0 +1,78 @@
+/* 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.perf
+
+import android.os.strictmode.Violation
+import io.mockk.MockKAnnotations
+import io.mockk.every
+import io.mockk.impl.annotations.MockK
+import io.mockk.impl.annotations.RelaxedMockK
+import io.mockk.mockkObject
+import io.mockk.unmockkAll
+import io.mockk.verify
+import mozilla.components.support.base.log.logger.Logger
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.mozilla.fenix.helpers.StackTraces
+import org.mozilla.fenix.utils.ManufacturerCodes
+
+class ThreadPenaltyDeathWithIgnoresListenerTest {
+
+    @RelaxedMockK private lateinit var logger: Logger
+    private lateinit var listener: ThreadPenaltyDeathWithIgnoresListener
+    @MockK private lateinit var violation: Violation
+    private lateinit var stackTrace: Array<StackTraceElement>
+
+    @Before
+    fun setUp() {
+        MockKAnnotations.init(this)
+
+        listener = ThreadPenaltyDeathWithIgnoresListener(logger)
+
+        stackTrace = emptyArray()
+        every { violation.stackTrace } answers { stackTrace }
+    }
+
+    @After
+    fun tearDown() {
+        unmockkAll()
+    }
+
+    @Test(expected = RuntimeException::class)
+    fun `WHEN provided an arbitrary violation that does not conflict with ignores THEN we throw an exception`() {
+        stackTrace = Exception().stackTrace
+        listener.onThreadViolation(violation)
+    }
+
+    @Test
+    fun `GIVEN we're on a Samsung WHEN provided the EdmStorageProvider violation THEN it will be ignored and logged`() {
+        mockkObject(ManufacturerCodes)
+        every { ManufacturerCodes.isSamsung } returns true
+
+        every { violation.stackTrace } returns getEdmStorageProviderStackTrace()
+        listener.onThreadViolation(violation)
+
+        verify { logger.debug("Ignoring StrictMode ThreadPolicy violation", violation) }
+    }
+
+    @Test(expected = RuntimeException::class)
+    fun `GIVEN we're not on a Samsung or LG WHEN provided the EdmStorageProvider violation THEN we throw an exception`() {
+        mockkObject(ManufacturerCodes)
+        every { ManufacturerCodes.isSamsung } returns false
+        every { ManufacturerCodes.isLG } returns false
+
+        every { violation.stackTrace } returns getEdmStorageProviderStackTrace()
+        listener.onThreadViolation(violation)
+    }
+
+    @Test
+    fun `WHEN violation is null THEN we don't throw an exception`() {
+        listener.onThreadViolation(null)
+    }
+
+    private fun getEdmStorageProviderStackTrace() =
+        StackTraces.getStackTraceFromLogcat("EdmStorageProviderBaseLogcat.txt")
+}
diff --git a/app/src/test/java/org/mozilla/fenix/share/ShareControllerTest.kt b/app/src/test/java/org/mozilla/fenix/share/ShareControllerTest.kt
index ed0a7c3dc..39d4382c2 100644
--- a/app/src/test/java/org/mozilla/fenix/share/ShareControllerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/share/ShareControllerTest.kt
@@ -362,12 +362,12 @@ class ShareControllerTest {
     }
 
     @Test
-    fun `getShareSubject will return "shareSubject" if that is non null`() {
+    fun `getShareSubject will return 'shareSubject' if that is non null`() {
         assertEquals(shareSubject, controller.getShareSubject())
     }
 
     @Test
-    fun `getShareSubject will return a concatenation of tab titles if "shareSubject" is null`() {
+    fun `getShareSubject will return a concatenation of tab titles if 'shareSubject' is null`() {
         val controller = DefaultShareController(
             context, null, shareData, sendTabUseCases, snackbar, navController,
             recentAppStorage, testCoroutineScope, testDispatcher, dismiss
diff --git a/app/src/test/java/org/mozilla/fenix/tabtray/DefaultTabTrayControllerTest.kt b/app/src/test/java/org/mozilla/fenix/tabtray/DefaultTabTrayControllerTest.kt
index 8e7f7599a..3c974a981 100644
--- a/app/src/test/java/org/mozilla/fenix/tabtray/DefaultTabTrayControllerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/tabtray/DefaultTabTrayControllerTest.kt
@@ -32,7 +32,6 @@ import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
-import org.mozilla.fenix.BrowserDirection
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
 import org.mozilla.fenix.browser.browsingmode.BrowsingMode
@@ -179,15 +178,6 @@ class DefaultTabTrayControllerTest {
         }
     }
 
-    @Test
-    fun onSyncedTabClicked() {
-        controller.handleSyncedTabClicked(mockk(relaxed = true))
-
-        verify {
-            activity.openToBrowserAndLoad(any(), true, BrowserDirection.FromTabTray)
-        }
-    }
-
     @Test
     fun handleBackPressed() {
         every { tabTrayFragmentStore.state.mode } returns TabTrayDialogFragmentState.Mode.MultiSelect(
diff --git a/app/src/test/java/org/mozilla/fenix/tabtray/SyncedTabsControllerTest.kt b/app/src/test/java/org/mozilla/fenix/tabtray/SyncedTabsControllerTest.kt
deleted file mode 100644
index 01e9c598f..000000000
--- a/app/src/test/java/org/mozilla/fenix/tabtray/SyncedTabsControllerTest.kt
+++ /dev/null
@@ -1,140 +0,0 @@
-package org.mozilla.fenix.tabtray
-
-import android.view.LayoutInflater
-import android.view.View
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.LifecycleRegistry
-import androidx.recyclerview.widget.ConcatAdapter
-import io.mockk.Called
-import io.mockk.every
-import io.mockk.mockk
-import io.mockk.verify
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.test.TestCoroutineDispatcher
-import kotlinx.coroutines.test.runBlockingTest
-import mozilla.components.browser.storage.sync.SyncedDeviceTabs
-import mozilla.components.feature.syncedtabs.view.SyncedTabsView.ErrorType
-import mozilla.components.support.test.ext.joinBlocking
-import mozilla.components.support.test.robolectric.testContext
-import mozilla.components.support.test.rule.MainCoroutineRule
-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.R
-import org.mozilla.fenix.components.metrics.MetricController
-import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
-import org.mozilla.fenix.sync.SyncedTabsViewHolder
-import org.mozilla.fenix.tabtray.TabTrayDialogFragmentAction.EnterMultiSelectMode
-import org.mozilla.fenix.tabtray.TabTrayDialogFragmentAction.ExitMultiSelectMode
-import org.mozilla.fenix.tabtray.TabTrayDialogFragmentState.Mode
-
-@ExperimentalCoroutinesApi
-@RunWith(FenixRobolectricTestRunner::class)
-class SyncedTabsControllerTest {
-
-    private val testDispatcher = TestCoroutineDispatcher()
-    @get:Rule
-    val coroutinesTestRule = MainCoroutineRule(testDispatcher)
-
-    private lateinit var view: View
-    private lateinit var controller: SyncedTabsController
-    private lateinit var lifecycleOwner: LifecycleOwner
-    private lateinit var lifecycle: LifecycleRegistry
-    private lateinit var concatAdapter: ConcatAdapter
-    private lateinit var store: TabTrayDialogFragmentStore
-
-    @Before
-    fun setup() = runBlockingTest {
-        lifecycleOwner = mockk()
-        lifecycle = LifecycleRegistry(lifecycleOwner)
-        lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_START)
-        every { lifecycleOwner.lifecycle } returns lifecycle
-
-        concatAdapter = mockk()
-        every { concatAdapter.addAdapter(any()) } returns true
-        every { concatAdapter.removeAdapter(any()) } returns true
-
-        store = TabTrayDialogFragmentStore(
-            initialState = TabTrayDialogFragmentState(
-                mode = Mode.Normal,
-                browserState = mockk(relaxed = true)
-            )
-        )
-
-        view = LayoutInflater.from(testContext).inflate(R.layout.about_list_item, null)
-        val metrics: MetricController = mockk()
-        controller =
-            SyncedTabsController(lifecycleOwner, view, store, concatAdapter, coroutineContext, metrics)
-    }
-
-    @After
-    fun cleanUp() {
-        testDispatcher.cleanupTestCoroutines()
-    }
-
-    @Test
-    fun `display synced tabs in reverse`() {
-        val tabs = listOf(
-            SyncedDeviceTabs(
-                device = mockk(relaxed = true),
-                tabs = listOf(
-                    mockk(relaxed = true),
-                    mockk(relaxed = true)
-                )
-            )
-        )
-
-        controller.displaySyncedTabs(tabs)
-
-        val itemCount = controller.adapter.itemCount
-
-        // title + device name + 2 tabs
-        assertEquals(4, itemCount)
-        assertEquals(
-            SyncedTabsViewHolder.TitleViewHolder.LAYOUT_ID,
-            controller.adapter.getItemViewType(itemCount - 1)
-        )
-        assertEquals(
-            SyncedTabsViewHolder.DeviceViewHolder.LAYOUT_ID,
-            controller.adapter.getItemViewType(itemCount - 2)
-        )
-        assertEquals(
-            SyncedTabsViewHolder.TabViewHolder.LAYOUT_ID,
-            controller.adapter.getItemViewType(itemCount - 3)
-        )
-        assertEquals(
-            SyncedTabsViewHolder.TabViewHolder.LAYOUT_ID,
-            controller.adapter.getItemViewType(itemCount - 4)
-        )
-    }
-
-    @Test
-    fun `show error when we go kaput`() {
-        controller.onError(ErrorType.SYNC_NEEDS_REAUTHENTICATION)
-
-        assertEquals(1, controller.adapter.itemCount)
-        assertEquals(
-            SyncedTabsViewHolder.ErrorViewHolder.LAYOUT_ID,
-            controller.adapter.getItemViewType(0)
-        )
-    }
-
-    @Test
-    fun `do nothing on init, drop first event`() {
-        verify { concatAdapter wasNot Called }
-    }
-
-    @Test
-    fun `concatAdapter updated on mode changes`() = testDispatcher.runBlockingTest {
-        store.dispatch(EnterMultiSelectMode).joinBlocking()
-        verify { concatAdapter.removeAdapter(any()) }
-
-        store.dispatch(ExitMultiSelectMode).joinBlocking()
-        // When returning from Multiselect the adapter should be added at the end
-        verify { concatAdapter.addAdapter(any()) }
-    }
-}
diff --git a/app/src/test/java/org/mozilla/fenix/tabtray/TabTrayFragmentInteractorTest.kt b/app/src/test/java/org/mozilla/fenix/tabtray/TabTrayFragmentInteractorTest.kt
index a0e50b017..5504c715a 100644
--- a/app/src/test/java/org/mozilla/fenix/tabtray/TabTrayFragmentInteractorTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/tabtray/TabTrayFragmentInteractorTest.kt
@@ -89,12 +89,6 @@ class TabTrayFragmentInteractorTest {
         verify { controller.handleCloseAllTabsClicked(true) }
     }
 
-    @Test
-    fun onSyncedTabClicked() {
-        interactor.onSyncedTabClicked(mockk(relaxed = true))
-        verify { controller.handleSyncedTabClicked(any()) }
-    }
-
     @Test
     fun onBackPressed() {
         interactor.onBackPressed()
diff --git a/app/src/test/java/org/mozilla/fenix/tabtray/TabTrayViewHolderTest.kt b/app/src/test/java/org/mozilla/fenix/tabtray/TabTrayViewHolderTest.kt
index f55d4d6cc..144abb980 100644
--- a/app/src/test/java/org/mozilla/fenix/tabtray/TabTrayViewHolderTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/tabtray/TabTrayViewHolderTest.kt
@@ -17,7 +17,6 @@ import io.mockk.verify
 import mozilla.components.browser.state.state.BrowserState
 import mozilla.components.browser.state.state.ContentState
 import mozilla.components.browser.state.state.MediaSessionState
-import mozilla.components.browser.state.state.MediaState
 import mozilla.components.browser.state.state.SessionState
 import mozilla.components.browser.state.state.TabSessionState
 import mozilla.components.browser.state.store.BrowserStore
@@ -31,7 +30,6 @@ import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mozilla.fenix.FeatureFlags.newMediaSessionApi
 import org.mozilla.fenix.R
 import org.mozilla.fenix.components.metrics.MetricController
 import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@@ -83,31 +81,20 @@ class TabTrayViewHolderTest {
             url = "https://example.com"
         )
 
-        if (newMediaSessionApi) {
-            state = state.copy(
-                tabs = listOf(
-                    TabSessionState(
-                        id = "123",
-                        content = ContentState(
-                            url = "https://example.com",
-                            searchTerms = "search terms"
-                        ),
-                        mediaSessionState = mediaSessionState
-                    )
+        state = state.copy(
+            tabs = listOf(
+                TabSessionState(
+                    id = "123",
+                    content = ContentState(
+                        url = "https://example.com",
+                        searchTerms = "search terms"
+                    ),
+                    mediaSessionState = mediaSessionState
                 )
             )
+        )
 
-            every { mediaSessionState.playbackState } answers { MediaSession.PlaybackState.PAUSED }
-        } else {
-            state = state.copy(
-                media = MediaState(
-                    aggregate = MediaState.Aggregate(
-                        activeTabId = "123",
-                        state = MediaState.State.PAUSED
-                    )
-                )
-            )
-        }
+        every { mediaSessionState.playbackState } answers { MediaSession.PlaybackState.PAUSED }
 
         tabViewHolder.bind(tab, false, mockk(), mockk())
 
@@ -124,31 +111,20 @@ class TabTrayViewHolderTest {
             url = "https://example.com"
         )
 
-        if (newMediaSessionApi) {
-            state = state.copy(
-                tabs = listOf(
-                    TabSessionState(
-                        id = "123",
-                        content = ContentState(
-                            url = "https://example.com",
-                            searchTerms = "search terms"
-                        ),
-                        mediaSessionState = mediaSessionState
-                    )
+        state = state.copy(
+            tabs = listOf(
+                TabSessionState(
+                    id = "123",
+                    content = ContentState(
+                        url = "https://example.com",
+                        searchTerms = "search terms"
+                    ),
+                    mediaSessionState = mediaSessionState
                 )
             )
+        )
 
-            every { mediaSessionState.playbackState } answers { MediaSession.PlaybackState.PLAYING }
-        } else {
-            state = state.copy(
-                media = MediaState(
-                    aggregate = MediaState.Aggregate(
-                        activeTabId = "123",
-                        state = MediaState.State.PLAYING
-                    )
-                )
-            )
-        }
+        every { mediaSessionState.playbackState } answers { MediaSession.PlaybackState.PLAYING }
 
         tabViewHolder.bind(tab, false, mockk(), mockk())
 
diff --git a/app/src/test/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlayTest.kt b/app/src/test/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlayTest.kt
index 59f5753c7..98da76499 100644
--- a/app/src/test/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlayTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlayTest.kt
@@ -156,7 +156,9 @@ class TrackingProtectionOverlayTest {
     fun `show onboarding when trackers are blocked`() {
         every { toolbar.hasWindowFocus() } returns true
         every { settings.shouldShowTrackingProtectionCfr } returns true
+        every { session.content.progress } returns 100
         every { session.content.loading } returns false
+        every { settings.shouldUseTrackingProtection } returns true
         every { session.trackingProtection } returns TrackingProtectionState(
             enabled = true,
             blockedTrackers = listOf(mockk())
@@ -165,6 +167,20 @@ class TrackingProtectionOverlayTest {
         verify { settings.incrementTrackingProtectionOnboardingCount() }
     }
 
+    @Test
+    fun `no-op when trackers are blocked but not finished loading`() {
+        every { toolbar.hasWindowFocus() } returns true
+        every { settings.shouldShowTrackingProtectionCfr } returns true
+        every { session.content.progress } returns 50
+        every { session.content.loading } returns false
+        every { session.trackingProtection } returns TrackingProtectionState(
+            enabled = true,
+            blockedTrackers = listOf(mockk())
+        )
+        overlay.onLoadingStateChanged(session)
+        verify(exactly = 0) { settings.incrementTrackingProtectionOnboardingCount() }
+    }
+
     @Test
     fun `no-op when toolbar doesn't have focus`() {
         every { toolbar.hasWindowFocus() } returns false
diff --git a/app/src/test/java/org/mozilla/fenix/utils/ManufacturerCodesTest.kt b/app/src/test/java/org/mozilla/fenix/utils/ManufacturerCodesTest.kt
new file mode 100644
index 000000000..f277af239
--- /dev/null
+++ b/app/src/test/java/org/mozilla/fenix/utils/ManufacturerCodesTest.kt
@@ -0,0 +1,69 @@
+/* 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.utils
+
+import android.os.Build
+import org.junit.After
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Test
+import java.lang.reflect.Modifier
+
+class ManufacturerCodesTest {
+
+    private val manufacturerField = Build::class.java.getDeclaredField("MANUFACTURER")
+    private var manufacturer: String?
+        get() = Build.MANUFACTURER
+        set(value) { manufacturerField.set(null, value) }
+
+    @Before
+    fun setUp() {
+        enableManufacturerModifications()
+        manufacturer = null // reset to default state before test.
+        assertEquals(null, Build.MANUFACTURER) // sanity check.
+    }
+
+    private fun enableManufacturerModifications() {
+        // Mocking, which might be simpler, doesn't seem to work so we use reflection.
+        // Methodology via https://stackoverflow.com/a/3301720/2219998
+        val modifiers = manufacturerField.javaClass.getDeclaredField("modifiers")
+        modifiers.isAccessible = true
+        modifiers.setInt(manufacturerField, manufacturerField.modifiers and Modifier.FINAL.inv())
+    }
+
+    @After
+    fun tearDown() {
+        // After this method, Build.MANUFACTURER appears to return to
+        // static final so we don't need to undo that.
+        manufacturer = null
+        assertEquals(null, Build.MANUFACTURER) // sanity check.
+    }
+
+    @Test // To reduce boilerplate, we avoid best practice and put several tests in one.
+    fun testIsLG() {
+        manufacturer = "LGE" // expected value for lg devices
+        assertTrue(ManufacturerCodes.isLG)
+
+        manufacturer = "lge" // unexpected value but is still an lg device
+        assertTrue(ManufacturerCodes.isLG)
+
+        manufacturer = "samsung"
+        assertFalse(ManufacturerCodes.isLG)
+    }
+
+    @Test // To reduce boilerplate, we avoid best practice and put several tests in one.
+    fun testIsSamsung() {
+        manufacturer = "samsung" // expected value for samsung devices
+        assertTrue(ManufacturerCodes.isSamsung)
+
+        manufacturer = "SaMsUnG" // unexpected value but is still a samsung device
+        assertTrue(ManufacturerCodes.isSamsung)
+
+        manufacturer = "LGE"
+        assertFalse(ManufacturerCodes.isSamsung)
+    }
+}
diff --git a/app/src/test/java/org/mozilla/fenix/utils/ToolbarPopupWindowTest.kt b/app/src/test/java/org/mozilla/fenix/utils/ToolbarPopupWindowTest.kt
index 12ec801cd..69ef82b3a 100644
--- a/app/src/test/java/org/mozilla/fenix/utils/ToolbarPopupWindowTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/utils/ToolbarPopupWindowTest.kt
@@ -4,11 +4,10 @@
 
 package org.mozilla.fenix.utils
 
-import io.mockk.every
 import io.mockk.mockk
-import mozilla.components.browser.session.Session
 import mozilla.components.browser.state.state.BrowserState
 import mozilla.components.browser.state.state.ReaderState
+import mozilla.components.browser.state.state.createCustomTab
 import mozilla.components.browser.state.state.createTab
 import mozilla.components.browser.state.store.BrowserStore
 import org.junit.Assert.assertEquals
@@ -21,8 +20,7 @@ class ToolbarPopupWindowTest {
 
     @Test
     fun getUrlForClipboard() {
-        val customTabSession: Session = mockk()
-        every { customTabSession.url } returns "https://mozilla.org"
+        val customTabSession = createCustomTab("https://mozilla.org")
 
         // Custom tab
         assertEquals(
diff --git a/app/src/test/resources/EdmStorageProviderBaseLogcat.txt b/app/src/test/resources/EdmStorageProviderBaseLogcat.txt
new file mode 100644
index 000000000..1eb534116
--- /dev/null
+++ b/app/src/test/resources/EdmStorageProviderBaseLogcat.txt
@@ -0,0 +1,20 @@
+02-08 10:56:02.185 21990 21990 E AndroidRuntime: 	at android.os.StrictMode$AndroidBlockGuardPolicy.onReadFromDisk(StrictMode.java:1556)
+02-08 10:56:02.185 21990 21990 E AndroidRuntime: 	at android.database.sqlite.SQLiteConnection.applyBlockGuardPolicy(SQLiteConnection.java:1524)
+02-08 10:56:02.185 21990 21990 E AndroidRuntime: 	at android.database.sqlite.SQLiteConnection.executeForCursorWindow(SQLiteConnection.java:1193)
+02-08 10:56:02.185 21990 21990 E AndroidRuntime: 	at android.database.sqlite.SQLiteSession.executeForCursorWindow(SQLiteSession.java:838)
+02-08 10:56:02.185 21990 21990 E AndroidRuntime: 	at android.database.sqlite.SQLiteQuery.fillWindow(SQLiteQuery.java:62)
+02-08 10:56:02.185 21990 21990 E AndroidRuntime: 	at android.database.sqlite.SQLiteCursor.fillWindow(SQLiteCursor.java:165)
+02-08 10:56:02.185 21990 21990 E AndroidRuntime: 	at android.database.sqlite.SQLiteCursor.getCount(SQLiteCursor.java:152)
+02-08 10:56:02.185 21990 21990 E AndroidRuntime: 	at android.database.AbstractCursor.moveToPosition(AbstractCursor.java:232)
+02-08 10:56:02.185 21990 21990 E AndroidRuntime: 	at android.database.AbstractCursor.moveToFirst(AbstractCursor.java:271)
+02-08 10:56:02.185 21990 21990 E AndroidRuntime: 	at com.android.server.enterprise.storage.EdmStorageProviderBase.getValues(EdmStorageProviderBase.java:388)
+02-08 10:56:02.185 21990 21990 E AndroidRuntime: 	at com.android.server.enterprise.storage.EdmStorageProviderBase.getValuesList(EdmStorageProviderBase.java:1104)
+02-08 10:56:02.185 21990 21990 E AndroidRuntime: 	at com.android.server.enterprise.storage.EdmStorageProvider.getValuesList(EdmStorageProvider.java:300)
+02-08 10:56:02.185 21990 21990 E AndroidRuntime: 	at com.android.server.enterprise.application.ApplicationPolicy.getApplicationStateEnabledAsUser(ApplicationPolicy.java:3745)
+02-08 10:56:02.185 21990 21990 E AndroidRuntime: 	at com.android.server.enterprise.application.ApplicationPolicy.getApplicationStateEnabledAsUser(ApplicationPolicy.java:3714)
+02-08 10:56:02.185 21990 21990 E AndroidRuntime: 	at com.android.server.pm.PackageManagerService.setEnabledSetting(PackageManagerService.java:26031)
+02-08 10:56:02.185 21990 21990 E AndroidRuntime: 	at com.android.server.pm.PackageManagerService.setComponentEnabledSetting(PackageManagerService.java:26007)
+02-08 10:56:02.185 21990 21990 E AndroidRuntime: 	at android.content.pm.IPackageManager$Stub.onTransact(IPackageManager.java:3774)
+02-08 10:56:02.185 21990 21990 E AndroidRuntime: 	at com.android.server.pm.PackageManagerService.onTransact(PackageManagerService.java:5145)
+02-08 10:56:02.185 21990 21990 E AndroidRuntime: 	at android.os.Binder.execTransactInternal(Binder.java:1056)
+02-08 10:56:02.185 21990 21990 E AndroidRuntime: 	at android.os.Binder.execTransact(Binder.java:1029)
diff --git a/build.gradle b/build.gradle
index e1399e459..093a4fcd2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,6 +13,7 @@ buildscript {
                 includeGroupByRegex RepoMatching.mozilla
             }
         }
+
         maven {
             name "Mozilla"
             url "https://maven.mozilla.org/maven2"
@@ -21,6 +22,7 @@ buildscript {
                 includeGroupByRegex RepoMatching.mozilla
             }
         }
+
         if (project.hasProperty("googleRepo")) {
             maven {
                 name "Google"
@@ -38,13 +40,13 @@ buildscript {
             }
         }
 
-        if (project.hasProperty("jcenterRepo")) {
+        if (project.hasProperty("centralRepo")) {
             maven {
-                name "BintrayJCenter"
-                url project.property("jcenterRepo")
+                name "MavenCentral"
+                url project.property("centralRepo")
             }
         } else {
-            jcenter() {
+            mavenCentral() {
                 content {
                     // Improve security: don't search deps with known repos.
                     excludeGroupByRegex RepoMatching.mozilla
@@ -86,6 +88,7 @@ allprojects {
                 includeGroupByRegex RepoMatching.mozilla
             }
         }
+
         maven {
             name "Mozilla"
             url "https://maven.mozilla.org/maven2"
@@ -94,6 +97,7 @@ allprojects {
                 includeGroupByRegex RepoMatching.mozilla
             }
         }
+
         if (project.hasProperty("googleRepo")) {
             maven {
                 name "Google"
@@ -110,13 +114,14 @@ allprojects {
                 }
             }
         }
-        if (project.hasProperty("jcenterRepo")) {
+
+        if (project.hasProperty("centralRepo")) {
             maven {
-                name "BintrayJCenter"
-                url project.property("jcenterRepo")
+                name "MavenCentral"
+                url project.property("centralRepo")
             }
         } else {
-            jcenter() {
+            mavenCentral() {
                 content {
                     // Improve security: don't search deps with known repos.
                     excludeGroupByRegex RepoMatching.mozilla
@@ -127,6 +132,53 @@ 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 Android Gradle Plugin
+                    // Issue for publishing to maven central: https://youtrack.jetbrains.com/issue/IDEA-261387
+                    // Related plugin issue: https://issuetracker.google.com/issues/179291081
+                    // Other option: Update to Android Gradle Plugin 7+ (still in Alpha currently)
+                    includeVersion("org.jetbrains.trove4j", "trove4j", "20160824")
+
+                    // 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
+                    includeVersion("tools.fastlane", "screengrab", "2.0.0")
+                    // https://github.com/jraska/Falcon/issues/52
+                    includeVersion("com.jraska", "falcon", "2.1.1")
+                }
+            }
+        }
+
+        maven {
+            name "LeanplumRepo"
+            if (project.hasProperty("leanplumRepo")) {
+                url project.property("leanplumRepo")
+            } else {
+                url "https://repo.leanplum.com"
+            }
+            content {
+                includeGroup("com.leanplum")
+            }
+        }
     }
 
     tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
diff --git a/buildSrc/src/main/java/AndroidComponents.kt b/buildSrc/src/main/java/AndroidComponents.kt
index dbe57e43d..5899e75df 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 = "72.0.16"
+    const val VERSION = "73.0.11"
 }
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index 65fd88c4f..6b103a612 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -3,8 +3,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 object Versions {
-    const val kotlin = "1.4.10"
-    const val coroutines = "1.3.9"
+    const val kotlin = "1.4.30"
+    const val coroutines = "1.4.2"
 
     // These versions are linked: lint should be X+23.Y.Z of gradle_plugin version, according to:
     // https://github.com/alexjlockwood/android-lint-checks-demo/blob/0245fc027463137b1b4afb97c5295d60dce998b6/dependencies.gradle#L3
@@ -19,7 +19,7 @@ object Versions {
     const val jna = "5.6.0"
 
     const val androidx_appcompat = "1.2.0"
-    const val androidx_biometric = "1.1.0-rc01"
+    const val androidx_biometric = "1.1.0"
     const val androidx_coordinator_layout = "1.1.0"
     const val androidx_constraint_layout = "2.0.4"
     const val androidx_preference = "1.1.1"
@@ -27,12 +27,12 @@ object Versions {
     const val androidx_annotation = "1.1.0"
     const val androidx_lifecycle = "2.2.0"
     const val androidx_fragment = "1.2.5"
-    const val androidx_navigation = "2.3.1"
-    const val androidx_recyclerview = "1.2.0-alpha06"
+    const val androidx_navigation = "2.3.3"
+    const val androidx_recyclerview = "1.2.0-beta01"
     const val androidx_core = "1.3.2"
-    const val androidx_paging = "2.1.0"
-    const val androidx_transition = "1.3.0"
-    const val androidx_work = "2.4.0"
+    const val androidx_paging = "2.1.2"
+    const val androidx_transition = "1.4.0"
+    const val androidx_work = "2.5.0"
     const val google_material = "1.2.1"
 
     const val mozilla_android_components = AndroidComponents.VERSION
@@ -119,6 +119,7 @@ object Deps {
     const val mozilla_feature_accounts_push = "org.mozilla.components:feature-accounts-push:${Versions.mozilla_android_components}"
     const val mozilla_feature_top_sites = "org.mozilla.components:feature-top-sites:${Versions.mozilla_android_components}"
     const val mozilla_feature_share = "org.mozilla.components:feature-share:${Versions.mozilla_android_components}"
+    const val mozilla_feature_webauthn = "org.mozilla.components:feature-webauthn:${Versions.mozilla_android_components}"
     const val mozilla_feature_webcompat = "org.mozilla.components:feature-webcompat:${Versions.mozilla_android_components}"
     const val mozilla_feature_webnotifications = "org.mozilla.components:feature-webnotifications:${Versions.mozilla_android_components}"
     const val mozilla_feature_webcompat_reporter = "org.mozilla.components:feature-webcompat-reporter:${Versions.mozilla_android_components}"
diff --git a/docs/metrics.md b/docs/metrics.md
index 9d9b9eef3..0c988a1d7 100644
--- a/docs/metrics.md
+++ b/docs/metrics.md
@@ -28,8 +28,8 @@ an hashed version of the Google Advertising ID.
 
 **Bugs related to this ping:**
 
-- 1538011
-- 1501822
+- <https://bugzilla.mozilla.com/1538011/>
+- <https://bugzilla.mozilla.com/1501822/>
 
 The following metrics are added to the ping:
 
@@ -52,9 +52,18 @@ The following metrics are added to the ping:
 | about_page.support_tapped |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user tapped on "Support" item from About page  |[1](https://github.com/mozilla-mobile/fenix/pull/8047), [2](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877)||2021-04-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  |[1](https://github.com/mozilla-mobile/fenix/pull/8318), [2](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877)|<ul><li>addon_id: The id of the add-on that was interacted with in the toolbar menu </li></ul>|2021-04-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  |[1](https://github.com/mozilla-mobile/fenix/pull/8318), [2](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877)||2021-04-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  |[1](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.  |[1](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.  |[1](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.  |[1](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.  |[1](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.  |[1](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  |[1](https://github.com/mozilla-mobile/fenix/pull/7968), [2](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877)|<ul><li>source: The source from where dark theme was selected. The source can be 'SETTINGS' or 'ONBOARDING' </li></ul>|2021-04-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.  |[1](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-02-01 |2 |
-| autoplay.visited_setting |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user visited the autoplay settings screen |[1](https://github.com/mozilla-mobile/fenix/pull/13041#issuecomment-665777411)||2021-02-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.  |[1](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 |[1](https://github.com/mozilla-mobile/fenix/pull/13041#issuecomment-665777411)||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.  |[1](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.  |[1](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.  |[1](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.  |[1](https://github.com/mozilla-mobile/fenix/pull/1708), [2](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877)||2021-04-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.  |[1](https://github.com/mozilla-mobile/fenix/pull/1708), [2](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877)||2021-04-01 |2 |
 | bookmarks_management.folder_add |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user added a new bookmark folder.  |[1](https://github.com/mozilla-mobile/fenix/pull/1708), [2](https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877)||2021-04-01 |2 |
@@ -128,10 +137,10 @@ The following metrics are added to the ping:
 | history.removed |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |A user removed a history item  |[1](https://github.com/mozilla-mobile/fenix/pull/3940), [2](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  |[1](https://github.com/mozilla-mobile/fenix/pull/3940), [2](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  |[1](https://github.com/mozilla-mobile/fenix/pull/3940), [2](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
-| login_dialog.cancelled |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |The login dialog prompt was cancelled  |[1](https://github.com/mozilla-mobile/fenix/pull/13050)||2021-02-01 |2 |
-| login_dialog.displayed |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |The login dialog prompt was displayed  |[1](https://github.com/mozilla-mobile/fenix/pull/13050)||2021-02-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  |[1](https://github.com/mozilla-mobile/fenix/pull/13050)||2021-02-01 |2 |
-| login_dialog.saved |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |The login dialog prompt "save" button was pressed  |[1](https://github.com/mozilla-mobile/fenix/pull/13050)||2021-02-01 |2 |
+| login_dialog.cancelled |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |The login dialog prompt was cancelled  |[1](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  |[1](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  |[1](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  |[1](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  |[1](https://github.com/mozilla-mobile/fenix/pull/6352), [2](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  |[1](https://github.com/mozilla-mobile/fenix/issues/11208), [2](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  |[1](https://github.com/mozilla-mobile/fenix/pull/6352), [2](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
@@ -277,6 +286,10 @@ The following metrics are added to the ping:
 | 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>’.  |[1](https://github.com/mozilla-mobile/fenix/pull/10112), [2](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.  |[1](https://github.com/mozilla-mobile/fenix/pull/10167), [2](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>’.  |[1](https://github.com/mozilla-mobile/fenix/pull/10112), [2](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
+| engine.kill_background_age |[timespan](https://mozilla.github.io/glean/book/user/metrics/timespan.html) |Measures the age of the engine session of a background tab at the time its content process got killed.  |[1](https://github.com/mozilla-mobile/fenix/pull/17864)||2021-12-31 |1 |
+| engine.kill_foreground_age |[timespan](https://mozilla.github.io/glean/book/user/metrics/timespan.html) |Measures the age of the engine session of a foreground (selected) tab at the time its content process got killed.  |[1](TBD)||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.  |[1](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.  |[1](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.  |[1](https://github.com/mozilla-mobile/fenix/pull/1785), [2](https://github.com/mozilla-mobile/fenix/pull/8314), [3](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.  |[1](https://github.com/mozilla-mobile/fenix/pull/9253), [2](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.  |[1](https://github.com/mozilla-mobile/fenix/pull/5579), [2](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |1 |
@@ -308,6 +321,8 @@ The following metrics are added to the ping:
 | perf.awesomebar.session_suggestions |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |Duration of a session awesomebar suggestion query.  |[1](https://github.com/mozilla-mobile/fenix/pull/10276#pullrequestreview-411101979)||2020-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.  |[1](https://github.com/mozilla-mobile/fenix/pull/10276#pullrequestreview-411101979)||2020-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.  |[1](https://github.com/mozilla-mobile/fenix/pull/10276#pullrequestreview-411101979)||2020-11-15 |1, 2 |
+| 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.  |[1](https://github.com/mozilla-mobile/fenix/pull/17973#issue-572183889)||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`.  |[1](https://github.com/mozilla-mobile/fenix/pull/17973#issue-572183889)||2021-08-11 |1 |
 | 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: ""  |[1](https://github.com/mozilla-mobile/fenix/pull/11211), [2](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  |[1](https://github.com/mozilla-mobile/fenix/pull/11211), [2](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  |[1](https://github.com/mozilla-mobile/fenix/pull/11446), [2](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |2 |
@@ -337,26 +352,34 @@ The following metrics are added to the ping:
 
 This ping is intended to provide an understanding of startup performance.
 
-The ping is intended to be captured by performance testing automation to
-report results there, in addition to user telemetry. We place these metrics
-into their own ping in order to isolate them and make this process easier.
+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>
 
 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 |[counter](https://mozilla.github.io/glean/book/user/metrics/counter.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_start` metric.  |[1](https://github.com/mozilla-mobile/fenix/pull/9788#pullrequestreview-394228626), [2](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |1 |
-| startup.timeline.framework_start |[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`. This 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`, which may vary between devices, is also reported as a metric  |[1](https://github.com/mozilla-mobile/fenix/pull/9788#pullrequestreview-394228626), [2](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||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_start` - the application init timestamp returned a negative value - which is likely indicative of a bug in the implementation.  |[1](https://github.com/mozilla-mobile/fenix/pull/9788#pullrequestreview-394228626), [2](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||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` 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`, which may vary between devices, is also reported as a metric  |[1](https://github.com/mozilla-mobile/fenix/pull/9788#pullrequestreview-394228626), [2](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068), [3](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` not equal to 100. For more details on this metric, see `framework_primary`  |[1](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.  |[1](https://github.com/mozilla-mobile/fenix/pull/9788#pullrequestreview-394228626), [2](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.  |[1](https://github.com/mozilla-mobile/fenix/pull/10481), [2](https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068)||2021-08-01 |1 |
 
 
diff --git a/l10n-release.toml b/l10n-release.toml
index 8bc678f7f..acce5ec89 100644
--- a/l10n-release.toml
+++ b/l10n-release.toml
@@ -52,6 +52,7 @@ locales = [
   "ka",
   "kab",
   "kk",
+  "kmr",
   "kn",
   "ko",
   "lij",
@@ -82,6 +83,7 @@ locales = [
   "te",
   "tg",
   "th",
+  "tl",
   "tr",
   "trs",
   "uk",
diff --git a/l10n.toml b/l10n.toml
index ef8242192..e74207276 100644
--- a/l10n.toml
+++ b/l10n.toml
@@ -13,6 +13,7 @@ locales = [
   "bs",
   "ca",
   "cak",
+  "ceb",
   "co",
   "cs",
   "cy",
@@ -42,6 +43,7 @@ locales = [
   "gu-IN",
   "he",
   "hi-IN",
+  "hil",
   "hr",
   "hsb",
   "hu",
diff --git a/taskcluster/ci/browsertime/kind.yml b/taskcluster/ci/browsertime/kind.yml
index ea014660d..2c2f7d6a1 100644
--- a/taskcluster/ci/browsertime/kind.yml
+++ b/taskcluster/ci/browsertime/kind.yml
@@ -83,7 +83,6 @@ job-defaults:
             - '--cfg=mozharness/configs/raptor/android_hw_config.py'
             - '--app=fenix'
             - '--browsertime'
-            - '--cold'
             - '--no-conditioned-profile'
             - '--binary=org.mozilla.fenix'
             - '--activity=org.mozilla.fenix.IntentReceiverActivity'
@@ -101,168 +100,54 @@ job-defaults:
             - linux64-node
 
 jobs:
-    tp6m-1-cold:
-        test-name: amazon
-        treeherder:
-            symbol: 'Btime(tp6m-1-c)'
-
-    tp6m-2-cold:
-        test-name: google
-        web-render-only: False
-        treeherder:
-            symbol: 'Btime(tp6m-2-c)'
-
-    tp6m-3-cold:
-        test-name: instagram
-        treeherder:
-            symbol: 'Btime(tp6m-3-c)'
-
-    tp6m-4-cold:
-        test-name: bing-search-restaurants
-        treeherder:
-            symbol: 'Btime(tp6m-4-c)'
-
-    tp6m-5-cold:
-        test-name: ebay-kleinanzeigen-search
-        treeherder:
-            symbol: 'Btime(tp6m-5-c)'
-
-    tp6m-6-cold:
-        test-name: amazon-search
-        web-render-only: False
-        treeherder:
-            symbol: 'Btime(tp6m-6-c)'
-
-    tp6m-7-cold:
-        test-name: wikipedia
-        treeherder:
-            symbol: 'Btime(tp6m-7-c)'
-
-    tp6m-8-cold:
-        test-name: booking
-        treeherder:
-            symbol: 'Btime(tp6m-8-c)'
-
-    tp6m-9-cold:
-        test-name: cnn-ampstories
-        treeherder:
-            symbol: 'Btime(tp6m-9-c)'
-
-    tp6m-10-cold:
-        test-name: bbc
-        treeherder:
-            symbol: 'Btime(tp6m-10-c)'
-
-    tp6m-11-cold:
-        test-name: microsoft-support
-        web-render-only: False
-        treeherder:
-            symbol: 'Btime(tp6m-11-c)'
-
-    tp6m-12-cold:
-        test-name: imdb
-        treeherder:
-            symbol: 'Btime(tp6m-12-c)'
-
-    tp6m-13-cold:
-        test-name: espn
-        web-render-only: False
-        treeherder:
-            symbol: 'Btime(tp6m-13-c)'
-
-    tp6m-14-cold:
-        test-name: facebook-cristiano
-        treeherder:
-            symbol: 'Btime(tp6m-14-c)'
-
-    tp6m-15-cold:
-        test-name: facebook
-        web-render-only: False
-        treeherder:
-            symbol: 'Btime(tp6m-15-c)'
-
-    tp6m-16-cold:
-        test-name: youtube
-        treeherder:
-            symbol: 'Btime(tp6m-16-c)'
-
-    tp6m-17-cold:
-        test-name: bing
-        treeherder:
-            symbol: 'Btime(tp6m-17-c)'
-
-    tp6m-18-cold:
-        test-name: ebay-kleinanzeigen
-        treeherder:
-            symbol: 'Btime(tp6m-18-c)'
-
-    tp6m-19-cold:
-        test-name: google-maps
-        treeherder:
-            symbol: 'Btime(tp6m-19-c)'
-
-    tp6m-20-cold:
-        test-name: youtube-watch
+    tp6m:
+        page-load-tests:
+            - amazon
+            - instagram
+            - [bing-search-restaurants, bing-s-r]
+            - [ebay-kleinanzeigen-search, ebay-k-s]
+            - wikipedia
+            - booking
+            - [cnn-ampstories, cnn-amp]
+            - bbc
+            - imdb
+            - [facebook-cristiano, fb-cris]
+            - youtube
+            - bing
+            - [ebay-kleinanzeigen, ebay-k]
+            - [google-maps, gmaps]
+            - reddit
+            - [stackoverflow, stacko]
+            - jianshu
+            - web-de
+            - cnn
+            - [google-search-restaurants, gsearch-r]
+
+    tp6m-hv:
         web-render-only: False
-        treeherder:
-            symbol: 'Btime(tp6m-20-c)'
-
-    tp6m-21-cold:
-        test-name: reddit
-        treeherder:
-            symbol: 'Btime(tp6m-21-c)'
-
-    tp6m-22-cold:
-        test-name: stackoverflow
-        treeherder:
-            symbol: 'Btime(tp6m-22-c)'
-
-    tp6m-23-cold:
-        test-name: jianshu
-        treeherder:
-            symbol: 'Btime(tp6m-23-c)'
-
-    tp6m-24-cold:
-        test-name: allrecipes
-        web-render-only: False
-        treeherder:
-            symbol: 'Btime(tp6m-24-c)'
-
-    tp6m-25-cold:
-        test-name: web-de
-        treeherder:
-            symbol: 'Btime(tp6m-25-c)'
-
-    tp6m-27-cold:
-        test-name: cnn
-        treeherder:
-            symbol: 'Btime(tp6m-27-c)'
-
-    tp6m-28-cold:
-        test-name: google-search-restaurants
-        treeherder:
-            symbol: 'Btime(tp6m-28-c)'
+        page-load-tests:
+            - google
+            - [amazon-search, amazon-s]
+            - [microsoft-support, micros-sup]
+            - espn
+            - facebook
+            - [youtube-watch, youtube-w]
+            - allrecipes
 
     youtube-playback-av1-sfr:
         description: "Raptor YouTube Playback AV1 SFR on Fenix"
         test-name: youtube-playback-av1-sfr
         run-visual-metrics: False
         chimera: False
-        treeherder:
-            symbol: 'Btime(ytp-av1-sfr)'
 
     youtube-playback-h264-sfr:
         description: "Raptor YouTube Playback H264 SFR on Fenix"
         test-name: youtube-playback-h264-sfr
         run-visual-metrics: False
         chimera: False
-        treeherder:
-            symbol: Btime(ytp-h264-sfr)
 
     youtube-playback-vp9-sfr:
         description: "Raptor YouTube Playback VP9 SFR on Fenix"
         run-visual-metrics: False
         chimera: False
         test-name: youtube-playback-vp9-sfr
-        treeherder:
-            symbol: Btime(ytp-vp9-sfr)
diff --git a/taskcluster/ci/config.yml b/taskcluster/ci/config.yml
index 2f2caf9d8..4fb15565d 100644
--- a/taskcluster/ci/config.yml
+++ b/taskcluster/ci/config.yml
@@ -17,7 +17,10 @@ treeherder:
         'Rap-P': 'Raptor power tests'
         'TL': 'Toolchain builds for Linux 64-bits'
 
-task-priority: highest
+task-priority:
+    by-project:
+        "fenix": highest
+        "staging-fenix": low
 
 taskgraph:
     register: fenix_taskgraph:register
diff --git a/taskcluster/docker/visual-metrics/run-visual-metrics.py b/taskcluster/docker/visual-metrics/run-visual-metrics.py
index 799207a8d..698d66237 100755
--- a/taskcluster/docker/visual-metrics/run-visual-metrics.py
+++ b/taskcluster/docker/visual-metrics/run-visual-metrics.py
@@ -171,7 +171,12 @@ def append_result(log, suites, test_name, name, result, extra_options):
 
     subtests = suites.setdefault(
         test_name,
-        {"name": orig_test_name, "subtests": {}, "extraOptions": extra_options},
+        {
+            "name": orig_test_name,
+            "tags": extra_options + ["visual"],
+            "subtests": {},
+            "extraOptions": extra_options,
+        },
     )["subtests"]
 
     if name not in subtests:
diff --git a/taskcluster/fenix_taskgraph/release_promotion.py b/taskcluster/fenix_taskgraph/release_promotion.py
index 414e19131..902e7371b 100644
--- a/taskcluster/fenix_taskgraph/release_promotion.py
+++ b/taskcluster/fenix_taskgraph/release_promotion.py
@@ -17,6 +17,7 @@ from taskgraph.util.taskgraph import find_decision_task, find_existing_tasks_fro
 
 RELEASE_PROMOTION_PROJECTS = (
     "https://github.com/mozilla-mobile/fenix",
+    "https://github.com/mozilla-releng/staging-fenix",
 )
 
 
diff --git a/taskcluster/fenix_taskgraph/transforms/browsertime.py b/taskcluster/fenix_taskgraph/transforms/browsertime.py
index 9f5e91572..544d06860 100644
--- a/taskcluster/fenix_taskgraph/transforms/browsertime.py
+++ b/taskcluster/fenix_taskgraph/transforms/browsertime.py
@@ -11,6 +11,7 @@ from __future__ import absolute_import, print_function, unicode_literals
 import copy
 import json
 
+from copy import deepcopy
 from taskgraph.transforms.base import TransformSequence
 from taskgraph.util.treeherder import inherit_treeherder_from_dep
 from taskgraph.util.schema import resolve_keyed_by
@@ -18,6 +19,28 @@ from taskgraph.util.schema import resolve_keyed_by
 transforms = TransformSequence()
 
 
+@transforms.add
+def split_raptor_subtests(config, tests):
+    for test in tests:
+        # For tests that have 'page-load-tests' listed, we want to create a separate
+        # test job for every subtest (i.e. split out each page-load URL into its own job)
+        subtests = test.pop("page-load-tests", None)
+        if not subtests:
+            yield test
+            continue
+
+        for subtest in subtests:
+            pageload_test = deepcopy(test)
+
+            if isinstance(subtest, list):
+                pageload_test["test-name"] = subtest[0]
+                pageload_test["subtest-symbol"] = subtest[1]
+            else:
+                pageload_test["test-name"] = subtest
+                pageload_test["subtest-symbol"] = subtest
+            yield pageload_test
+
+
 @transforms.add
 def add_variants(config, tasks):
     only_types = config.config["only-for-build-types"]
@@ -26,7 +49,7 @@ def add_variants(config, tasks):
     tests = list(tasks)
 
     for dep_task in config.kind_dependencies_tasks:
-        build_type = dep_task.attributes.get("build-type", '')
+        build_type = dep_task.attributes.get("build-type", "")
         if build_type not in only_types:
             continue
 
@@ -91,6 +114,22 @@ def build_browsertime_task(config, tasks):
         task["run"]["command"].append("--test={}".format(test_name))
         task["run"]["command"].extend(task.pop("args", []))
 
+        # Setup treherder symbol
+        symbol = task.pop("subtest-symbol", None)
+
+        # taskcluster is merging task attributes with the default ones
+        # resulting the --cold extra option in the ytp warm tasks
+        if "youtube-playback" in task["name"]:
+            symbol = test_name.replace("youtube-playback-", "ytp-")
+
+        # Setup chimera for combined warm+cold testing
+        if task.pop("chimera", False):
+            task["run"]["command"].append("--chimera")
+
+        # Add '-c' to taskcluster symbol when running cold tests
+        elif "--cold" in task["run"]["command"]:
+            symbol += "-c"
+
         # Setup visual metrics
         run_visual_metrics = task.pop("run-visual-metrics", False)
         if run_visual_metrics:
@@ -98,15 +137,11 @@ def build_browsertime_task(config, tasks):
             task["run"]["command"].append("--browsertime-no-ffwindowrecorder")
             task["attributes"]["run-visual-metrics"] = True
 
-        # Setup chimera for combined warm+cold testing
-        if task.pop("chimera", False):
-            task["run"]["command"].append("--chimera")
-
-        # taskcluster is merging task attributes with the default ones
-        # resulting the --cold extra option in the ytp warm tasks
-        if 'youtube-playback' in task["name"]:
-            task["run"]["command"].remove("--cold")
-
+        # Build taskcluster group and symol
+        task["treeherder"]["symbol"] = "Btime(%s)" % symbol
+        task["name"] = (
+            task["name"].replace("tp6m-", "tp6m-{}-".format(symbol)).replace("-hv", "")
+        )
         yield task
 
 
@@ -129,7 +164,7 @@ def enable_webrender(config, tasks):
 
 @transforms.add
 def fill_email_data(config, tasks):
-    product_name = config.graph_config['taskgraph']['repositories']['mobile']['name']
+    product_name = config.graph_config["taskgraph"]["repositories"]["mobile"]["name"]
     format_kwargs = {
         "product_name": product_name.lower(),
         "head_rev": config.params["head_rev"],
@@ -138,7 +173,9 @@ def fill_email_data(config, tasks):
     for task in tasks:
         format_kwargs["task_name"] = task["name"]
 
-        resolve_keyed_by(task, 'notify', item_name=task["name"], level=config.params["level"])
+        resolve_keyed_by(
+            task, "notify", item_name=task["name"], level=config.params["level"]
+        )
         email = task["notify"].get("email")
         if email:
             email["link"]["href"] = email["link"]["href"].format(**format_kwargs)
diff --git a/taskcluster/fenix_taskgraph/transforms/build.py b/taskcluster/fenix_taskgraph/transforms/build.py
index a2ebdcf4f..032a746a6 100644
--- a/taskcluster/fenix_taskgraph/transforms/build.py
+++ b/taskcluster/fenix_taskgraph/transforms/build.py
@@ -104,7 +104,10 @@ def add_nightly_version(config, tasks):
 
     for task in tasks:
         if task.pop("include-nightly-version", False):
-            task["run"]["gradlew"].append('-PversionName={}'.format(formated_date_time))
+            task["run"]["gradlew"].extend([
+                '-PversionName={}'.format(formated_date_time),
+                '-Pofficial'
+            ])
         yield task
 
 
@@ -112,9 +115,10 @@ def add_nightly_version(config, tasks):
 def add_release_version(config, tasks):
     for task in tasks:
         if task.pop("include-release-version", False):
-            task["run"]["gradlew"].append(
-                '-PversionName={}'.format(config.params["version"])
-            )
+            task["run"]["gradlew"].extend([
+                '-PversionName={}'.format(config.params["version"]),
+                '-Pofficial'
+            ])
         yield task
 
 
diff --git a/taskcluster/scripts/toolchain/android-gradle-dependencies.sh b/taskcluster/scripts/toolchain/android-gradle-dependencies.sh
index 06c23c34a..ece18653a 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/"
+GRADLE_ARGS="--parallel -PgoogleRepo=$NEXUS_PREFIX/google/ -PjcenterRepo=$NEXUS_PREFIX/jcenter/ -PcentralRepo=$NEXUS_PREFIX/central/ -PleanplumRepo=$NEXUS_PREFIX/leanplum/"
 # 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 a62ab02a2..430974e5a 100644
--- a/taskcluster/scripts/toolchain/android-gradle-dependencies/after.sh
+++ b/taskcluster/scripts/toolchain/android-gradle-dependencies/after.sh
@@ -22,6 +22,8 @@ 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
+cp -R ${NEXUS_WORK}/storage/leanplum android-gradle-dependencies
 
 tar cf - android-gradle-dependencies | xz > /builds/worker/artifacts/android-gradle-dependencies.tar.xz
 
diff --git a/taskcluster/scripts/toolchain/android-gradle-dependencies/nexus.xml b/taskcluster/scripts/toolchain/android-gradle-dependencies/nexus.xml
index 2b40bedf3..1dfc16205 100644
--- a/taskcluster/scripts/toolchain/android-gradle-dependencies/nexus.xml
+++ b/taskcluster/scripts/toolchain/android-gradle-dependencies/nexus.xml
@@ -54,6 +54,37 @@
         <autoBlockActive>true</autoBlockActive>
       </externalConfiguration>
     </repository>
+    <repository>
+      <id>leanplum</id>
+      <name>leanplum</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://repo.leanplum.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 e09c8b8bc..275710fc9 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-86.1.1
+87.0.0-rc.1