[components] Issue https://github.com/mozilla-mobile/android-components/issues/10335: Update dependencies to support Jetpack Compose and add first prototype components.

* Issue https://github.com/mozilla-mobile/android-components/issues/10335: Upgrade to Gradle 7. * Update Android Gradle Plugin to 7.0.0 Beta 2. * Issue https://github.com/mozilla-mobile/android-components/issues/10335: Generate BuildConfig with VERSION_CODE and VERSION_NAME fields in library modules (for Glean). * Issue https://github.com/mozilla-mobile/android-components/issues/10335: Add first component using Jetpack Compose: compose-browser-toolbar. * Issue https://github.com/mozilla-mobile/android-components/issues/10335: Introduce Jetpack Compose bindings for lib-state. * Issue https://github.com/mozilla-mobile/android-components/issues/10335: Upstream Jetpack Compose toolbar prototype from Reference Browser. * Issue https://github.com/mozilla-mobile/android-components/issues/10335: Add TargetTab helper for observing specific tabs. * Issue https://github.com/mozilla-mobile/android-components/issues/10335: Add compose-engine component for adding Jetpack Compose bindings to a concept-engine implementation. * Issue https://github.com/mozilla-mobile/android-components/issues/10335: Add new sample app (samples-compose-browser) for prototyping browser UI using Jetpack Compose. * Issue https://github.com/mozilla-mobile/android-components/issues/10335: Update to Beta 3 of the Android Gradle plugin. * Issue https://github.com/mozilla-mobile/android-components/issues/10335: Allow usage of http when substituting maven repositories in CI. * Issue https://github.com/mozilla-mobile/android-components/issues/10335: Rename TabTarget helper to just Target. * Issue https://github.com/mozilla-mobile/android-components/issues/10335: Make BrowserToolbar follow target tab too. * Add awesomebar prototype using Jetpack Compose. * Update to Gradle 7.0.2.
2021-05-27 11:39:06 +02:00 · 2021-05-27 11:39:06 +02:00 · f14b267388
commit f14b267388
parent 19af1d18fc
395 changed files with 2479 additions and 544 deletions
--- a/mobile/android/android-components/.buildconfig.yml
+++ b/mobile/android/android-components/.buildconfig.yml
@ -3,6 +3,18 @@
 componentsVersion: 92.0.0
 # Please add a treeherder group in taskcluster/ci/config.yml if you add a new project here.
 projects:
+  compose-awesomebar:
+    path: components/compose/awesomebar
+    description: 'An awesomebar component showing search results matching text entered into the toolbar.'
+    publish: true
+  compose-browser-toolbar:
+    path: components/compose/browser-toolbar
+    description: 'A customizable toolbar for browsers using Jetpack Compose.'
+    publish: true
+  compose-engine:
+    path: components/compose/engine
+    description: 'A component for integrating a concept-engine implementation into Jetpack Compose UI.'
+    publish: true
  concept-awesomebar:
    path: components/concept/awesomebar
    description: 'An abstract definition of an awesomebar component.'
@ -403,6 +415,10 @@ projects:
    path: samples/browser
    description: 'A simple browser composed from browser components.'
    publish: false
+  samples-compose-browser:
+    path: samples/compose-browser
+    description: 'A simple browser composed from browser components using Jetpack Compose.'
+    publish: false
  samples-crash:
    path: samples/crash
    description: 'An app showing the integration of the lib-crash component.'
--- a/mobile/android/android-components/build.gradle
+++ b/mobile/android/android-components/build.gradle
@ -10,6 +10,7 @@ buildscript {
            maven {
                name "Google"
                url project.property("googleRepo")
+                allowInsecureProtocol true // Local Nexus in CI uses HTTP
            }
        } else {
            google()
@ -19,6 +20,7 @@ buildscript {
            maven {
                name "MavenCentral"
                url project.property("centralRepo")
+                allowInsecureProtocol true // Local Nexus in CI uses HTTP
            }
        } else {
            mavenCentral()
@ -42,6 +44,7 @@ allprojects {
            maven {
                name "Google"
                url project.property("googleRepo")
+                allowInsecureProtocol true // Local Nexus in CI uses HTTP
            }
        } else {
            google()
@ -51,6 +54,7 @@ allprojects {
            maven {
                name "MavenCentral"
                url project.property("centralRepo")
+                allowInsecureProtocol true // Local Nexus in CI uses HTTP
            }
        } else {
            mavenCentral()
@ -114,6 +118,22 @@ subprojects {

    afterEvaluate {
        if (it.hasProperty('android')) {
+
+            // Glean currently expects every module to have a BuildConfig with VERSION_CODE and
+            // VERSION_NAME fields. Since Android Gradle Plugin 4.1+ those fields do not get
+            // generated for Android libraries anymore. As a workaround we generate them here
+            // explicitly.
+            // https://bugzilla.mozilla.org/show_bug.cgi?id=1713084
+            // https://issuetracker.google.com/issues/158695880
+            plugins.withId('com.android.library') {
+                android {
+                    defaultConfig {
+                        buildConfigField 'int', 'VERSION_CODE', "1"
+                        buildConfigField 'String', 'VERSION_NAME', "\"1.0\""
+                    }
+                }
+            }
+
            jacoco {
                toolVersion = "0.8.7"
            }
@ -179,7 +199,11 @@ subprojects {
                    disable 'MissingTranslation',
                            'ExtraTranslation',
                            // We do not want to enforce this as a generic rule for all languages (see #6117, #6056, #6118)
-                            'TypographyEllipsis'
+                            'TypographyEllipsis',
+                            // https://github.com/mozilla-mobile/android-components/issues/10641
+                            'UnspecifiedImmutableFlag',
+                            // https://github.com/mozilla-mobile/android-components/issues/10643
+                            'UnusedResources'
                }

                packagingOptions {
@ -201,6 +225,7 @@ subprojects {
                    kotlinOptions {
                        jvmTarget = "1.8"
                        freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
+                        useIR = true
                    }
                }
            }
@ -220,10 +245,6 @@ subprojects {
                // correct runtime classpath when invoked with Android Studio's built-in JUnit test runner.
                // Success!
                jnaForTest
-                // Robolectric, through `com.google.android.apps.common.testing.accessibility.framework`
-                // depends on an old version of protobuf that conflict with the Application Services one.
-                // See: https://github.com/mozilla/application-services/issues/2952
-                all*.exclude group: 'com.google.protobuf', module: 'protobuf-java'
            }

            dependencies {
--- a/mobile/android/android-components/buildSrc/build.gradle
+++ b/mobile/android/android-components/buildSrc/build.gradle
@ -3,16 +3,15 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 plugins {
-    id "org.gradle.kotlin.kotlin-dsl" version "1.3.6"
+    id "org.gradle.kotlin.kotlin-dsl" version "2.1.4"
 }

 repositories {
-    mavenCentral()
-
    if (project.hasProperty("centralRepo")) {
        maven {
            name "MavenCentral"
            url project.property("centralRepo")
+            allowInsecureProtocol true // Local Nexus in CI uses HTTP
        }
    } else {
        mavenCentral()
--- a/mobile/android/android-components/buildSrc/src/main/java/Dependencies.kt
+++ b/mobile/android/android-components/buildSrc/src/main/java/Dependencies.kt
@ -7,7 +7,7 @@

 // Synchronized version numbers for dependencies used by (some) modules
 object Versions {
-    const val kotlin = "1.5.20"
+    const val kotlin = "1.5.10"
    const val coroutines = "1.5.0"

    const val junit = "4.12"
@ -17,7 +17,7 @@ object Versions {

    const val mockwebserver = "3.10.0"

-    const val android_gradle_plugin = "4.2.2"
+    const val android_gradle_plugin = "7.0.0-beta05"
    const val android_maven_publish_plugin = "3.6.2"
    const val lint = "27.0.1"
    const val detekt = "1.17.1"
@ -35,12 +35,16 @@ object Versions {

    const val material = "1.2.1"

+    const val compose_version = "1.0.0-rc02"
+
    object AndroidX {
+        const val activityCompose = "1.3.0-rc02"
        const val annotation = "1.1.0"
        const val appcompat = "1.3.0"
        const val browser = "1.3.0"
        const val biometric = "1.1.0"
        const val cardview = "1.0.0"
+        const val compose = compose_version
        const val constraintlayout = "2.0.4"
        const val coordinatorlayout = "1.1.0"
        const val core = "1.3.2"
@ -55,6 +59,7 @@ object Versions {
        const val preferences = "1.1.1"
        const val lifecycle = "2.2.0"
        const val media = "1.2.0"
+        const val navigation = "2.4.0-alpha04"
        const val work = "2.4.0"
        const val arch = "2.1.0"
        const val uiautomator = "2.2.0"
@ -83,6 +88,7 @@ object Dependencies {
    const val testing_maven_ant_tasks = "org.apache.maven:maven-ant-tasks:${Versions.maven_ant_tasks}"
    const val testing_leakcanary = "com.squareup.leakcanary:leakcanary-android-instrumentation:${Versions.leakcanary}"

+    const val androidx_activity_compose = "androidx.activity:activity-compose:${Versions.AndroidX.activityCompose}"
    const val androidx_annotation = "androidx.annotation:annotation:${Versions.AndroidX.annotation}"
    const val androidx_appcompat = "androidx.appcompat:appcompat:${Versions.AndroidX.appcompat}"
    const val androidx_arch_core_common = "androidx.arch.core:core-common:${Versions.AndroidX.arch}"
@ -90,6 +96,13 @@ object Dependencies {
    const val androidx_biometric = "androidx.biometric:biometric:${Versions.AndroidX.biometric}"
    const val androidx_browser = "androidx.browser:browser:${Versions.AndroidX.browser}"
    const val androidx_cardview = "androidx.cardview:cardview:${Versions.AndroidX.cardview}"
+    const val androidx_compose_ui = "androidx.compose.ui:ui:${Versions.AndroidX.compose}"
+    const val androidx_compose_ui_test = "androidx.compose.ui:ui-test-junit4:${Versions.AndroidX.compose}"
+    const val androidx_compose_ui_test_manifest = "androidx.compose.ui:ui-test-manifest:${Versions.AndroidX.compose}"
+    const val androidx_compose_ui_tooling = "androidx.compose.ui:ui-tooling:${Versions.AndroidX.compose}"
+    const val androidx_compose_foundation = "androidx.compose.foundation:foundation:${Versions.AndroidX.compose}"
+    const val androidx_compose_material = "androidx.compose.material:material:${Versions.AndroidX.compose}"
+    const val androidx_compose_navigation = "androidx.navigation:navigation-compose:${Versions.AndroidX.navigation}"
    const val androidx_constraintlayout = "androidx.constraintlayout:constraintlayout:${Versions.AndroidX.constraintlayout}"
    const val androidx_core = "androidx.core:core:${Versions.AndroidX.core}"
    const val androidx_core_ktx = "androidx.core:core-ktx:${Versions.AndroidX.core}"
--- a/mobile/android/android-components/components/browser/engine-gecko/docs/metrics.md
+++ b/mobile/android/android-components/components/browser/engine-gecko/docs/metrics.md
@ -93,6 +93,9 @@ In addition to those built-in metrics, the following metrics are added to the pi
 | network.font_download_end |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |Time after navigationStart that all webfont downloads are completed.  |[Bug 1580077](https://bugzilla.mozilla.org/show_bug.cgi?id=1580077#c10)||never | |
 | network.tcp_connection |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |In the HTTP page channel, time from the TCP SYN packet is received to the connection is established and ready for HTTP.  |[Bug 1580077](https://bugzilla.mozilla.org/show_bug.cgi?id=1580077#c10)||never | |
 | network.tls_handshake |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |In the HTTP page channel, time from after the TCP SYN packet is received to the secure connection is established and ready for HTTP.  |[Bug 1580077](https://bugzilla.mozilla.org/show_bug.cgi?id=1580077#c10)||never | |
+| performance.clone.deserialize.items |[custom_distribution](https://mozilla.github.io/glean/book/user/metrics/custom_distribution.html) |Size of deserialized data, in items  |[Bug 1717631](https://bugzilla.mozilla.org/show_bug.cgi?id=1717631#c4)||never | |
+| performance.clone.deserialize.size |[memory_distribution](https://mozilla.github.io/glean/book/user/metrics/memory_distribution.html) |Size of deserialized data, in bytes  |[Bug 1717631](https://bugzilla.mozilla.org/show_bug.cgi?id=1717631#c4)||never | |
+| performance.clone.deserialize.time |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |Time spent deserializing structured data  |[Bug 1717631](https://bugzilla.mozilla.org/show_bug.cgi?id=1717631#c4)||never | |
 | performance.interaction.keypress_present_latency |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |Time between receiving a keypress event in the event loop and compositing its result onto the screen.  |[Bug 1580077](https://bugzilla.mozilla.org/show_bug.cgi?id=1580077#c10)||never | |
 | performance.interaction.mouseup_click_present_latency |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |Time between receiving a mouseup which follow by a mouseclick on the event loop and compositing its result onto the screen.  |[Bug 1698643](https://bugzilla.mozilla.org/show_bug.cgi?id=1698643#c3)||never | |
 | performance.interaction.tab_switch_composite |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |Time between tab selection and first composite of the tab content onto the screen.  |[Bug 1580077](https://bugzilla.mozilla.org/show_bug.cgi?id=1580077#c10)||never | |
--- a/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/NestedGeckoView.kt
+++ b/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/NestedGeckoView.kt
@ -4,6 +4,7 @@

 package mozilla.components.browser.engine.gecko

+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.MotionEvent
 import androidx.annotation.VisibleForTesting
@ -116,6 +117,7 @@ open class NestedGeckoView(context: Context) : GeckoView(context), NestedScrolli
        return super.onTouchEvent(event)
    }

+    @SuppressLint("WrongThread") // Lint complains startNestedScroll() needs to be called on the main thread
    @VisibleForTesting
    internal fun updateInputResult(event: MotionEvent) {
        super.onTouchEventForDetailResult(event)
--- a/mobile/android/android-components/components/browser/errorpages/src/main/java/mozilla/components/browser/errorpages/ErrorPages.kt
+++ b/mobile/android/android-components/components/browser/errorpages/src/main/java/mozilla/components/browser/errorpages/ErrorPages.kt
@ -4,6 +4,7 @@

 package mozilla.components.browser.errorpages

+import android.annotation.SuppressLint
 import android.content.Context
 import androidx.annotation.StringRes
 import mozilla.components.support.ktx.android.content.appName
@ -16,6 +17,7 @@ object ErrorPages {
    /**
     * Provides an encoded URL for an error page. Supports displaying images
     */
+    @SuppressLint("StringFormatInvalid")
    fun createUrlEncodedErrorPage(
        context: Context,
        errorType: ErrorType,
--- a/mobile/android/android-components/components/browser/state/build.gradle
+++ b/mobile/android/android-components/components/browser/state/build.gradle
@ -12,6 +12,8 @@ android {
    defaultConfig {
        minSdkVersion config.minSdkVersion
        targetSdkVersion config.targetSdkVersion
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }

    buildTypes {
@ -21,6 +23,14 @@ android {
        }
    }

+    buildFeatures {
+        compose true
+    }
+
+    composeOptions {
+        kotlinCompilerExtensionVersion = Versions.compose_version
+    }
+
    packagingOptions {
        exclude 'META-INF/proguard/androidx-annotations.pro'
    }
@ -45,6 +55,7 @@ dependencies {
    api project(':concept-fetch')

    implementation Dependencies.androidx_browser
+    implementation Dependencies.androidx_compose_ui
    implementation Dependencies.kotlin_coroutines
    implementation Dependencies.kotlin_stdlib

@ -55,6 +66,10 @@ dependencies {
    testImplementation Dependencies.testing_mockito
    testImplementation Dependencies.testing_robolectric
    testImplementation Dependencies.testing_coroutines
+
+    androidTestImplementation Dependencies.androidx_test_junit
+    androidTestImplementation Dependencies.androidx_compose_ui_test_manifest
+    androidTestImplementation Dependencies.androidx_compose_ui_test
 }

 apply from: '../../../publish.gradle'
--- a/mobile/android/android-components/components/browser/state/src/androidTest/java/mozilla/components/browser/state/helper/OnDeviceTargetTest.kt
+++ b/mobile/android/android-components/components/browser/state/src/androidTest/java/mozilla/components/browser/state/helper/OnDeviceTargetTest.kt
@ -0,0 +1,179 @@
+/* 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 mozilla.components.browser.state.helper
+
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import kotlinx.coroutines.runBlocking
+import mozilla.components.browser.state.action.BrowserAction
+import mozilla.components.browser.state.action.CustomTabListAction
+import mozilla.components.browser.state.action.TabListAction
+import mozilla.components.browser.state.state.BrowserState
+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
+import org.junit.Assert.assertNull
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * On-device tests for [Target].
+ */
+@RunWith(AndroidJUnit4::class)
+class OnDeviceTargetTest {
+    @get:Rule
+    val rule = createComposeRule()
+
+    @Test
+    fun observingSelectedTab() {
+        val store = BrowserStore()
+
+        val target = Target.SelectedTab
+        var observedTabId: String? = null
+
+        rule.setContent {
+            val state = target.observeAsComposableStateFrom(
+                store = store,
+                observe = { tab -> tab?.id }
+            )
+            observedTabId = state.value?.id
+        }
+
+        assertNull(observedTabId)
+
+        store.dispatchBlockingOnIdle(
+            TabListAction.AddTabAction(createTab("https://www.mozilla.org", id = "mozilla"))
+        )
+
+        rule.runOnIdle {
+            assertEquals("mozilla", observedTabId)
+        }
+
+        store.dispatchBlockingOnIdle(
+            TabListAction.AddTabAction(createTab("https://example.org", id = "example"))
+        )
+
+        rule.runOnIdle {
+            assertEquals("mozilla", observedTabId)
+        }
+
+        store.dispatchBlockingOnIdle(
+            TabListAction.SelectTabAction("example")
+        )
+
+        rule.runOnIdle {
+            assertEquals("example", observedTabId)
+        }
+
+        store.dispatchBlockingOnIdle(
+            TabListAction.RemoveTabAction("example")
+        )
+
+        rule.runOnIdle {
+            assertEquals("mozilla", observedTabId)
+        }
+
+        store.dispatchBlockingOnIdle(TabListAction.RemoveAllTabsAction())
+
+        rule.runOnIdle {
+            assertNull(observedTabId)
+        }
+    }
+
+    @Test
+    fun observingPinnedTab() {
+        val store = BrowserStore(
+            initialState = BrowserState(
+                tabs = listOf(
+                    createTab("https://www.mozilla.org", id = "mozilla"),
+                    createTab("https://www.example.org", id = "example")
+                ),
+                selectedTabId = "mozilla"
+            )
+        )
+
+        val target = Target.Tab("mozilla")
+        var observedTabId: String? = null
+
+        rule.setContent {
+            val state = target.observeAsComposableStateFrom(
+                store = store,
+                observe = { tab -> tab?.id }
+            )
+            observedTabId = state.value?.id
+        }
+
+        assertEquals("mozilla", observedTabId)
+
+        store.dispatchBlockingOnIdle(TabListAction.SelectTabAction("example"))
+
+        rule.runOnIdle {
+            assertEquals("mozilla", observedTabId)
+        }
+
+        store.dispatchBlockingOnIdle(TabListAction.RemoveTabAction("mozilla"))
+
+        rule.runOnIdle {
+            assertNull(observedTabId)
+        }
+    }
+
+    @Test
+    fun observingCustomTab() {
+        val store = BrowserStore(
+            initialState = BrowserState(
+                tabs = listOf(
+                    createTab("https://www.mozilla.org", id = "mozilla"),
+                    createTab("https://www.example.org", id = "example")
+                ),
+                customTabs = listOf(
+                    createCustomTab("https://www.reddit.com/r/firefox/", id = "reddit")
+                ),
+                selectedTabId = "mozilla"
+            )
+        )
+
+        val target = Target.CustomTab("reddit")
+
+        var observedTabId: String? = null
+
+        rule.setContent {
+            val state = target.observeAsComposableStateFrom(
+                store = store,
+                observe = { tab -> tab?.id }
+            )
+            observedTabId = state.value?.id
+        }
+
+        assertEquals("reddit", observedTabId)
+
+        store.dispatchBlockingOnIdle(TabListAction.SelectTabAction("example"))
+
+        rule.runOnIdle {
+            assertEquals("reddit", observedTabId)
+        }
+
+        store.dispatchBlockingOnIdle(TabListAction.RemoveTabAction("mozilla"))
+
+        rule.runOnIdle {
+            assertEquals("reddit", observedTabId)
+        }
+
+        store.dispatchBlockingOnIdle(CustomTabListAction.RemoveCustomTabAction("reddit"))
+
+        rule.runOnIdle {
+            assertNull(observedTabId)
+        }
+    }
+
+    private fun BrowserStore.dispatchBlockingOnIdle(action: BrowserAction) {
+        rule.runOnIdle {
+            val job = dispatch(action)
+            runBlocking { job.join() }
+        }
+    }
+}
--- a/mobile/android/android-components/components/browser/state/src/main/java/mozilla/components/browser/state/helper/Target.kt
+++ b/mobile/android/android-components/components/browser/state/src/main/java/mozilla/components/browser/state/helper/Target.kt
@ -0,0 +1,96 @@
+/* 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 mozilla.components.browser.state.helper
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.State
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import mozilla.components.browser.state.selector.findCustomTab
+import mozilla.components.browser.state.selector.findTab
+import mozilla.components.browser.state.selector.selectedTab
+import mozilla.components.browser.state.state.BrowserState
+import mozilla.components.browser.state.state.SessionState
+import mozilla.components.browser.state.store.BrowserStore
+import mozilla.components.lib.state.Store
+import mozilla.components.lib.state.ext.observeAsComposableState
+
+/**
+ * Helper for allowing a component consumer to specify which tab a component should target (e.g.
+ * the selected tab, a specific pinned tab or a custom tab). Additional helper methods make it
+ * easier to lookup the current state of the tab or observe changes.
+ */
+sealed class Target {
+    /**
+     * Looks up this target in the given [BrowserStore] and returns the matching [SessionState] if
+     * available. Otherwise returns `null`.
+     *
+     * @param store to lookup this target in.
+     */
+    fun lookupIn(store: BrowserStore): SessionState? = lookupIn(store.state)
+
+    /**
+     * Looks up this target in the given [BrowserState] and returns the matching [SessionState] if
+     * available. Otherwise returns `null`.
+     *
+     * @param state to lookup this target in.
+     */
+    abstract fun lookupIn(state: BrowserState): SessionState?
+
+    /**
+     * Observes this target and represents the mapped state (using [map]) via [State].
+     *
+     * Everytime the [Store] state changes and the result of the [observe] function changes for this
+     * state, the returned [State] will be updated causing recomposition of every [State.value] usage.
+     *
+     * The [Store] observer will automatically be removed when this composable disposes or the current
+     * [LifecycleOwner] moves to the [Lifecycle.State.DESTROYED] state.
+     *
+     * @param store that should get observed
+     * @param observe function that maps a [SessionState] to the (sub) state that should get observed
+     * for changes.
+     */
+    @Composable
+    fun <R> observeAsComposableStateFrom(
+        store: BrowserStore,
+        observe: (SessionState?) -> R
+    ): State<SessionState?> {
+        return store.observeAsComposableState(
+            map = { state -> lookupIn(state) },
+            observe = { state -> observe(lookupIn(state)) }
+        )
+    }
+
+    /**
+     * Targets the selected tab.
+     */
+    object SelectedTab : Target() {
+        override fun lookupIn(state: BrowserState): SessionState? {
+            return state.selectedTab
+        }
+    }
+
+    /**
+     * Targets a specific tab by its [tabId].
+     *
+     * @param tabId The ID of the tab to be targeted.
+     */
+    class Tab(val tabId: String) : Target() {
+        override fun lookupIn(state: BrowserState): SessionState? {
+            return state.findTab(tabId)
+        }
+    }
+
+    /**
+     * Targets a specific custom tab by its [customTabId].
+     *
+     * @param customTabId The ID of the custom tab to be targeted.
+     */
+    class CustomTab(val customTabId: String) : Target() {
+        override fun lookupIn(state: BrowserState): SessionState? {
+            return state.findCustomTab(customTabId)
+        }
+    }
+}
--- a/mobile/android/android-components/components/browser/state/src/test/java/mozilla/components/browser/state/helper/TargetTest.kt
+++ b/mobile/android/android-components/components/browser/state/src/test/java/mozilla/components/browser/state/helper/TargetTest.kt
@ -0,0 +1,138 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package mozilla.components.browser.state.helper
+
+import mozilla.components.browser.state.action.TabListAction
+import mozilla.components.browser.state.state.BrowserState
+import mozilla.components.browser.state.state.createCustomTab
+import mozilla.components.browser.state.state.createTab
+import mozilla.components.browser.state.store.BrowserStore
+import mozilla.components.support.test.ext.joinBlocking
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNull
+import org.junit.Test
+
+class TargetTest {
+    @Test
+    fun lookupInStore() {
+        val store = BrowserStore(
+            initialState = BrowserState(
+                tabs = listOf(
+                    createTab("https://www.mozilla.org", id = "mozilla"),
+                    createTab("https://www.example.org", id = "example"),
+                    createTab("https://theverge.com", id = "theverge", private = true)
+                ),
+                customTabs = listOf(
+                    createCustomTab("https://www.reddit.com/r/firefox/", id = "reddit")
+                ),
+                selectedTabId = "mozilla"
+            )
+        )
+
+        assertEquals(
+            "https://www.mozilla.org",
+            Target.SelectedTab.lookupIn(store)?.content?.url
+        )
+
+        assertEquals(
+            "https://www.mozilla.org",
+            Target.Tab("mozilla").lookupIn(store)?.content?.url
+        )
+
+        assertEquals(
+            "https://theverge.com",
+            Target.Tab("theverge").lookupIn(store)?.content?.url
+        )
+
+        assertNull(
+            Target.Tab("unknown").lookupIn(store)
+        )
+
+        assertNull(
+            Target.Tab("reddit").lookupIn(store)
+        )
+
+        assertEquals(
+            "https://www.reddit.com/r/firefox/",
+            Target.CustomTab("reddit").lookupIn(store)?.content?.url
+        )
+
+        assertNull(
+            Target.CustomTab("unknown").lookupIn(store)
+        )
+
+        assertNull(
+            Target.CustomTab("mozilla").lookupIn(store)
+        )
+
+        store.dispatch(
+            TabListAction.SelectTabAction("example")
+        ).joinBlocking()
+
+        assertEquals(
+            "https://www.example.org",
+            Target.SelectedTab.lookupIn(store)?.content?.url
+        )
+
+        store.dispatch(
+            TabListAction.RemoveAllTabsAction()
+        ).joinBlocking()
+
+        assertNull(
+            Target.SelectedTab.lookupIn(store)
+        )
+    }
+
+    @Test
+    fun lookupInState() {
+        val state = BrowserState(
+            tabs = listOf(
+                createTab("https://www.mozilla.org", id = "mozilla"),
+                createTab("https://www.example.org", id = "example"),
+                createTab("https://theverge.com", id = "theverge", private = true)
+            ),
+            customTabs = listOf(
+                createCustomTab("https://www.reddit.com/r/firefox/", id = "reddit")
+            ),
+            selectedTabId = "mozilla"
+        )
+
+        assertEquals(
+            "https://www.mozilla.org",
+            Target.SelectedTab.lookupIn(state)?.content?.url
+        )
+
+        assertEquals(
+            "https://www.mozilla.org",
+            Target.Tab("mozilla").lookupIn(state)?.content?.url
+        )
+
+        assertEquals(
+            "https://theverge.com",
+            Target.Tab("theverge").lookupIn(state)?.content?.url
+        )
+
+        assertNull(
+            Target.Tab("unknown").lookupIn(state)
+        )
+
+        assertNull(
+            Target.Tab("reddit").lookupIn(state)
+        )
+
+        assertEquals(
+            "https://www.reddit.com/r/firefox/",
+            Target.CustomTab("reddit").lookupIn(state)?.content?.url
+        )
+
+        assertNull(
+            Target.CustomTab("unknown").lookupIn(state)
+        )
+
+        assertNull(
+            Target.CustomTab("mozilla").lookupIn(state)
+        )
+    }
+}
--- a/mobile/android/android-components/components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/behavior/BrowserGestureDetector.kt
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/behavior/BrowserGestureDetector.kt
@ -48,6 +48,7 @@ internal class BrowserGestureDetector(
    )

    @VisibleForTesting
+    @Suppress("SoonBlockedPrivateApi") // https://github.com/mozilla-mobile/android-components/issues/10638
    internal var scaleGestureDetector = ScaleGestureDetector(
        applicationContext,
        CustomScaleDetectorListener(
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-an/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-an/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Menú</string>
+
    <string name="mozac_clear_button_description">Borrar</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">La protección contra seguimiento ye activada</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-ar/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-ar/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">القائمة</string>
+
    <string name="mozac_clear_button_description">امسح</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">الحماية من التعقّب مفعّلة</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-ast/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-ast/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Menú</string>
+
    <string name="mozac_clear_button_description">Llimpiar</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">La proteición antirrastrexu ta activada</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-az/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-az/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Menyu</string>
+
    <string name="mozac_clear_button_description">Təmizlə</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">İzlənmə Qoruması açıqdır</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-be/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-be/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Меню</string>
+
    <string name="mozac_clear_button_description">Ачысціць</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Ахова ад сачэння ўключана</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-bg/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-bg/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Меню</string>
+
    <string name="mozac_clear_button_description">Изчистване</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Защита от проследяване включена</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-bn/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-bn/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">মেনু</string>
+
    <string name="mozac_clear_button_description">পরিষ্কার করুন</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">ট্র্যাকিং সুরক্ষা চালু আছে</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-br/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-br/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Lañser</string>
+
    <string name="mozac_clear_button_description">Skarzhañ</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Gweredekaet eo ar gware heuliañ</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-bs/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-bs/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Meni</string>
+
    <string name="mozac_clear_button_description">Očisti</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Zaštita od praćenja uključena</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-ca/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-ca/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Menú</string>
+
    <string name="mozac_clear_button_description">Esborra</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">La protecció contra el seguiment està activada</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-cak/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-cak/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">K\'utsamaj</string>
+
    <string name="mozac_clear_button_description">Tijosq\'ïx</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Tzijïl ri Chajinïk Chuwäch Ojqanïk</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-ceb/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-ceb/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Menu</string>
+
    <string name="mozac_clear_button_description">Panas</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Ang Tracking Protection on</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-ckb/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-ckb/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">پێڕست</string>
+
    <string name="mozac_clear_button_description">پاککردنەوە</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">پارێزگاری لە چاودێری کارایە</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-co/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-co/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Interfaccia</string>
+
    <string name="mozac_clear_button_description">Squassà</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">A prutezzione contr’à u spiunagiu hè attivata</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-cs/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-cs/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Nabídka</string>
+
    <string name="mozac_clear_button_description">Vymazat</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Ochrana proti sledování je zapnuta</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-cy/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-cy/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Dewislen</string>
+
    <string name="mozac_clear_button_description">Clirio</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Mae Diogelwch rhag Tracio ymlaen</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-da/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-da/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Menu</string>
+
    <string name="mozac_clear_button_description">Ryd</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Beskyttelse mod sporing er slået til</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-de/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-de/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Menü</string>
+
    <string name="mozac_clear_button_description">Leeren</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Schutz vor Aktivitätenverfolgung ist an</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-dsb/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-dsb/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Meni</string>
+
    <string name="mozac_clear_button_description">Wuprozniś</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Slědowański šćit jo zašaltowany</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-el/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-el/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Μενού</string>
+
    <string name="mozac_clear_button_description">Απαλοιφή</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Η προστασία από καταγραφή είναι ενεργή</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-en-rCA/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-en-rCA/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Menu</string>
+
    <string name="mozac_clear_button_description">Clear</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Tracking Protection is on</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-en-rGB/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-en-rGB/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Menu</string>
+
    <string name="mozac_clear_button_description">Clear</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Tracking Protection is on</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-eo/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-eo/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Menuo</string>
+
    <string name="mozac_clear_button_description">Viŝi</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Protekto kontraŭ spurado ŝaltita</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-es-rAR/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-es-rAR/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Menú</string>
+
    <string name="mozac_clear_button_description">Eliminar</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">La protección contra rastreo está habilitada</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-es-rCL/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-es-rCL/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Menú</string>
+
    <string name="mozac_clear_button_description">Limpiar</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Protección de seguimiento activada</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-es-rES/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-es-rES/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Menú</string>
+
    <string name="mozac_clear_button_description">Limpiar</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">La protección contra rastreo está activada</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-es-rMX/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-es-rMX/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Menú</string>
+
    <string name="mozac_clear_button_description">Limpiar</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">La protección contra rastreo está activada</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-es/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-es/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Menú</string>
+
    <string name="mozac_clear_button_description">Limpiar</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">La protección contra rastreo está activada</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-et/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-et/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Menüü</string>
+
    <string name="mozac_clear_button_description">Tühjenda</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Jälitamisvastane kaitse on sees</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-eu/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-eu/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Menua</string>
+
    <string name="mozac_clear_button_description">Garbitu</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Jarraipenaren babesa gaituta dago</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-fa/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-fa/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">منو</string>
+
    <string name="mozac_clear_button_description">پاک کردن</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">محافظت در برابر ردگیری</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-ff/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-ff/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Dosol</string>
+
    <string name="mozac_clear_button_description">Momtu</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Ndeenka Dewindol nani e</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-fi/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-fi/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Valikko</string>
+
    <string name="mozac_clear_button_description">Tyhjennä</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Seurannan suojaus on päällä</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-fr/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-fr/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Menu</string>
+
    <string name="mozac_clear_button_description">Effacer</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">La protection contre le pistage est activée</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-fy-rNL/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-fy-rNL/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Menu</string>
+
    <string name="mozac_clear_button_description">Wiskje</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Beskerming tsjin folgjen is ynskeakele</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-ga-rIE/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-ga-rIE/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Roghchlár</string>
+
    <string name="mozac_clear_button_description">Bánaigh</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Tá Cosaint ar Lorgaireacht ar siúl</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-gd/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-gd/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Clàr-taice</string>
+
    <string name="mozac_clear_button_description">Falamhaich</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Tha an dìon o thracadh air</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-gl/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-gl/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Menú</string>
+
    <string name="mozac_clear_button_description">Limpar</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Protección contra o rastrexo activada</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-gn/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-gn/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Poravorã</string>
+
    <string name="mozac_clear_button_description">Mopotĩ</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Tapykuehoha ñemo’ã oñemyandy</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-gu-rIN/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-gu-rIN/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">મેનુ</string>
+
    <string name="mozac_clear_button_description">સાફ કરો</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">ટ્રેકિંગ સુરક્ષા ચાલુ છે</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-hi-rIN/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-hi-rIN/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">मेन्यू</string>
+
    <string name="mozac_clear_button_description">साफ करें</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">ट्रैकिंग सुरक्षा चालू है</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-hr/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-hr/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Izbornik</string>
+
    <string name="mozac_clear_button_description">Izbriši</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Zaštita od praćenja je uključena</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-hsb/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-hsb/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Meni</string>
+
    <string name="mozac_clear_button_description">Wuprózdnić</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Slědowanski škit je zmóžnjeny</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-hu/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-hu/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Menü</string>
+
    <string name="mozac_clear_button_description">Törlés</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Követés elleni védelem bekapcsolva</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-hy-rAM/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-hy-rAM/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Ցանկ</string>
+
    <string name="mozac_clear_button_description">Մաքրել</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Հետագծման պաշտպանությունը միաց. է</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-ia/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-ia/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Menu</string>
+
    <string name="mozac_clear_button_description">Clarar</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Protection contra le traciamento active</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-in/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-in/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Menu</string>
+
    <string name="mozac_clear_button_description">Bersihkan</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Perlindungan Pelacakan aktif</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-is/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-is/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Valmynd</string>
+
    <string name="mozac_clear_button_description">Hreinsa</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Vörn gegn gagnasöfnun virk</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-it/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-it/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Menu</string>
+
    <string name="mozac_clear_button_description">Cancella</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">La protezione antitracciamento è attiva</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-iw/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-iw/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">תפריט</string>
+
    <string name="mozac_clear_button_description">ניקוי</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">הגנת מעקב פעילה</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-ja/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-ja/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">メニュー</string>
+
    <string name="mozac_clear_button_description">消去</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">トラッキング防止はオンです</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-ka/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-ka/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">მენიუ</string>
+
    <string name="mozac_clear_button_description">გასუფთავება</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">თვალთვალისგან დაცვა ჩართულია</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-kab/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-kab/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Umuɣ</string>
+
    <string name="mozac_clear_button_description">Sfeḍ</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Ammesten mgal aḍfaṛ yermed</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-kk/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-kk/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Мәзір</string>
+
    <string name="mozac_clear_button_description">Тазарту</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Бақылаудан қорғаныс іске қосулы</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-kmr/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-kmr/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Menû</string>
+
    <string name="mozac_clear_button_description">Paqij bike</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Parastina ji Şopandinê vekirî ye</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-kn/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-kn/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">ಪರಿವಿಡಿ</string>
+
    <string name="mozac_clear_button_description">ಅಳಿಸು</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">ಜಾಡು ಇರಿಸುವಿಕೆ ಇಂದ ರಕ್ಷಣೆ ಶುರುವಾಗಿದೆ</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-ko/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-ko/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">메뉴</string>
+
    <string name="mozac_clear_button_description">지우기</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">추적 방지 기능이 켜져 있습니다</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-lij/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-lij/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Menû</string>
+
    <string name="mozac_clear_button_description">Scancella</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Proteçion anti-traciamento açeiza</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-lo/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-lo/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">ເມນູ</string>
+
    <string name="mozac_clear_button_description">ລົບລ້າງ</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">ການປ້ອງກັນການຕິດຕາມກຳລັງເປີດຢູ່</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-lt/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-lt/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Meniu</string>
+
    <string name="mozac_clear_button_description">Išvalyti</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Apsauga nuo stebėjimo įjungta</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-mix/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-mix/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Katsi</string>
+
    <string name="mozac_clear_button_description">Ku^un</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Chika va^a ña sau</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-ml/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-ml/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">മെനു</string>
+
    <string name="mozac_clear_button_description">മായ്ക്കുക</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">ട്രാക്കിങ്ങ് സംരക്ഷണം ഓൺ ആണ്</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-mr/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-mr/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">मेनू</string>
+
    <string name="mozac_clear_button_description">साफ करा</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">ट्रॅकिंग संरक्षण चालू आहे</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-my/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-my/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">စာရင်း</string>
+
    <string name="mozac_clear_button_description">ရှင်းလင်းပါ</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">ခြေရာခံကာကွယ်မှုကို ဖွင့်ထားသည်</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-nb-rNO/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-nb-rNO/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Meny</string>
+
    <string name="mozac_clear_button_description">Tøm</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Sporingsbeskyttelse er på</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-nl/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-nl/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Menu</string>
+
    <string name="mozac_clear_button_description">Wissen</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Bescherming tegen volgen is ingeschakeld</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-nn-rNO/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-nn-rNO/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Meny</string>
+
    <string name="mozac_clear_button_description">Tøm</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Sporingsvern er ppå</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-oc/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-oc/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Menú</string>
+
    <string name="mozac_clear_button_description">Escafar</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">La proteccion contra lo seguiment es activada</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-or/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-or/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">ମେନୁ</string>
+
    <string name="mozac_clear_button_description">ଖାଲି କରନ୍ତୁ</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">ଟ୍ରାକିଂ ସୁରକ୍ଷା ଚାଲୁଛି</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-pa-rIN/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-pa-rIN/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">ਮੇਨੂ</string>
+
    <string name="mozac_clear_button_description">ਸਾਫ਼ ਕਰੋ</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">ਟਰੈਕ ਕਰਨ ਤੋਂ ਸੁਰੱਖਿਆ ਚਾਲੂ ਹੈ</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-pl/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-pl/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Menu</string>
+
    <string name="mozac_clear_button_description">Wyczyść</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Ochrona przed śledzeniem jest włączona</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-pt-rBR/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-pt-rBR/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Menu</string>
+
    <string name="mozac_clear_button_description">Limpar</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Proteção contra rastreamento ativada</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-pt-rPT/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-pt-rPT/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Menu</string>
+
    <string name="mozac_clear_button_description">Limpar</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Proteção contra monitorização está ativada</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-rm/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-rm/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Menu</string>
+
    <string name="mozac_clear_button_description">Stizzar</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">La protecziun cunter il fastizar è activa</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-ro/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-ro/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Meniu</string>
+
    <string name="mozac_clear_button_description">Șterge</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Protecția împotriva urmăririi este activată</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-ru/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-ru/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Меню</string>
+
    <string name="mozac_clear_button_description">Очистить</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Защита от отслеживания включена</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-sat/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-sat/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">ᱢᱮᱱᱩ</string>
+
    <string name="mozac_clear_button_description">ᱯᱷᱟᱨᱪᱟ</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">ᱯᱟᱸᱡᱟ ᱟᱰ ᱪᱟᱹᱞᱩ ᱢᱮᱱᱟᱜ-ᱟ</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-sk/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-sk/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Ponuka</string>
+
    <string name="mozac_clear_button_description">Vymazať</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Ochrana pred sledovaním je zapnutá</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-sl/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-sl/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Meni</string>
+
    <string name="mozac_clear_button_description">Počisti</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Zaščita pred sledenjem je vključena</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-sq/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-sq/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Menu</string>
+
    <string name="mozac_clear_button_description">Spastroje</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Mbrojtje Nga Gjurmimet është aktive</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-sr/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-sr/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Мени</string>
+
    <string name="mozac_clear_button_description">Обриши</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Заштита од праћења је укључена</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-su/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-su/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Menu</string>
+
    <string name="mozac_clear_button_description">Beresihan</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Kilung Palacakan keur hurung</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-sv-rSE/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-sv-rSE/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Meny</string>
+
    <string name="mozac_clear_button_description">Rensa</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Spårningsskydd är på</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-ta/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-ta/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">பட்டி</string>
+
    <string name="mozac_clear_button_description">துடை</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">தடமறியல் பாதுகாப்பு இயக்கத்தில்</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-te/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-te/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">మెనూ</string>
+
    <string name="mozac_clear_button_description">తుడిచివేయి</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">ట్రాకింగ్ సంరక్షణ చేతనంగా ఉంది</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-tg/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-tg/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Меню</string>
+
    <string name="mozac_clear_button_description">Пок кардан</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Муҳофизат аз пайгирӣ фаъол аст</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-th/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-th/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">เมนู</string>
+
    <string name="mozac_clear_button_description">ล้าง</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">การป้องกันการติดตามเปิดอยู่</string>
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/values-tl/strings.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/values-tl/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
-    <string name="mozac_browser_toolbar_menu_button">Menu</string>
+
    <string name="mozac_clear_button_description">Burahin</string>
    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Nakabukas ang Tracking Protection</string>
--- a/Show more
+++ b/Show more