diff --git a/build.gradle b/build.gradle
index 5a1bb4a5d2c..85cb88f5854 100644
--- a/build.gradle
+++ b/build.gradle
@@ -159,7 +159,7 @@ subprojects {
             }
 
             jacoco {
-                toolVersion = "0.8.7"
+                toolVersion = "0.8.8"
             }
 
             // Format test output
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index 1e844ce2c89..fbf08e00f63 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -30,9 +30,9 @@ object Versions {
     const val disklrucache = "2.0.2"
     const val leakcanary = "2.8.1"
 
-    const val mozilla_appservices = "93.7.1"
+    const val mozilla_appservices = "93.8.0"
 
-    const val mozilla_glean = "50.1.3"
+    const val mozilla_glean = "51.0.1"
 
     const val material = "1.2.1"
 
diff --git a/buildSrc/src/main/java/Gecko.kt b/buildSrc/src/main/java/Gecko.kt
index cdf3ef4861f..4088cddd257 100644
--- a/buildSrc/src/main/java/Gecko.kt
+++ b/buildSrc/src/main/java/Gecko.kt
@@ -9,7 +9,7 @@ object Gecko {
     /**
      * GeckoView Version.
      */
-    const val version = "105.0.20220801034014"
+    const val version = "105.0.20220808092108"
 
     /**
      * GeckoView channel
diff --git a/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/prompt/ChoicePromptUpdateDelegate.kt b/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/prompt/ChoicePromptDelegate.kt
similarity index 92%
rename from components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/prompt/ChoicePromptUpdateDelegate.kt
rename to components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/prompt/ChoicePromptDelegate.kt
index 2917c475398..b8353e753a6 100644
--- a/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/prompt/ChoicePromptUpdateDelegate.kt
+++ b/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/prompt/ChoicePromptDelegate.kt
@@ -19,11 +19,17 @@ import org.mozilla.geckoview.GeckoSession.PromptDelegate.PromptInstanceDelegate
  * with the onPromptUpdate callback.
  * @param previousPrompt [PromptRequest] to be updated.
  */
-internal class ChoicePromptUpdateDelegate(
+internal class ChoicePromptDelegate(
     private val geckoSession: GeckoEngineSession,
     private var previousPrompt: PromptRequest,
 ) : PromptInstanceDelegate {
 
+    override fun onPromptDismiss(prompt: BasePrompt) {
+        geckoSession.notifyObservers {
+            onPromptDismissed(previousPrompt)
+        }
+    }
+
     override fun onPromptUpdate(prompt: BasePrompt) {
         if (prompt is ChoicePrompt) {
             val promptRequest = updatePromptChoices(prompt)
diff --git a/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/prompt/GeckoPromptDelegate.kt b/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/prompt/GeckoPromptDelegate.kt
index f5f6fcb61ea..afa3a561016 100644
--- a/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/prompt/GeckoPromptDelegate.kt
+++ b/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/prompt/GeckoPromptDelegate.kt
@@ -258,7 +258,7 @@ internal class GeckoPromptDelegate(private val geckoEngineSession: GeckoEngineSe
             else -> throw InvalidParameterException("${geckoPrompt.type} is not a valid Gecko @Choice.ChoiceType")
         }
 
-        geckoPrompt.delegate = ChoicePromptUpdateDelegate(
+        geckoPrompt.delegate = ChoicePromptDelegate(
             geckoEngineSession,
             promptRequest
         )
diff --git a/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/prompt/ChoicePromptUpdateDelegateTest.kt b/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/prompt/ChoicePromptDelegateTest.kt
similarity index 73%
rename from components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/prompt/ChoicePromptUpdateDelegateTest.kt
rename to components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/prompt/ChoicePromptDelegateTest.kt
index f6ca2a42e3b..7d61e3708ce 100644
--- a/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/prompt/ChoicePromptUpdateDelegateTest.kt
+++ b/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/prompt/ChoicePromptDelegateTest.kt
@@ -16,7 +16,7 @@ import org.junit.runner.RunWith
 import org.mozilla.geckoview.GeckoSession
 
 @RunWith(AndroidJUnit4::class)
-class ChoicePromptUpdateDelegateTest {
+class ChoicePromptDelegateTest {
 
     @Test
     fun `WHEN onPromptUpdate is called from GeckoView THEN notifyObservers is invoked with onPromptUpdate`() {
@@ -41,7 +41,7 @@ class ChoicePromptUpdateDelegateTest {
             { isOnConfirmCalled = true },
             { isOnDismissCalled = true }
         )
-        val delegate = ChoicePromptUpdateDelegate(mockSession, prompt)
+        val delegate = ChoicePromptDelegate(mockSession, prompt)
         val updatedPrompt = mock<GeckoSession.PromptDelegate.ChoicePrompt>()
         ReflectionUtils.setField(updatedPrompt, "choices", arrayOf<GeckoChoice>())
 
@@ -55,4 +55,23 @@ class ChoicePromptUpdateDelegateTest {
         assertTrue(isOnDismissCalled)
         assertTrue(isOnConfirmCalled)
     }
+
+    @Test
+    fun `WHEN onPromptDismiss is called from GeckoView THEN notifyObservers is invoked with onPromptDismissed`() {
+        val mockSession = GeckoEngineSession(mock())
+        var isOnDismissCalled = false
+        mockSession.register(object : EngineSession.Observer {
+            override fun onPromptDismissed(promptRequest: PromptRequest) {
+                super.onPromptDismissed(promptRequest)
+                isOnDismissCalled = true
+            }
+        })
+        val basePrompt: GeckoSession.PromptDelegate.ChoicePrompt = mock()
+        val prompt: PromptRequest = mock()
+        val delegate = ChoicePromptDelegate(mockSession, prompt)
+
+        delegate.onPromptDismiss(basePrompt)
+
+        assertTrue(isOnDismissCalled)
+    }
 }
diff --git a/components/browser/errorpages/src/main/res/values-ast/strings.xml b/components/browser/errorpages/src/main/res/values-ast/strings.xml
index 6f8b695168c..43fb88b5b14 100644
--- a/components/browser/errorpages/src/main/res/values-ast/strings.xml
+++ b/components/browser/errorpages/src/main/res/values-ast/strings.xml
@@ -39,6 +39,8 @@
     <!-- The text shown inside the advanced options button used to bypass the invalid SSL certificate. It's only shown if the user has expanded the advanced options. -->
     <string name="mozac_browser_errorpages_security_bad_cert_accept_temporary">Aceutar el riesgu y siguir</string>
 
+    <!-- The document title and heading of the error page shown when a website uses HSTS. -->
+    <string name="mozac_browser_errorpages_security_bad_hsts_cert_title">Esti sitiu web rique una conexón segura.</string>
     <!-- The error message shown when a website uses HSTS. -->
     <string name="mozac_browser_errorpages_security_bad_hsts_cert_message"><![CDATA[
       <ul>
@@ -250,6 +252,8 @@
 
     <!-- The title of the error page for websites that do not support HTTPS when HTTPS-Only is turned on -->
     <string name="mozac_browser_errorpages_httpsonly_title">El sitiu seguru nun ta disponible</string>
+    <!-- The text of the error page for websites that do not support HTTPS when HTTPS-Only is turned on. %1$s will be replaced with the URL of the website. -->
+    <string name="mozac_browser_errorpages_httpsonly_message"><![CDATA[Activesti\'l mou de namás HTTPS p\'ameyorar la seguranza, y la versión HTTPS de <em>%1$s</em> nun ta disponible.]]></string>
     <!-- Button on error page for websites that do not support HTTPS when HTTPS-Only is turned on. Clicking the button allows the user to nevertheless load the website using HTTP. -->
     <string name="mozac_browser_errorpages_httpsonly_button">Siguir col sitiu HTTP</string>
 </resources>
diff --git a/components/browser/errorpages/src/main/res/values-cs/strings.xml b/components/browser/errorpages/src/main/res/values-cs/strings.xml
index 76b0bce5f24..0a363b5e5ac 100644
--- a/components/browser/errorpages/src/main/res/values-cs/strings.xml
+++ b/components/browser/errorpages/src/main/res/values-cs/strings.xml
@@ -61,6 +61,8 @@ kdo se snaží vydávat za server.</li>
 
     <!-- The advanced certificate information shown when a website uses HSTS. The %1$s will be replaced by the website URL and %2$s will be replaced by the app name. It's only shown when a website uses HSTS. -->
     <string moz:removedIn="104" name="mozac_browser_errorpages_security_bad_hsts_cert_techInfo" tools:ignore="UnusedResources"><![CDATA[Server <label> <b>%1$s</b> má nastaveno bezpečnostní pravidlo HTTP Strict Transport Security (HSTS), které od aplikace <b>%2$s</b> vyžaduje používání pouze zabezpečeného spojení. Pro připojení k této stránce nelze udělit výjimku.]]></string>
+    <!-- The advanced certificate information shown when a website uses HSTS. The %1$s will be replaced by the website URL and %2$s will be replaced by the app name. It's only shown when a website uses HSTS. -->
+    <string name="mozac_browser_errorpages_security_bad_hsts_cert_techInfo2"><![CDATA[Server <label> <b>%1$s</b> má nastaveno bezpečnostní pravidlo HTTP Strict Transport Security (HSTS), které od aplikace <b>%2$s</b> vyžaduje používání pouze zabezpečeného spojení. Pro připojení k této stránce nelze udělit výjimku.</label>]]></string>
     <!-- The text shown inside the advanced options button used to go back. It's only shown if the user has expanded the advanced options. -->
     <string name="mozac_browser_errorpages_security_bad_hsts_cert_back">Zpátky</string>
 
@@ -78,6 +80,15 @@ kdo se snaží vydávat za server.</li>
     <!-- The document title and heading of the error page shown when a website takes too long to load. -->
     <string name="mozac_browser_errorpages_net_timeout_title">Vypršel čas spojení</string>
 
+    <!-- The error message shown when a website took long to load. -->
+    <string name="mozac_browser_errorpages_net_timeout_message"><![CDATA[<p>Požadovaný server neodpověděl na požadavek o připojení a prohlížeč ukončil čekání na tuto odpověď.</p>
+      <ul>
+        <li>Server může být velmi vytížen. Opakujte akci později.</li>
+        <li>Funguje načítání ostatních webových stránek? Zkontrolujte síťové připojení vašeho zařízení.</li>
+        <li>Připojuje se vaše zařízení k síti skrze firewall nebo proxy server? Nesprávné nastavení může načítání stránek ovlivnit.</li>
+        <li>Pokud problém přetrvává, poraďte se se správcem vaší sítě, nebo poskytovatelem připojení k internetu.</li>
+      </ul>]]></string>
+
     <!-- The document title and heading of the error page shown when a website could not be reached. -->
     <string name="mozac_browser_errorpages_connection_failure_title">Nelze se připojit</string>
     <!-- The error message shown when a website could not be reached. -->
@@ -233,18 +244,25 @@ kdo se snaží vydávat za server.</li>
 
     <!-- The document title and heading of an error page. -->
     <string name="mozac_browser_errorpages_proxy_connection_refused_title">Proxy server odmítl spojení</string>
-    <string name="mozac_browser_errorpages_proxy_connection_refused_message"><![CDATA[
-      <p>Prohlížeč je nakonfigurován k použití proxy serveru, který odmítl spojení.</p>
+    <string name="mozac_browser_errorpages_proxy_connection_refused_message"><![CDATA[<p>Prohlížeč je nastaven, aby používal proxy server, který odmítá spojení.</p>
       <ul>
-        <li>Zkontrolujte v prohlížeči nastavení proxy serveru a opakujte akci.</li>
+        <li>Zkontrolujte v prohlížeči nastavení proxy serveru a akci opakujte.</li>
         <li>Je možné, že proxy server nepovoluje připojení z vaší sítě.</li>
         <li>Pokud problém přetrvává, poraďte se se správcem vaší sítě, nebo poskytovatelem připojení k internetu.</li>
       </ul>
-    ]]></string>
+]]></string>
 
     <!-- The document title and heading of an error page. -->
     <string name="mozac_browser_errorpages_unknown_proxy_host_title">Proxy server nenalezen</string>
 
+    <string name="mozac_browser_errorpages_unknown_proxy_host_message"><![CDATA[<p>Prohlížeč je nastaven, aby používal proxy server, který nelze nalézt.</p>
+      <ul>
+        <li>Zkontrolujte v prohlížeči nastavení proxy serveru a akci opakujte.</li>
+        <li>Zkontrolujte síťové připojení vašeho zařízení.</li>
+        <li>Pokud problém přetrvává, poraďte se se správcem vaší sítě, nebo poskytovatelem připojení k internetu.</li>
+      </ul>
+    ]]></string>
+
     <!-- The document title and heading of an error page. -->
     <string name="mozac_browser_errorpages_safe_browsing_malware_uri_title">Problém se škodlivým softwarem</string>
     <!-- The %1$s will be replaced by the malicious website URL-->
diff --git a/components/browser/errorpages/src/main/res/values-gd/strings.xml b/components/browser/errorpages/src/main/res/values-gd/strings.xml
index 95b22874699..156724f56e0 100644
--- a/components/browser/errorpages/src/main/res/values-gd/strings.xml
+++ b/components/browser/errorpages/src/main/res/values-gd/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
 
     <!-- The button that appears at the bottom of an error page. -->
     <string name="mozac_browser_errorpages_page_refresh">Feuch ris a-rithist</string>
@@ -36,6 +36,32 @@
     <!-- The text shown inside the advanced options button used to bypass the invalid SSL certificate. It's only shown if the user has expanded the advanced options. -->
     <string name="mozac_browser_errorpages_security_bad_cert_accept_temporary">Tuigidh mi an cunnart, air adhart leam</string>
 
+    <!-- The document title and heading of the error page shown when a website uses HSTS. -->
+    <string name="mozac_browser_errorpages_security_bad_hsts_cert_title">Feumaidh an làrach-lìn seo ceangal tèarainte.</string>
+    <!-- The error message shown when a website uses HSTS. -->
+    <string name="mozac_browser_errorpages_security_bad_hsts_cert_message"><![CDATA[
+      <ul>
+         <li>Chan urrainn dhuinn an duilleag seo a shealltainn dhut a chionn ’s gum feum an làrach-lìn seo ceangal tèarainte.</li>
+         <li>Mar is trice, ’s ann aig an làrach-lìn a bhios an duilgheadas agus chan eil dad ann as urrainn dhut-sa a dhèanamh airson a chur ceart.</li>
+         <li>Ach is urrainn dhut innse do rianaire na làraich-lìn gu bheil an duilgheadas seo ann.</li>
+      </ul>
+    ]]></string>
+
+    <!-- The text shown inside the advanced button used to expand the advanced options. It's only shown when a website uses HSTS. -->
+    <string name="mozac_browser_errorpages_security_bad_hsts_cert_advanced">Adhartach…</string>
+
+    <!-- The advanced certificate information shown when a website uses HSTS. The %1$s will be replaced by the website URL and %2$s will be replaced by the app name. It's only shown when a website uses HSTS. -->
+    <string moz:removedIn="104" name="mozac_browser_errorpages_security_bad_hsts_cert_techInfo" tools:ignore="UnusedResources"><![CDATA[
+        <label> Tha poileasaidh tèarainteachd aig <b>%1$s</b> air a bheil HTTP Strict Transport Security (HSTS), agus is ciall dha sin nach urrainn dha <b>%2$s</b> ach ceangal tèarainte a dhèanamh. Chan urrainn dhut eisgeachd a chur ris a thadhal air an làrach seo.
+    ]]></string>
+
+    <!-- The advanced certificate information shown when a website uses HSTS. The %1$s will be replaced by the website URL and %2$s will be replaced by the app name. It's only shown when a website uses HSTS. -->
+    <string name="mozac_browser_errorpages_security_bad_hsts_cert_techInfo2"><![CDATA[
+        <label> Tha poileasaidh tèarainteachd aig <b>%1$s</b> air a bheil HTTP Strict Transport Security (HSTS), agus is ciall dha sin nach urrainn dha <b>%2$s</b> ach ceangal tèarainte a dhèanamh. Chan urrainn dhut eisgeachd a chur ris a thadhal air an làrach seo.</label>
+    ]]></string>
+    <!-- The text shown inside the advanced options button used to go back. It's only shown if the user has expanded the advanced options. -->
+    <string name="mozac_browser_errorpages_security_bad_hsts_cert_back">Air ais</string>
+
     <!-- The document title and heading of the error page shown when the user's network connection is interrupted while connecting to a website. -->
     <string name="mozac_browser_errorpages_net_interrupt_title">Bhris rudeigin a-steach air a’ cheangal</string>
 
diff --git a/components/browser/errorpages/src/main/res/values-hy-rAM/strings.xml b/components/browser/errorpages/src/main/res/values-hy-rAM/strings.xml
index 715ab4cb57f..13801305b82 100644
--- a/components/browser/errorpages/src/main/res/values-hy-rAM/strings.xml
+++ b/components/browser/errorpages/src/main/res/values-hy-rAM/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
 
     <!-- The button that appears at the bottom of an error page. -->
     <string name="mozac_browser_errorpages_page_refresh">Կրկին փորձել</string>
@@ -51,9 +51,14 @@
 
     <!-- The text shown inside the advanced button used to expand the advanced options. It's only shown when a website uses HSTS. -->
     <string name="mozac_browser_errorpages_security_bad_hsts_cert_advanced">Լրացուցիչ…</string>
+
     <!-- The advanced certificate information shown when a website uses HSTS. The %1$s will be replaced by the website URL and %2$s will be replaced by the app name. It's only shown when a website uses HSTS. -->
-    <string name="mozac_browser_errorpages_security_bad_hsts_cert_techInfo"><![CDATA[
+    <string moz:removedIn="104" name="mozac_browser_errorpages_security_bad_hsts_cert_techInfo" tools:ignore="UnusedResources"><![CDATA[
         <label> <b>%1$s</b>-ը ունի անվտանգության քաղաքականություն, որը կոչվում է HTTP Strict Transport Security (HSTS): Այն նշանակում է, որ <b>%2$s</b>-ը կարող է միայն անվտանգ կապակցում անել: Տվյալ կայքը այցելելու համար դուք չեք կարող բացառություն սահմանել:]]></string>
+    <!-- The advanced certificate information shown when a website uses HSTS. The %1$s will be replaced by the website URL and %2$s will be replaced by the app name. It's only shown when a website uses HSTS. -->
+    <string name="mozac_browser_errorpages_security_bad_hsts_cert_techInfo2"><![CDATA[
+        <label> <b>%1$s</b>-ը ունի անվտանգության քաղաքականություն, որը կոչվում է HTTP Strict Transport Security (HSTS), ինչը նշանակում է, որ <b>%2$s</b>-ը կարող է դրան միմիայն անվտանգ կապակցվել: Դուք չեք կարող բացառություն ավելացնել տվյալ էջն այցելելու համար: </label>
+    ]]></string>
     <!-- The text shown inside the advanced options button used to go back. It's only shown if the user has expanded the advanced options. -->
     <string name="mozac_browser_errorpages_security_bad_hsts_cert_back">Հետ գնալ</string>
 
diff --git a/components/browser/errorpages/src/main/res/values-kab/strings.xml b/components/browser/errorpages/src/main/res/values-kab/strings.xml
index e85d1d109cc..a0f8fcc7d2a 100644
--- a/components/browser/errorpages/src/main/res/values-kab/strings.xml
+++ b/components/browser/errorpages/src/main/res/values-kab/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
 
     <!-- The button that appears at the bottom of an error page. -->
     <string name="mozac_browser_errorpages_page_refresh">Ɛreḍ tikkelt-nniḍen</string>
@@ -55,10 +55,14 @@
 
     <!-- The text shown inside the advanced button used to expand the advanced options. It's only shown when a website uses HSTS. -->
     <string name="mozac_browser_errorpages_security_bad_hsts_cert_advanced">Talqayt…</string>
+
     <!-- The advanced certificate information shown when a website uses HSTS. The %1$s will be replaced by the website URL and %2$s will be replaced by the app name. It's only shown when a website uses HSTS. -->
-    <string name="mozac_browser_errorpages_security_bad_hsts_cert_techInfo"><![CDATA[
+    <string moz:removedIn="104" name="mozac_browser_errorpages_security_bad_hsts_cert_techInfo" tools:ignore="UnusedResources"><![CDATA[
         <label> <b>%1$s</b> ɣur-s tasertit n tɣellist HTTP Strict Transport Security (HSTS), ay-agi yemmal-d d akken <b>%2$s</b> izmer kan ad iqqen ɣur-s s tɣellist. Ur tezmireḍ ara ad ternuḍ tasureft akken ad twaliḍ asmel-agi.
     ]]></string>
+    <!-- The advanced certificate information shown when a website uses HSTS. The %1$s will be replaced by the website URL and %2$s will be replaced by the app name. It's only shown when a website uses HSTS. -->
+    <string name="mozac_browser_errorpages_security_bad_hsts_cert_techInfo2"><![CDATA[
+        <label> <b>%1$s</b> ɣur-s tasertit n tɣellist HTTP Strict Transport Security (HSTS), ay-agi yemmal-d d akken <b>%2$s</b> izmer kan ad iqqen ɣur-s s tɣellist. Ur tezmireḍ ara ad ternuḍ tasureft akken ad twaliḍ asmel-agi.</label>]]></string>
     <!-- The text shown inside the advanced options button used to go back. It's only shown if the user has expanded the advanced options. -->
     <string name="mozac_browser_errorpages_security_bad_hsts_cert_back">Uɣal ɣer deffir</string>
 
diff --git a/components/browser/errorpages/src/main/res/values-ug/strings.xml b/components/browser/errorpages/src/main/res/values-ug/strings.xml
index 7d83a94b129..6822d863bce 100644
--- a/components/browser/errorpages/src/main/res/values-ug/strings.xml
+++ b/components/browser/errorpages/src/main/res/values-ug/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
     <!-- The button that appears at the bottom of an error page. -->
     <string name="mozac_browser_errorpages_page_refresh">قايتا سىناڭ</string>
 
@@ -14,6 +14,24 @@
     <!-- The document title and heading of the error page shown when a website sends back unusual and incorrect credentials for an SSL certificate. -->
     <string name="mozac_browser_errorpages_security_ssl_title">بىخەتەر ئۇلىنىش مەغلۇپ بولدى</string>
 
+    <!-- The error message shown when a website sends back unusual and incorrect credentials for an SSL certificate. -->
+    <string name="mozac_browser_errorpages_security_ssl_message"><![CDATA[
+ <ul>
+ <li>سىز كۆرمەكچى بولغان بەتنى كۆرسەتكىلى بولمايدۇ ، چۈنكى تاپشۇرۇۋالغان سانلىق مەلۇماتلارنىڭ راست-يالغانلىقىنى تەكشۈرگىلى بولمايدۇ.</li>
+ <li>توربېكەت ئىگىلىرى بىلەن ئالاقىلىشىپ ، ئۇلارغا بۇ مەسىلىنى ئۇقتۇرۇڭ.</li>
+ </ul>
+ ]]></string>
+
+    <!-- The document title and heading of the error page shown when a website sends has an invalid or expired SSL certificate. -->
+    <string name="mozac_browser_errorpages_security_bad_cert_title">بىخەتەر ئۇلىنىش مەغلۇپ بولدى</string>
+    <!-- The error message shown when a website sends has an invalid or expired SSL certificate. -->
+    <string name="mozac_browser_errorpages_security_bad_cert_message"><![CDATA[
+ <ul>
+ <li>بۇ مۇلازىمىتىرنىڭ سەپلىمىسىدە مەسىلە بولغانلىقى، ياكى نامەلۈم كىشلەرنىڭ مۇلازىمىتىرنى دوراشقا ئۇرۇنغانلىق سەۋەبلىك بولۇشى مۇمكىن.</li>
+ <li>ئەگەر سىز بۇرۇن بۇ مۇلازىمېتىرغا مۇۋەپپەقىيەتلىك ئۇلىنالىغان بولسىڭىز، خاتالىق ۋاقىتلىق بولۇشى مۇمكىن، شۇنداقلا قايتا سىناپ باقسىڭىز بولىدۇ.</li>
+ </ul>
+ ]]></string>
+
     <!-- The text shown inside the advanced button used to expand the advanced options. It's only shown when a website has an invalid SSL certificate. -->
     <string name="mozac_browser_errorpages_security_bad_cert_advanced">ئالىي…</string>
     <!-- The text shown inside the advanced options button used to go back. It's only shown if the user has expanded the advanced options. -->
@@ -22,18 +40,79 @@
     <!-- The text shown inside the advanced options button used to bypass the invalid SSL certificate. It's only shown if the user has expanded the advanced options. -->
     <string name="mozac_browser_errorpages_security_bad_cert_accept_temporary">خەتەرنى قوبۇل قىلىپ داۋاملاشتۇرۇش</string>
 
+    <!-- The text shown inside the advanced button used to expand the advanced options. It's only shown when a website uses HSTS. -->
+    <string name="mozac_browser_errorpages_security_bad_hsts_cert_advanced">ئالىي…</string>
+
+    <!-- The text shown inside the advanced options button used to go back. It's only shown if the user has expanded the advanced options. -->
+    <string name="mozac_browser_errorpages_security_bad_hsts_cert_back">قايتىش</string>
+
     <!-- The document title and heading of the error page shown when the user's network connection is interrupted while connecting to a website. -->
     <string name="mozac_browser_errorpages_net_interrupt_title">ئۇلىنىش ئۈزۈلۈپ قالدى</string>
 
+    <!-- The error message shown when the user's network connection is interrupted while connecting to a website. -->
+    <string name="mozac_browser_errorpages_net_interrupt_message"><![CDATA[
+ <p>توركۆرگۈچ مۇۋەپپەقىيەتلىك ئۇلاندى ، ئەمما ئۇچۇر يوللىغاندا ئۇلىنىش ئۈزۈلۈپ قالدى. قايتا سىناڭ.</p>
+ <ul>
+ <li>تور بېكەتنى ۋاقتىنچە زىيارەت قىلغىلى بولمايدۇ ياكى مۇلازىمىتىر ئالدىراش. بىر نەچچە مىنۇتتىن كېيىن قايتا سىناڭ.</li>
+ <li>ئەگەر سىز ھېچقانداق بەتنى يۈكلىيەلمىسىڭىز ، ئۈسكۈنىڭىزنىڭ تور ئۇلىنىشىنى تەكشۈرۈپ بىقىڭ.</li>
+ </ul>
+ ]]></string>
+
+    <!-- The document title and heading of the error page shown when a website takes too long to load. -->
+    <string name="mozac_browser_errorpages_net_timeout_title">ۋاقتىدا ئۇلىنالمىدى</string>
+
     <!-- The document title and heading of the error page shown when a website could not be reached. -->
     <string name="mozac_browser_errorpages_connection_failure_title">ئۇلىنالمىدى</string>
 
+    <!-- The document title and heading of the error page shown when a website responds in an unexpected way and the browser cannot continue. -->
+    <string name="mozac_browser_errorpages_unknown_socket_type_title">كۈتۈلمىگەن مۇلازىمېتىر ئىنكاسى</string>
+    <!-- The error message shown when a website responds in an unexpected way and the browser cannot continue. -->
+    <string name="mozac_browser_errorpages_unknown_socket_type_message"><![CDATA[
+ <p>تور بېكەتنىڭ تور تەلىپىگە قايتۇرغان ئىنكاسى مۆلچەردىكىگە ئۇيغۇن ئەمەس، تور كۆرگۈچ داۋاملاشتۇرۇشقا ئامالسىز.</p>
+ ]]></string>
+
+    <!-- The document title and heading of the error page shown when a website cannot be loaded because the browser is in offline mode. -->
+    <string name="mozac_browser_errorpages_offline_title">تورسىز ھالەت</string>
+
+    <!-- The error message shown when a website cannot be loaded because the browser is in offline mode. -->
+    <string name="mozac_browser_errorpages_offline_message"><![CDATA[
+ <p>تور كۆرگۈچ تورسىز ھالەتتە، تەلەپ قىلغان تۈرگە ئۇلىنالمايدۇ.</p>
+ <ul>
+ <li>ئۈسكۈنە ئاكتىپ تورغا ئۇلانغانمۇ؟</li>
+ <li> “قايتا سىناش” نى بېسىپ ئاكتىپ ھالەتكە ئالماشتۇرۇڭ ۋە بەتنى قايتا يۈكلەڭ.</li>
+ </ul>
+ ]]></string>
+
+    <!-- The document title and heading of the error page shown when the browser prevents loading a website on a restricted port. -->
+    <string name="mozac_browser_errorpages_port_blocked_title">بىخەتەرلىك سەۋەبىدىن پورت چەكلەنگەن</string>
+
+    <!-- The document title and heading of the error page shown when the Internet connection is disrupted while loading a website. -->
+    <string name="mozac_browser_errorpages_net_reset_title">ئۇلىنىش ئەسلىگە كەلتۈرۈلدى</string>
+
     <!-- The document title and heading of the error page shown when the browser refuses to load a type of file that is considered unsafe. -->
     <string name="mozac_browser_errorpages_unsafe_content_type_title">خەتەرلىك ھۆججەت تىپى</string>
 
+    <!-- The error message shown when the browser refuses to load a type of file that is considered unsafe. -->
+    <string name="mozac_browser_errorpages_unsafe_content_type_message"><![CDATA[
+ <ul>
+ <li>توربېكەت ئىگىلىرى بىلەن ئالاقىلىشىپ ، ئۇلارغا بۇ مەسىلىنى ئۇقتۇرۇڭ.</li>
+ </ul>
+ ]]></string>
+
+    <!-- The document title and heading of an error page. -->
+    <string name="mozac_browser_errorpages_content_crashed_title">مەزمۇن بۇزۇلغان</string>
+
+    <!-- The document title and heading of an error page. -->
+    <string name="mozac_browser_errorpages_invalid_content_encoding_title">مەزمۇن كودلاش خاتالىقى</string>
+
+    <!-- The document title and heading of an error page. -->
+    <string name="mozac_browser_errorpages_unknown_host_title">ئادرېس تېپىلمىدى</string>
+
     <!-- The document title and heading of an error page. -->
     <string name="mozac_browser_errorpages_no_internet_title">تورغا ئۇلانمىغان</string>
 
+    <!-- The main body text of this error page. It will be shown beneath the title -->
+    <string name="mozac_browser_errorpages_no_internet_message">تور ئۇلىنىشىڭىزنى تەكشۈرۈڭ ياكى بىر نەچچە مىنۇتتىن كېيىن بەتنى قايتا يۈكلەڭ.</string>
     <!-- Text that will show up on the button at the bottom of the error page -->
     <string name="mozac_browser_errorpages_no_internet_refresh_button">قايتا يۈكلە</string>
 
@@ -42,6 +121,14 @@
     <!-- The document title and heading of an error page. -->
     <string name="mozac_browser_errorpages_malformed_uri_title_alternative">ئادرېس ئىناۋەتسىز</string>
 
+    <!-- This string contains markup. The URL should not be localized. -->
+    <string name="mozac_browser_errorpages_malformed_uri_message_alternative"><![CDATA[
+   <ul>
+   <li>تور ئادرېسى ئادەتتە مىسالدىكىدەك يېزىلىدۇ، مىسال- <strong>http://www.example.com/</strong></li>
+   <li>ئىشلەتكىنىڭىزنىڭ يانتۇ سېزىق ئىكەنلىكىنى جەزىملەشتۈرۈڭ.(مىسال. <strong>/</strong>).</li>
+   </ul>
+ ]]></string>
+
     <!-- The document title and heading of an error page. -->
     <string name="mozac_browser_errorpages_unknown_protocol_title">نامەلۇم كېلىشىم</string>
 
@@ -51,10 +138,28 @@
     <!-- The document title and heading of an error page. -->
     <string name="mozac_browser_errorpages_file_access_denied_title">ھۆججەتنى زىيارەت قىلىش رەت قىلىندى</string>
 
+    <string name="mozac_browser_errorpages_file_access_denied_message"><![CDATA[
+ <ul>
+ <li>ھۆججەت يۇيۇلغان ياكى يۆتكەلگەن ۋە ياكى زىيارەت ھوقۇقى يوق بولۇشى مۇمكىن</li>
+ </ul>
+ ]]></string>
+
     <!-- The document title and heading of an error page. -->
     <string name="mozac_browser_errorpages_proxy_connection_refused_title">ۋاكالەتچى مۇلازىمېتىر ئۇلىنىشنى رەت قىلدى</string>
 
     <!-- The document title and heading of an error page. -->
     <string name="mozac_browser_errorpages_unknown_proxy_host_title">ۋاكالەتچى مۇلازىمېتىر تېپىلمىدى</string>
 
+    <!-- The document title and heading of an error page. -->
+    <string name="mozac_browser_errorpages_safe_browsing_malware_uri_title">يامان غەرەزلىك تور بېكەت مەسىلىسى</string>
+
+    <!-- The document title and heading of an error page. -->
+    <string name="mozac_browser_errorpages_safe_browsing_unwanted_uri_title">كېرەكسىز بېكەت مەسىلىسى</string>
+
+    <!-- The document title and heading of an error page. -->
+    <string name="mozac_browser_errorpages_safe_harmful_uri_title">زىيانلىق تور بېكەت مەسىلىسى</string>
+
+    <!-- The document title and heading of an error page. -->
+    <string name="mozac_browser_errorpages_safe_phishing_uri_title">ئالدامچىلىق تور بېكىتى مەسىلىسى</string>
+
     </resources>
diff --git a/components/browser/menu/src/main/res/values-ug/strings.xml b/components/browser/menu/src/main/res/values-ug/strings.xml
new file mode 100644
index 00000000000..2697dda1e4e
--- /dev/null
+++ b/components/browser/menu/src/main/res/values-ug/strings.xml
@@ -0,0 +1,11 @@
+<?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_menu_button">تىزىملىك</string>
+    <!-- Content description (not visible, for screen readers etc.): Indicates the overflow menu has a highlight -->
+    <string name="mozac_browser_menu_highlighted">ئالاھىدە</string>
+    <!-- Label for add-ons submenu section -->
+    <string name="mozac_browser_menu_addons">قىستۇرما</string>
+    <!-- Label for add-ons sub menu item for add-ons manager -->
+    <string name="mozac_browser_menu_addons_manager">قىستۇرما باشقۇرغۇچ</string>
+</resources>
diff --git a/components/browser/menu2/src/main/res/values-ug/strings.xml b/components/browser/menu2/src/main/res/values-ug/strings.xml
new file mode 100644
index 00000000000..444cf112192
--- /dev/null
+++ b/components/browser/menu2/src/main/res/values-ug/strings.xml
@@ -0,0 +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_menu2_button">تىزىملىك</string>
+    <!-- Content description (not visible, for screen readers etc.): Indicates the overflow menu has a highlight -->
+    <string name="mozac_browser_menu2_highlighted">ئالاھىدە</string>
+</resources>
diff --git a/components/browser/toolbar/src/main/res/values-ug/strings.xml b/components/browser/toolbar/src/main/res/values-ug/strings.xml
new file mode 100644
index 00000000000..54765124e64
--- /dev/null
+++ b/components/browser/toolbar/src/main/res/values-ug/strings.xml
@@ -0,0 +1,16 @@
+<?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>
+    <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection disabled.-->
+    <string name="mozac_browser_toolbar_content_description_tracking_protection_off_for_a_site1">بۇ توربېكەتكە نىسبەتەن ئىزلاش ئېتىلگەن</string>
+    <!-- Content description: For the site security information icon (the site security icon).-->
+    <string name="mozac_browser_toolbar_content_description_site_info">بېكەت ئۇچۇرى</string>
+    <!-- Announcement made by the screen reader when the progress bar is shown and a page is loading -->
+    <string name="mozac_browser_toolbar_progress_loading">يۈكلەۋاتىدۇ</string>
+    <!-- Content description: For the autoplay toolbar icon, it is set when the auto play permission is blocking content playing.-->
+    <string name="mozac_browser_toolbar_content_description_autoplay_blocked">بەزى مەزمۇنلار «ئاپتوماتىك قويۇش» تەرىپىدىن توسۇلدى</string>
+</resources>
diff --git a/components/compose/awesomebar/src/main/java/mozilla/components/compose/browser/awesomebar/internal/Suggestion.kt b/components/compose/awesomebar/src/main/java/mozilla/components/compose/browser/awesomebar/internal/Suggestion.kt
index bdcd37126bb..0045172c602 100644
--- a/components/compose/awesomebar/src/main/java/mozilla/components/compose/browser/awesomebar/internal/Suggestion.kt
+++ b/components/compose/awesomebar/src/main/java/mozilla/components/compose/browser/awesomebar/internal/Suggestion.kt
@@ -17,13 +17,16 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.rotate
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
@@ -135,8 +138,10 @@ private fun SuggestionIcon(
             contentDescription = null,
             modifier = Modifier
                 .padding(top = 8.dp)
+                .clip(RoundedCornerShape(2.dp))
                 .width(24.dp)
-                .height(24.dp)
+                .height(24.dp),
+            contentScale = ContentScale.Crop,
         )
         if (indicator != null) {
             Image(
diff --git a/components/compose/awesomebar/src/main/res/values-ug/strings.xml b/components/compose/awesomebar/src/main/res/values-ug/strings.xml
new file mode 100644
index 00000000000..476b29d8a2a
--- /dev/null
+++ b/components/compose/awesomebar/src/main/res/values-ug/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Description for the button to accept the search suggestion and continue editing the search. -->
+    <string name="mozac_browser_awesomebar_edit_suggestion">تەكلىپنى قوبۇل قىلىپ تەھرىرلەيدۇ</string>
+</resources>
diff --git a/components/feature/addons/src/main/res/values-yo/strings.xml b/components/feature/addons/src/main/res/values-yo/strings.xml
index 5338d89aa56..f8781d8c022 100644
--- a/components/feature/addons/src/main/res/values-yo/strings.xml
+++ b/components/feature/addons/src/main/res/values-yo/strings.xml
@@ -169,7 +169,7 @@
     <!-- Text shown after successfully enabled an add-on. %1$s is the add-on name. -->
     <string name="mozac_feature_addons_successfully_enabled">Ó ní àṣeyọrí ṣíṣiṣẹ́ %1$s</string>
     <!-- Text shown after failed to enable an add-on. %1$s is the add-on name. -->
-    <string name="mozac_feature_addons_failed_to_enable">Kùnà láti ṣiṣẹ́ %1$s%1$s</string>
+    <string name="mozac_feature_addons_failed_to_enable">Kùnà láti ṣiṣẹ́ %1$s</string>
     <!-- Text shown after successfully disabled an add-on. %1$s is the add-on name. -->
     <string name="mozac_feature_addons_successfully_disabled">Ní àṣeyọrí ìyọkúrò %1$s</string>
     <!-- Text shown after failed to disable an add-on. %1$s is the add-on name. -->
diff --git a/components/feature/media/src/main/java/mozilla/components/feature/media/fullscreen/MediaSessionFullscreenFeature.kt b/components/feature/media/src/main/java/mozilla/components/feature/media/fullscreen/MediaSessionFullscreenFeature.kt
index 4e8aa099b2d..a0669daacba 100644
--- a/components/feature/media/src/main/java/mozilla/components/feature/media/fullscreen/MediaSessionFullscreenFeature.kt
+++ b/components/feature/media/src/main/java/mozilla/components/feature/media/fullscreen/MediaSessionFullscreenFeature.kt
@@ -7,6 +7,7 @@ package mozilla.components.feature.media.fullscreen
 import android.app.Activity
 import android.content.pm.ActivityInfo
 import android.os.Build
+import android.view.WindowManager
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.flow.collect
@@ -14,6 +15,7 @@ import kotlinx.coroutines.flow.map
 import mozilla.components.browser.state.selector.findCustomTabOrSelectedTab
 import mozilla.components.browser.state.state.SessionState
 import mozilla.components.browser.state.store.BrowserStore
+import mozilla.components.concept.engine.mediasession.MediaSession
 import mozilla.components.lib.state.ext.flowScoped
 import mozilla.components.support.base.feature.LifecycleAwareFeature
 import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifChanged
@@ -37,6 +39,7 @@ class MediaSessionFullscreenFeature(
                 tab.filter { it.mediaSessionState != null && it.mediaSessionState!!.fullscreen }
             }.ifChanged().collect { states ->
                 processFullscreen(states)
+                processDeviceSleepMode(states)
             }
         }
     }
@@ -67,6 +70,23 @@ class MediaSessionFullscreenFeature(
         }
     }
 
+    private fun processDeviceSleepMode(sessionStates: List<SessionState>) {
+        val activeTabState = sessionStates.firstOrNull()
+        if (activeTabState == null || activeTabState.mediaSessionState?.fullscreen != true) {
+            return
+        }
+        activeTabState.mediaSessionState?.let {
+            when (activeTabState.mediaSessionState?.playbackState) {
+                MediaSession.PlaybackState.PLAYING -> {
+                    activity.window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+                }
+                else -> {
+                    activity.window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+                }
+            }
+        }
+    }
+
     override fun stop() {
         scope?.cancel()
     }
diff --git a/components/feature/media/src/test/java/mozilla/components/feature/media/fullscreen/MediaSessionFullscreenFeatureTest.kt b/components/feature/media/src/test/java/mozilla/components/feature/media/fullscreen/MediaSessionFullscreenFeatureTest.kt
index fd1cff3afe2..941a0f8f7b6 100644
--- a/components/feature/media/src/test/java/mozilla/components/feature/media/fullscreen/MediaSessionFullscreenFeatureTest.kt
+++ b/components/feature/media/src/test/java/mozilla/components/feature/media/fullscreen/MediaSessionFullscreenFeatureTest.kt
@@ -7,6 +7,8 @@ package mozilla.components.feature.media.fullscreen
 import android.app.Activity
 import android.content.pm.ActivityInfo
 import android.os.Build
+import android.view.Window
+import android.view.WindowManager
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import mozilla.components.browser.state.action.ContentAction
 import mozilla.components.browser.state.action.CustomTabListAction
@@ -23,12 +25,14 @@ import mozilla.components.support.test.ext.joinBlocking
 import mozilla.components.support.test.libstate.ext.waitUntilIdle
 import mozilla.components.support.test.mock
 import mozilla.components.support.test.rule.MainCoroutineRule
+import mozilla.components.support.test.whenever
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotEquals
 import org.junit.Assert.assertTrue
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.mockito.Mockito.atLeastOnce
 import org.mockito.Mockito.verify
 import org.robolectric.Robolectric
 import org.robolectric.annotation.Config
@@ -320,4 +324,49 @@ class MediaSessionFullscreenFeatureTest {
 
         assertNotEquals(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE, externalActivity.requestedOrientation)
     }
+
+    @Test
+    fun `GIVEN the selected tab in fullscreen mode WHEN the media is paused or stopped THEN release the wake lock of the device`() {
+        val activity: Activity = mock()
+        val window: Window = mock()
+
+        whenever(activity.window).thenReturn(window)
+
+        val elementMetadata = MediaSession.ElementMetadata()
+        val initialState = BrowserState(
+            tabs = listOf(
+                createTab(
+                    "https://www.mozilla.org", id = "tab1",
+                    mediaSessionState = MediaSessionState(
+                        mock(),
+                        elementMetadata = elementMetadata,
+                        playbackState = MediaSession.PlaybackState.PLAYING,
+                        fullscreen = true
+                    )
+                )
+            ),
+            selectedTabId = "tab1"
+        )
+        val store = BrowserStore(initialState)
+
+        val feature = MediaSessionFullscreenFeature(
+            activity,
+            store,
+            null
+        )
+        feature.start()
+        verify(activity.window).addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+
+        store.dispatch(MediaSessionAction.UpdateMediaPlaybackStateAction("tab1", MediaSession.PlaybackState.PAUSED))
+        store.waitUntilIdle()
+        verify(activity.window).clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+
+        store.dispatch(MediaSessionAction.UpdateMediaPlaybackStateAction("tab1", MediaSession.PlaybackState.PLAYING))
+        store.waitUntilIdle()
+        verify(activity.window, atLeastOnce()).addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+
+        store.dispatch(MediaSessionAction.DeactivatedMediaSessionAction("tab1"))
+        store.waitUntilIdle()
+        verify(activity.window, atLeastOnce()).clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+    }
 }
diff --git a/components/feature/prompts/src/main/java/mozilla/components/feature/prompts/PromptFeature.kt b/components/feature/prompts/src/main/java/mozilla/components/feature/prompts/PromptFeature.kt
index 74a0bc7f0a3..2a812b6d796 100644
--- a/components/feature/prompts/src/main/java/mozilla/components/feature/prompts/PromptFeature.kt
+++ b/components/feature/prompts/src/main/java/mozilla/components/feature/prompts/PromptFeature.kt
@@ -319,6 +319,11 @@ class PromptFeature private constructor(
                                         activePromptRequest as SelectAddress
                                     )
                                 }
+                                is SingleChoice,
+                                is MultipleChoice,
+                                is MenuChoice -> {
+                                    (activePrompt?.get() as? ChoiceDialogFragment)?.dismissAllowingStateLoss()
+                                }
                                 else -> {
                                     // no-op
                                 }
diff --git a/components/feature/prompts/src/main/res/values-bg/strings.xml b/components/feature/prompts/src/main/res/values-bg/strings.xml
index 1274a411904..8c55aa095a6 100644
--- a/components/feature/prompts/src/main/res/values-bg/strings.xml
+++ b/components/feature/prompts/src/main/res/values-bg/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
     <!-- Text for confirmation for a positive action in dialog  -->
     <string name="mozac_feature_prompts_ok">Добре</string>
     <!-- Text for confirmation for a negative action in dialog.  -->
@@ -107,4 +107,12 @@
     <string name="mozac_feature_prompts_collapse_credit_cards_content_description">Сгъва предложения списък с банкови карти</string>
     <!-- Option in the expanded select credit card prompt that links to credit cards settings. -->
     <string name="mozac_feature_prompts_manage_credit_cards">Управление на банкови карти</string>
-    </resources>
+    <!-- Text for the title of an update credit card dialog. -->
+    <string name="mozac_feature_prompts_update_credit_card_prompt_title">Обновяване на валидността на картата?</string>
+
+    <!-- Address Autofill -->
+    <!-- Header for the select address prompt to allow users to fill a form with a saved address. -->
+    <string moz:removedIn="104" name="mozac_feature_prompts_select_address" tools:ignore="UnusedResources">Изберете адрес</string>
+    <!-- Text for the manage addresses button. -->
+    <string name="mozac_feature_prompts_manage_address">Управление на адреси</string>
+</resources>
diff --git a/components/feature/prompts/src/main/res/values-gd/strings.xml b/components/feature/prompts/src/main/res/values-gd/strings.xml
index 1ba8e814751..1608e19afa1 100644
--- a/components/feature/prompts/src/main/res/values-gd/strings.xml
+++ b/components/feature/prompts/src/main/res/values-gd/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
     <!-- Text for confirmation for a positive action in dialog  -->
     <string name="mozac_feature_prompts_ok">Ceart ma-thà</string>
     <!-- Text for confirmation for a negative action in dialog.  -->
@@ -107,4 +107,22 @@
     <string name="mozac_feature_prompts_collapse_credit_cards_content_description">Co-theannaich na cairtean-creideis a mholamaid</string>
     <!-- Option in the expanded select credit card prompt that links to credit cards settings. -->
     <string name="mozac_feature_prompts_manage_credit_cards">Stiùirich na cairtean-creideis</string>
-    </resources>
+    <!-- Text for the title of a save credit card dialog. -->
+    <string name="mozac_feature_prompts_save_credit_card_prompt_title">A bheil thu airson a’ chairt seo a shàbhaladh air dòigh thèarainte?</string>
+    <!-- Text for the title of an update credit card dialog. -->
+    <string name="mozac_feature_prompts_update_credit_card_prompt_title">A bheil thu airson an latha a dh’fhalbhas an ùine air a’ chairt ùrachadh?</string>
+    <!-- Subtitle text displayed under the title of the save credit card dialog. -->
+    <string name="mozac_feature_prompts_save_credit_card_prompt_body">Thèid àireamh na cairte a chrioptachadh. Cha tèid an còd tèarainteachd a shàbhaladh.</string>
+
+    <!-- Address Autofill -->
+    <!-- Header for the select address prompt to allow users to fill a form with a saved address. -->
+    <string moz:removedIn="104" name="mozac_feature_prompts_select_address" tools:ignore="UnusedResources">Tagh na seòlaidhean</string>
+    <!-- Header for the select address prompt to allow users to fill a form with a saved address. -->
+    <string name="mozac_feature_prompts_select_address_2">Tagh seòladh</string>
+    <!-- Content description for expanding the select addresses options in the select address prompt. -->
+    <string name="mozac_feature_prompts_expand_address_content_description">Leudaich na seòlaidhean a tha gam moladh</string>
+    <!-- Content description for collapsing the select address options in the select address prompt. -->
+    <string name="mozac_feature_prompts_collapse_address_content_description">Co-theannaich na seòlaidhean a tha gam moladh</string>
+    <!-- Text for the manage addresses button. -->
+    <string name="mozac_feature_prompts_manage_address">Stiùirich na seòlaidhean</string>
+</resources>
diff --git a/components/feature/prompts/src/main/res/values-yo/strings.xml b/components/feature/prompts/src/main/res/values-yo/strings.xml
index b0c6135af1e..3acb76ccda9 100644
--- a/components/feature/prompts/src/main/res/values-yo/strings.xml
+++ b/components/feature/prompts/src/main/res/values-yo/strings.xml
@@ -4,6 +4,8 @@
     <string name="mozac_feature_prompts_ok">Ó DÁA</string>
     <!-- Text for confirmation for a negative action in dialog.  -->
     <string name="mozac_feature_prompts_cancel">Parẹ́</string>
+    <!-- When a page shows many dialogs, this checkbox will appear for letting the user choose to prevent showing more dialogs. -->
+    <string name="mozac_feature_prompts_no_more_dialogs">Ṣe ìdíwọ́ fún ojú-ìwé yìí láti ṣẹ̀dá ìsọ̀rọ̀ńgbèsì mìíràn</string>
     <!-- Text for a positive button, when an user selects a date in date/time picker. -->
     <string name="mozac_feature_prompts_set_date">Ṣètò</string>
     <!-- Text for a button that clears the selected input in the date/time picker. -->
@@ -36,6 +38,9 @@
     <string name="mozac_feature_prompt_login_update_headline">Ṣe ìsọdituntun fún ohun-ìwọlé yìí?</string>
     <!-- Prompt message displayed when app detects a user has entered a username for an existing login without a username and user decides if app should update the login. -->
     <string name="mozac_feature_prompt_login_add_username_headline">Ṣe àfikún orúkọ-aṣàmúlò mọ́ ọ̀rọ̀-ìṣínà tó wà ní ìpamọ́?</string>
+    <!-- Text for a label for the field when prompt requesting a text is shown. -->
+    <!-- For more info take a look here https://developer.mozilla.org/en-US/docs/Web/API/Window/prompt -->
+    <string name="mozac_feature_prompts_content_description_input_label">Lébẹ́ẹ̀lì fún títẹ ọ̀rọ̀ sí</string>
     <!-- Title of a color picker dialog, this text is shown above a color picker. -->
     <string name="mozac_feature_prompts_choose_a_color">Yan àwọ̀ kan</string>
     <!-- Text of a confirm button in dialog requesting to open a new window. -->
@@ -88,6 +93,7 @@
 
     <!-- Strings shown in a dialog that appear when users try to refresh a certain kind of webpages -->
     <string name="mozac_feature_prompt_repost_title">Tún dátà ráńṣẹ́ sí sáìtì yí?</string>
+    <string name="mozac_feature_prompt_repost_message">Dídá ojú-ìwé yìí padà lé è sọ àwọn ìṣẹ̀lẹ̀ àìpẹ́ di méjì, gẹ́gẹ́ bíi ka máa fi owó ránṣé tàbí fífi ọ̀rọ̀ àsọyé ránṣẹ́ lẹ́ẹ̀mejì.</string>
     <!-- Pressing this will dismiss the dialog and reload the page sending again the previous data -->
     <string name="mozac_feature_prompt_repost_positive_button_text">Fi dátà ráńṣẹ́ lẹ́ẹ̀kan si</string>
     <!-- Pressing this will dismiss the dialog and not refresh the webpage -->
@@ -107,6 +113,9 @@
     <!-- Text for the title of an update credit card dialog. -->
     <string name="mozac_feature_prompts_update_credit_card_prompt_title">  Ṣe ìsọdituntun fún ọjọ́ òpin-ìlò káàdì?</string>
 
+    <!-- Subtitle text displayed under the title of the save credit card dialog. -->
+    <string name="mozac_feature_prompts_save_credit_card_prompt_body">A ó sọ nọ́ḿbà káàdì di kóòdù. A ò ní ṣe ìfipamọ́ kóòdù ààbò.</string>
+
     <!-- Address Autofill -->
     <!-- Header for the select address prompt to allow users to fill a form with a saved address. -->
     <string moz:removedIn="104" name="mozac_feature_prompts_select_address" tools:ignore="UnusedResources">Yan àwọn àdírẹ́sì</string>
diff --git a/components/feature/pwa/src/main/res/values-yo/strings.xml b/components/feature/pwa/src/main/res/values-yo/strings.xml
new file mode 100644
index 00000000000..8f67cb1d1cd
--- /dev/null
+++ b/components/feature/pwa/src/main/res/values-yo/strings.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Default shortcut label used if website has no title -->
+    <string name="mozac_feature_pwa_default_shortcut_label">Ojúlé wẹ́ẹ̀bù</string>
+
+    <!-- Name of the "notification channel" used for displaying site controls notification. See https://developer.android.com/training/notify-user/channels -->
+    <string name="mozac_feature_pwa_site_controls_notification_channel">Sáíìtì ìṣàkóso ìwòran gbogbogbò</string>
+    <!-- Text shown on the second row of the site controls notification. -->
+    <string name="mozac_feature_pwa_site_controls_notification_text">Tẹ̀ẹ́ to bá fẹ́ da URL fún áàpù yí kọ</string>
+    <!-- Refresh button in site controls notification. -->
+    <string name="mozac_feature_pwa_site_controls_refresh">Sọdọ̀tun</string>
+    <!-- Toast displayed when the website URL is copied. -->
+    <string name="mozac_feature_pwa_copy_success">URL ti wà ní àdàkọ.</string>
+</resources>
diff --git a/components/feature/pwa/src/test/java/mozilla/components/feature/pwa/feature/WebAppActivityFeatureTest.kt b/components/feature/pwa/src/test/java/mozilla/components/feature/pwa/feature/WebAppActivityFeatureTest.kt
index aeb1606b28e..1d4961585de 100644
--- a/components/feature/pwa/src/test/java/mozilla/components/feature/pwa/feature/WebAppActivityFeatureTest.kt
+++ b/components/feature/pwa/src/test/java/mozilla/components/feature/pwa/feature/WebAppActivityFeatureTest.kt
@@ -9,7 +9,6 @@ import android.content.pm.ActivityInfo
 import android.os.Looper.getMainLooper
 import android.view.View
 import android.view.Window
-import android.view.WindowManager
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import kotlinx.coroutines.CompletableDeferred
 import mozilla.components.browser.icons.BrowserIcons
@@ -22,7 +21,6 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.Mock
 import org.mockito.Mockito.`when`
-import org.mockito.Mockito.never
 import org.mockito.Mockito.verify
 import org.mockito.MockitoAnnotations.openMocks
 import org.robolectric.Shadows.shadowOf
@@ -52,13 +50,11 @@ class WebAppActivityFeatureTest {
             display = WebAppManifest.DisplayMode.STANDALONE
         )
         WebAppActivityFeature(activity, icons, basicManifest).onResume(mock())
-        verify(window, never()).addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
 
         val fullscreenManifest = basicManifest.copy(
             display = WebAppManifest.DisplayMode.FULLSCREEN
         )
         WebAppActivityFeature(activity, icons, fullscreenManifest).onResume(mock())
-        verify(window).addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
     }
 
     @Test
diff --git a/components/feature/qr/src/main/res/values-yo/strings.xml b/components/feature/qr/src/main/res/values-yo/strings.xml
new file mode 100644
index 00000000000..a17b5f6d7a6
--- /dev/null
+++ b/components/feature/qr/src/main/res/values-yo/strings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Content description (not visible, for screen readers etc.): Description of an image view. -->
+    <string name="mozac_feature_qr_scanner">Síkánà QR</string>
+
+    <!-- Text shown if no camera is available on the device and the QR scanner cannot be displayed. -->
+    <string name="mozac_feature_qr_scanner_no_camera">Kò sí ẹ̀rọ-ayàwòrán kankan lórí ẹ̀rọ yìí</string>
+
+</resources>
diff --git a/components/feature/readerview/src/main/res/values-oc/strings.xml b/components/feature/readerview/src/main/res/values-oc/strings.xml
index 90c338c3346..b914e4e8565 100644
--- a/components/feature/readerview/src/main/res/values-oc/strings.xml
+++ b/components/feature/readerview/src/main/res/values-oc/strings.xml
@@ -5,17 +5,17 @@
     <string name="mozac_feature_readerview_sans_serif_font">Sans serif</string>
 
     <!-- Accessible description for the font option -->
-    <string name="mozac_feature_readerview_sans_serif_font_desc">Poliça Sans Serif</string>
+    <string name="mozac_feature_readerview_sans_serif_font_desc">Polissa Sans Serif</string>
     <!-- Name for one of the font options available to use -->
     <string name="mozac_feature_readerview_serif_font">Serif</string>
     <!-- Accessible description for the font option -->
-    <string name="mozac_feature_readerview_serif_font_desc">Poliça Serif</string>
+    <string name="mozac_feature_readerview_serif_font_desc">Polissa Serif</string>
 
     <!-- Accessible description for decreasing the font size -->
-    <string name="mozac_feature_readerview_font_size_decrease_desc">Reduccion de la talha de la poliça</string>
+    <string name="mozac_feature_readerview_font_size_decrease_desc">Reduccion de la talha de la polissa</string>
 
     <!-- Accessible description for increasing the font size -->
-    <string name="mozac_feature_readerview_font_size_increase_desc">Agrandiment de la talha de la poliça</string>
+    <string name="mozac_feature_readerview_font_size_increase_desc">Agrandiment de la talha de la polissa</string>
     <!-- Color option for the background -->
     <string name="mozac_feature_readerview_dark">Fosc</string>
     <!-- Accessible description for the color option -->
diff --git a/components/feature/readerview/src/main/res/values-yo/strings.xml b/components/feature/readerview/src/main/res/values-yo/strings.xml
new file mode 100644
index 00000000000..135da6274e0
--- /dev/null
+++ b/components/feature/readerview/src/main/res/values-yo/strings.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Name for one of the font options available to use -->
+    <string name="mozac_feature_readerview_sans_serif_font">Sans serif</string>
+    <!-- Accessible description for the font option -->
+    <string name="mozac_feature_readerview_sans_serif_font_desc">Sans Serif font</string>
+    <!-- Name for one of the font options available to use -->
+    <string name="mozac_feature_readerview_serif_font">Serif</string>
+    <!-- Accessible description for the font option -->
+    <string name="mozac_feature_readerview_serif_font_desc">Fọ́ǹtì sérọ̀fù</string>
+
+    <!-- Accessible description for decreasing the font size -->
+    <string name="mozac_feature_readerview_font_size_decrease_desc">Ìwọn fọ́ǹtì dínkù</string>
+
+    <!-- Accessible description for increasing the font size -->
+    <string name="mozac_feature_readerview_font_size_increase_desc">Ìwọn fọ́ǹtì pọ̀ si</string>
+    <!-- Color option for the background -->
+    <string name="mozac_feature_readerview_dark">Dúdú</string>
+    <!-- Accessible description for the color option -->
+    <string name="mozac_feature_readerview_dark_color_scheme_desc">Ìlànà aláwọ̀ dúdú</string>
+    <!-- Color option for the background -->
+    <string name="mozac_feature_readerview_sephia">Sepia</string>
+    <!-- Accessible description for the color option -->
+    <string name="mozac_feature_readerview_sepia_color_scheme_desc">Ìlànà aláwọ̀ Sepia</string>
+    <!-- Color option for the background -->
+    <string name="mozac_feature_readerview_light">Mọ́lẹ̀</string>
+    <!-- Accessible description for the color option -->
+    <string name="mozac_feature_readerview_light_color_scheme_desc">Ìlànà aláwọ̀ tó mọ́lẹ̀</string>
+</resources>
diff --git a/components/feature/sitepermissions/src/main/res/values-gd/strings.xml b/components/feature/sitepermissions/src/main/res/values-gd/strings.xml
index f520ca39980..5dd5cc7805d 100644
--- a/components/feature/sitepermissions/src/main/res/values-gd/strings.xml
+++ b/components/feature/sitepermissions/src/main/res/values-gd/strings.xml
@@ -35,4 +35,14 @@
     <string name="mozac_feature_sitepermissions_persistent_storage_title">An doir thu cead dha %1$s dàta a chumail san stòras bhuan?</string>
     <!-- Title of a dialog to use EME. %1$s will be replaced with the URL of the current page -->
     <string name="mozac_feature_sitepermissions_media_key_system_access_title">A bheil thu airson cead a thoirt dha %1$s susbaint fo smachd DRM a chluich?</string>
+    <!-- Title of a dialog to use cross origin storage permission. %1$s is the name of the site URL (www.site1.example) trying to track the user's activity.
+     %2$s is the name of the site URL (www.site2.example) that the user is visiting.  This is the same domain name displayed in the address bar -->
+    <string name="mozac_feature_sitepermissions_storage_access_title">A bheil thu airson leigeil le %1$s na briosgaidean aice a chleachadh air %2$s?</string>
+    <!-- Message of a dialog offering more context about the cross origin storage permission.
+    %s is the name of the site URL (www.site1.example) trying to track the user's activity. -->
+    <string name="mozac_feature_sitepermissions_storage_access_message">Dh’fhaoidte gum b’ fheàirrde dhut an t-inntrigeadh a bhacadh mur eil thu cinnteach carson a dh’fheumas %s an dàta seo.</string>
+    <!-- Text for a negative button in the storage access permission request dialog. This button will not give access to this permission. -->
+    <string name="mozac_feature_sitepermissions_storage_access_not_allow">Bac</string>
+    <!-- Clickable text that will open a new tab navigating the user to online documentation about specific features. -->
+    <string name="mozac_feature_sitepermissions_learn_more_title">Barrachd fiosrachaidh</string>
 </resources>
diff --git a/components/feature/sitepermissions/src/main/res/values-yo/strings.xml b/components/feature/sitepermissions/src/main/res/values-yo/strings.xml
new file mode 100644
index 00000000000..ca9ed2c1801
--- /dev/null
+++ b/components/feature/sitepermissions/src/main/res/values-yo/strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Title of a dialog for a notification permission request. -->
+    <string name="mozac_feature_sitepermissions_notification_title">Fàyègba %1$s láti fi àwọn ìtanilólobó ráńṣẹ́?</string>
+    <!-- Title of a dialog for a camera permission request. -->
+    <string name="mozac_feature_sitepermissions_camera_title">Fàyègba %1$s láti lo èrọ-ayàwòrán rẹ?</string>
+    <!-- Title of a dialog for a microphone permission request. -->
+    <string name="mozac_feature_sitepermissions_microfone_title">Fàyègba %1$s láti lo ẹ̀rọ-ìgbóhùn rẹ?</string>
+    <!-- Title of a dialog for a location permission request. -->
+    <string name="mozac_feature_sitepermissions_location_title">Gbà láàyè %1$s láti lo ibi tí o wà?</string>
+    <!-- Title of a dialog for a camera and microphone permission request. -->
+    <string name="mozac_feature_sitepermissions_camera_and_microphone">Fàyègba %1$s láti lo ẹ̀rọ-ayàwòrán àti ẹ̀rọ-ìgbóhùn rẹ?</string>
+    <!-- Option in a dialog for requesting a microphone permission, this option will give access to
+         the first microphone-->
+    <string name="mozac_feature_sitepermissions_option_microphone_one">Ẹ̀rọ-ìgbóhùn 1</string>
+    <!-- Option in a dialog for requesting a camera permission, this option will give access to
+         back facing camera-->
+    <string name="mozac_feature_sitepermissions_back_facing_camera2">Ẹ̀rọ-ayàwòrán tó ń kọjú-sẹ́hìn</string>
+    <!-- Option in a dialog for requesting a camera permission, this option will give access to
+     front facing camera-->
+    <string name="mozac_feature_sitepermissions_selfie_camera2">Ẹ̀rọ-ayàwòrán tó ń kojú-síwájú</string>
+    <!-- Text for a positive button in a permission request dialog, this button will give
+        access to this permission-->
+    <string name="mozac_feature_sitepermissions_allow">Fàyègbà</string>
+    <!-- Text for a negative button in a permission request dialog, this button will do not give
+    access to this permission-->
+    <string name="mozac_feature_sitepermissions_not_allow">Má ṣe fàyègbà</string>
+    <!-- Text for a checkbox in a permission request dialog, this will allow to not show again the prompt-->
+    <string name="mozac_feature_sitepermissions_do_not_ask_again_on_this_site2">Rántí ìpinnu fún sáìtì yí</string>
+    <!-- Text for a positive button in a permission request dialog. This will always allow and remember the decision of the user, this is the special case of the notification permission, that is only ask one time-->
+    <string name="mozac_feature_sitepermissions_always_allow">Ní gbogbo ìgbà</string>
+    <!-- Text for a negative button in a permission request dialog. This will never allow and remember the decision of the user, this is the special case of the notification permission, that is only ask one time-->
+    <string name="mozac_feature_sitepermissions_never_allow">Láéláé</string>
+    <!-- Title of a dialog to require to save data in persistent storage. %1$s will be replaced with the URL of the current page -->
+    <string name="mozac_feature_sitepermissions_persistent_storage_title">Fàyègba %1$s láti fi dátà pamọ́ sí àyè tó dúróore?</string>
+    <!-- Title of a dialog to use EME. %1$s will be replaced with the URL of the current page -->
+    <string name="mozac_feature_sitepermissions_media_key_system_access_title">Fàyègba %1$s láti mú àkóónú ìṣàkóso DRM ṣiṣẹ́ bí?</string>
+    <!-- Title of a dialog to use cross origin storage permission. %1$s is the name of the site URL (www.site1.example) trying to track the user's activity.
+     %2$s is the name of the site URL (www.site2.example) that the user is visiting.  This is the same domain name displayed in the address bar -->
+    <string name="mozac_feature_sitepermissions_storage_access_title">Falyègba %1$s láti lo àwọn kúkì rẹ̀ lórí %2$s?</string>
+    <!-- Message of a dialog offering more context about the cross origin storage permission.
+    %s is the name of the site URL (www.site1.example) trying to track the user's activity. -->
+    <string name="mozac_feature_sitepermissions_storage_access_message">O lè fẹ́ dẹ̀nà ìwọlé tó bá rú ọ lójú ìdí %s tó fi nílò dátà yí.</string>
+    <!-- Text for a negative button in the storage access permission request dialog. This button will not give access to this permission. -->
+    <string name="mozac_feature_sitepermissions_storage_access_not_allow">Dẹ̀nà</string>
+    <!-- Clickable text that will open a new tab navigating the user to online documentation about specific features. -->
+    <string name="mozac_feature_sitepermissions_learn_more_title">Kẹ́kọ̀ọ́ si</string>
+</resources>
diff --git a/components/feature/tabs/src/main/res/values-yo/strings.xml b/components/feature/tabs/src/main/res/values-yo/strings.xml
new file mode 100644
index 00000000000..5c52ab2051f
--- /dev/null
+++ b/components/feature/tabs/src/main/res/values-yo/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Content description (not visible, for screen readers etc.): Description for the "tabs" button in the browser toolbar. -->
+    <string name="mozac_feature_tabs_toolbar_tabs_button">Àwọn táàbù</string>
+</resources>
diff --git a/components/feature/webnotifications/src/main/res/values-yo/strings.xml b/components/feature/webnotifications/src/main/res/values-yo/strings.xml
new file mode 100644
index 00000000000..2bde7e11dfb
--- /dev/null
+++ b/components/feature/webnotifications/src/main/res/values-yo/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Default Web Notification Channel Name. -->
+    <string name="mozac_feature_notification_channel_name">Àwọn ìtalólobó sáìtì</string>
+</resources>
diff --git a/components/lib/crash/src/main/java/mozilla/components/lib/crash/handler/CrashHandlerService.kt b/components/lib/crash/src/main/java/mozilla/components/lib/crash/handler/CrashHandlerService.kt
index dce9f48c775..d4d0b4b6f09 100644
--- a/components/lib/crash/src/main/java/mozilla/components/lib/crash/handler/CrashHandlerService.kt
+++ b/components/lib/crash/src/main/java/mozilla/components/lib/crash/handler/CrashHandlerService.kt
@@ -49,10 +49,7 @@ class CrashHandlerService : Service() {
             val channel = CrashNotification.ensureChannelExists(this)
             val notification = NotificationCompat.Builder(this, channel)
                 .setContentTitle(
-                    getString(
-                        R.string.mozac_lib_crash_dialog_title,
-                        crashReporter.promptConfiguration.appName
-                    )
+                    getString(R.string.mozac_lib_gathering_crash_data_in_progress)
                 )
                 .setSmallIcon(R.drawable.mozac_lib_crash_notification)
                 .setPriority(NotificationCompat.PRIORITY_DEFAULT)
diff --git a/components/lib/crash/src/main/java/mozilla/components/lib/crash/notification/CrashNotification.kt b/components/lib/crash/src/main/java/mozilla/components/lib/crash/notification/CrashNotification.kt
index be6aa7048a6..6bf36573532 100644
--- a/components/lib/crash/src/main/java/mozilla/components/lib/crash/notification/CrashNotification.kt
+++ b/components/lib/crash/src/main/java/mozilla/components/lib/crash/notification/CrashNotification.kt
@@ -15,10 +15,8 @@ import mozilla.components.lib.crash.Crash
 import mozilla.components.lib.crash.CrashReporter
 import mozilla.components.lib.crash.R
 import mozilla.components.lib.crash.prompt.CrashPrompt
-import mozilla.components.lib.crash.service.SendCrashReportService
 import mozilla.components.support.base.ids.SharedIdsHelper
 import mozilla.components.support.utils.PendingIntentUtils
-import mozilla.components.support.utils.asForegroundServicePendingIntent
 
 private const val NOTIFICATION_SDK_LEVEL = 29 // On Android Q+ we show a notification instead of a prompt
 
@@ -38,13 +36,6 @@ internal class CrashNotification(
             CrashPrompt.createIntent(context, crash), getNotificationFlag()
         )
 
-        val reportPendingIntent = SendCrashReportService
-            .createReportIntent(context, crash, NOTIFICATION_TAG, NOTIFICATION_ID)
-            .asForegroundServicePendingIntent(
-                context, SharedIdsHelper.getNextIdForTag(context, PENDING_INTENT_TAG),
-                getNotificationFlag()
-            )
-
         val channel = ensureChannelExists(context)
 
         val title = if (crash is Crash.NativeCodeCrash &&
@@ -69,7 +60,7 @@ internal class CrashNotification(
                 context.getString(
                     R.string.mozac_lib_crash_notification_action_report
                 ),
-                reportPendingIntent
+                pendingIntent,
             )
             .setAutoCancel(true)
             .build()
diff --git a/components/lib/crash/src/main/java/mozilla/components/lib/crash/prompt/CrashReporterActivity.kt b/components/lib/crash/src/main/java/mozilla/components/lib/crash/prompt/CrashReporterActivity.kt
index 772c2e6a269..87d2ca41907 100644
--- a/components/lib/crash/src/main/java/mozilla/components/lib/crash/prompt/CrashReporterActivity.kt
+++ b/components/lib/crash/src/main/java/mozilla/components/lib/crash/prompt/CrashReporterActivity.kt
@@ -12,10 +12,14 @@ import androidx.annotation.VisibleForTesting
 import androidx.annotation.VisibleForTesting.PRIVATE
 import androidx.appcompat.app.AppCompatActivity
 import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.app.NotificationManagerCompat
 import mozilla.components.lib.crash.Crash
 import mozilla.components.lib.crash.CrashReporter
 import mozilla.components.lib.crash.R
 import mozilla.components.lib.crash.databinding.MozacLibCrashCrashreporterBinding
+import mozilla.components.lib.crash.notification.CrashNotification
+import mozilla.components.lib.crash.notification.NOTIFICATION_ID
+import mozilla.components.lib.crash.notification.NOTIFICATION_TAG
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.EmptyCoroutineContext
 
@@ -40,6 +44,12 @@ class CrashReporterActivity : AppCompatActivity() {
     internal lateinit var binding: MozacLibCrashCrashreporterBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        // if the activity is started by user tapping on the crash notification's report button,
+        // remove the crash notification.
+        if (CrashNotification.shouldShowNotificationInsteadOfPrompt(crash)) {
+            NotificationManagerCompat.from(applicationContext).cancel(NOTIFICATION_TAG, NOTIFICATION_ID)
+        }
+
         setTheme(crashReporter.promptConfiguration.theme)
 
         super.onCreate(savedInstanceState)
@@ -54,9 +64,7 @@ class CrashReporterActivity : AppCompatActivity() {
         val appName = crashReporter.promptConfiguration.appName
         val organizationName = crashReporter.promptConfiguration.organizationName
 
-        val isBackgroundCrash = (crash as? Crash.NativeCodeCrash)?.processType ==
-            Crash.NativeCodeCrash.PROCESS_TYPE_BACKGROUND_CHILD
-        binding.titleView.text = when (isBackgroundCrash) {
+        binding.titleView.text = when (isRecoverableBackgroundCrash(crash)) {
             true -> getString(
                 R.string.mozac_lib_crash_background_process_notification_title,
                 appName
@@ -74,7 +82,7 @@ class CrashReporterActivity : AppCompatActivity() {
         binding.closeButton.setOnClickListener { close() }
 
         // For background crashes show just the close button. Otherwise show close and restart.
-        if (isBackgroundCrash) {
+        if (isRecoverableBackgroundCrash(crash)) {
             binding.restartButton.visibility = View.GONE
             val closeButtonParams = binding.closeButton.layoutParams as ConstraintLayout.LayoutParams
             closeButtonParams.startToStart = ConstraintLayout.LayoutParams.UNSET
@@ -130,6 +138,15 @@ class CrashReporterActivity : AppCompatActivity() {
         }
     }
 
+    /*
+     * Return true if the crash occurred in the background and is recoverable. (ex: GPU process crash)
+     */
+    @VisibleForTesting
+    internal fun isRecoverableBackgroundCrash(crash: Crash): Boolean {
+        return crash is Crash.NativeCodeCrash &&
+            crash.processType == Crash.NativeCodeCrash.PROCESS_TYPE_BACKGROUND_CHILD
+    }
+
     companion object {
 
         @VisibleForTesting(otherwise = PRIVATE)
diff --git a/components/lib/crash/src/main/res/values-ast/strings.xml b/components/lib/crash/src/main/res/values-ast/strings.xml
index c95f70e6a38..ddeb6024e7c 100644
--- a/components/lib/crash/src/main/res/values-ast/strings.xml
+++ b/components/lib/crash/src/main/res/values-ast/strings.xml
@@ -24,6 +24,9 @@
     <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
     <string name="mozac_lib_send_crash_report_in_progress">Unviando l\'informe del fallu a %1$s</string>
 
+    <!-- Label of notification showing that the crash handling service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_data_in_progress">Recoyendo los datos del casque</string>
+
     <!-- Label of notification showing that the telemetry service is gathering the crash data. -->
     <string name="mozac_lib_gathering_crash_telemetry_in_progress">Recoyendo los datos telemétricos del casque</string>
 
diff --git a/components/lib/crash/src/main/res/values-cs/strings.xml b/components/lib/crash/src/main/res/values-cs/strings.xml
index 0cb4cf68768..95e35643acf 100644
--- a/components/lib/crash/src/main/res/values-cs/strings.xml
+++ b/components/lib/crash/src/main/res/values-cs/strings.xml
@@ -24,6 +24,12 @@
     <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
     <string name="mozac_lib_send_crash_report_in_progress">Odesílání hlášení o pádu společnosti %1$s</string>
 
+    <!-- Label of notification showing that the crash handling service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_data_in_progress">Shromažďování dat o pádu</string>
+
+    <!-- Label of notification showing that the telemetry service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_telemetry_in_progress">Shromažďování telemetrických dat o pádu</string>
+
     <!-- Title of the activity that shows the list of past crashes (similar to about:crashes)-->
     <string name="mozac_lib_crash_activity_title">Hlášení pádů</string>
 
diff --git a/components/lib/crash/src/main/res/values-de/strings.xml b/components/lib/crash/src/main/res/values-de/strings.xml
index 1367ff5fb7b..54e7c24653f 100644
--- a/components/lib/crash/src/main/res/values-de/strings.xml
+++ b/components/lib/crash/src/main/res/values-de/strings.xml
@@ -24,6 +24,9 @@
     <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
     <string name="mozac_lib_send_crash_report_in_progress">Absturzbericht wird an %1$s gesendet</string>
 
+    <!-- Label of notification showing that the crash handling service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_data_in_progress">Absturzdaten werden erfasst</string>
+
     <!-- Label of notification showing that the telemetry service is gathering the crash data. -->
     <string name="mozac_lib_gathering_crash_telemetry_in_progress">Telemetriedaten zum Absturz werden gesammelt</string>
 
diff --git a/components/lib/crash/src/main/res/values-dsb/strings.xml b/components/lib/crash/src/main/res/values-dsb/strings.xml
index 0fb6ba7fb17..ba05b962f66 100644
--- a/components/lib/crash/src/main/res/values-dsb/strings.xml
+++ b/components/lib/crash/src/main/res/values-dsb/strings.xml
@@ -24,6 +24,9 @@
     <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
     <string name="mozac_lib_send_crash_report_in_progress">Wowaleńska rozpšawa se %1$s sćelo</string>
 
+    <!-- Label of notification showing that the crash handling service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_data_in_progress">Daty wowalenja se gromaźe</string>
+
     <!-- Label of notification showing that the telemetry service is gathering the crash data. -->
     <string name="mozac_lib_gathering_crash_telemetry_in_progress">Telemetrijowe daty wowalenjow se gromaźe</string>
 
diff --git a/components/lib/crash/src/main/res/values-el/strings.xml b/components/lib/crash/src/main/res/values-el/strings.xml
index 312d645611b..452732b283f 100644
--- a/components/lib/crash/src/main/res/values-el/strings.xml
+++ b/components/lib/crash/src/main/res/values-el/strings.xml
@@ -25,6 +25,9 @@
     <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
     <string name="mozac_lib_send_crash_report_in_progress">Αποστολή αναφοράς κατάρρευσης στη %1$s</string>
 
+    <!-- Label of notification showing that the crash handling service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_data_in_progress">Συλλογή δεδομένων κατάρρευσης</string>
+
     <!-- Label of notification showing that the telemetry service is gathering the crash data. -->
     <string name="mozac_lib_gathering_crash_telemetry_in_progress">Συλλογή δεδομένων τηλεμετρίας κατάρρευσης</string>
 
diff --git a/components/lib/crash/src/main/res/values-en-rGB/strings.xml b/components/lib/crash/src/main/res/values-en-rGB/strings.xml
index 8b240113af4..38b0b2e6475 100644
--- a/components/lib/crash/src/main/res/values-en-rGB/strings.xml
+++ b/components/lib/crash/src/main/res/values-en-rGB/strings.xml
@@ -24,6 +24,9 @@
     <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
     <string name="mozac_lib_send_crash_report_in_progress">Sending crash report to %1$s</string>
 
+    <!-- Label of notification showing that the crash handling service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_data_in_progress">Gathering crash data</string>
+
     <!-- Label of notification showing that the telemetry service is gathering the crash data. -->
     <string name="mozac_lib_gathering_crash_telemetry_in_progress">Gathering crash telemetry data</string>
 
diff --git a/components/lib/crash/src/main/res/values-es-rAR/strings.xml b/components/lib/crash/src/main/res/values-es-rAR/strings.xml
index dbf5d1537b1..05bfa9734ca 100644
--- a/components/lib/crash/src/main/res/values-es-rAR/strings.xml
+++ b/components/lib/crash/src/main/res/values-es-rAR/strings.xml
@@ -24,6 +24,9 @@
     <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
     <string name="mozac_lib_send_crash_report_in_progress">Enviando informe de fallo a %1$s</string>
 
+    <!-- Label of notification showing that the crash handling service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_data_in_progress">Recopilando datos de la colgada</string>
+
     <!-- Label of notification showing that the telemetry service is gathering the crash data. -->
     <string name="mozac_lib_gathering_crash_telemetry_in_progress">Recopilación de datos de telemetría de fallos</string>
 
diff --git a/components/lib/crash/src/main/res/values-es-rCL/strings.xml b/components/lib/crash/src/main/res/values-es-rCL/strings.xml
index f77ecd86570..b4cd64fb0d1 100644
--- a/components/lib/crash/src/main/res/values-es-rCL/strings.xml
+++ b/components/lib/crash/src/main/res/values-es-rCL/strings.xml
@@ -24,6 +24,9 @@
     <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
     <string name="mozac_lib_send_crash_report_in_progress">Enviando reporte de fallos a %1$s</string>
 
+    <!-- Label of notification showing that the crash handling service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_data_in_progress">Recopilando datos de fallos</string>
+
     <!-- Label of notification showing that the telemetry service is gathering the crash data. -->
     <string name="mozac_lib_gathering_crash_telemetry_in_progress">Recopilación de datos de telemetría de fallos</string>
 
diff --git a/components/lib/crash/src/main/res/values-es-rMX/strings.xml b/components/lib/crash/src/main/res/values-es-rMX/strings.xml
index 8c20fb9582a..f68b71a3efc 100644
--- a/components/lib/crash/src/main/res/values-es-rMX/strings.xml
+++ b/components/lib/crash/src/main/res/values-es-rMX/strings.xml
@@ -24,6 +24,9 @@
     <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
     <string name="mozac_lib_send_crash_report_in_progress">Enviando informe de fallo a %1$s</string>
 
+    <!-- Label of notification showing that the crash handling service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_data_in_progress">Recopilación de datos de errores</string>
+
     <!-- Label of notification showing that the telemetry service is gathering the crash data. -->
     <string name="mozac_lib_gathering_crash_telemetry_in_progress">Recopilación de datos de telemetría de fallos</string>
 
diff --git a/components/lib/crash/src/main/res/values-eu/strings.xml b/components/lib/crash/src/main/res/values-eu/strings.xml
index aed922167b9..de1d055c872 100644
--- a/components/lib/crash/src/main/res/values-eu/strings.xml
+++ b/components/lib/crash/src/main/res/values-eu/strings.xml
@@ -24,6 +24,9 @@
     <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
     <string name="mozac_lib_send_crash_report_in_progress">Hutsegite-txostena %1$s(e)ra bidaltzen</string>
 
+    <!-- Label of notification showing that the crash handling service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_data_in_progress">Hutsegitearen datuak biltzen</string>
+
     <!-- Label of notification showing that the telemetry service is gathering the crash data. -->
     <string name="mozac_lib_gathering_crash_telemetry_in_progress">Hutsegitearen datu telemetrikoak biltzen</string>
 
diff --git a/components/lib/crash/src/main/res/values-fi/strings.xml b/components/lib/crash/src/main/res/values-fi/strings.xml
index e3a2793a371..6a720554ceb 100644
--- a/components/lib/crash/src/main/res/values-fi/strings.xml
+++ b/components/lib/crash/src/main/res/values-fi/strings.xml
@@ -25,6 +25,9 @@
     <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
     <string name="mozac_lib_send_crash_report_in_progress">Lähetetään kaatumisraportti %1$slle</string>
 
+    <!-- Label of notification showing that the crash handling service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_data_in_progress">Kerätään kaatumistietoja</string>
+
     <!-- Label of notification showing that the telemetry service is gathering the crash data. -->
     <string name="mozac_lib_gathering_crash_telemetry_in_progress">Kerätään kaatumistelemetriatietoja</string>
 
diff --git a/components/lib/crash/src/main/res/values-gd/strings.xml b/components/lib/crash/src/main/res/values-gd/strings.xml
index ed08a0fbac9..cb41a846145 100644
--- a/components/lib/crash/src/main/res/values-gd/strings.xml
+++ b/components/lib/crash/src/main/res/values-gd/strings.xml
@@ -15,12 +15,21 @@
     <!-- Name of the "notification channel" used for displaying a notification when the app crashed and we can't show a prompt. See https://developer.android.com/training/notify-user/channels -->
     <string name="mozac_lib_crash_channel">Tuislidhean</string>
 
+    <!-- Title of the crash reporter notification for background process crashes. %1$s will be replaced with the name of the app (e.g. Firefox Focus). -->
+    <string name="mozac_lib_crash_background_process_notification_title">Tha sinn duilich ach dh’èirich duilgheadas ann an %1$s.</string>
+
     <!-- Label of a notification action/button that will send the crash report to Mozilla. -->
     <string name="mozac_lib_crash_notification_action_report">Dèan aithris</string>
 
     <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
     <string name="mozac_lib_send_crash_report_in_progress">A’ cur aithisg an tuislidh gu %1$s</string>
 
+    <!-- Label of notification showing that the crash handling service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_data_in_progress">A’ cruinneachadh an dàta mun tuisleadh</string>
+
+    <!-- Label of notification showing that the telemetry service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_telemetry_in_progress">A’ cruinneachadh dàta telemeatraidh mun tuisleadh</string>
+
     <!-- Title of the activity that shows the list of past crashes (similar to about:crashes)-->
     <string name="mozac_lib_crash_activity_title">Aithisgean tuislidh</string>
 
diff --git a/components/lib/crash/src/main/res/values-hsb/strings.xml b/components/lib/crash/src/main/res/values-hsb/strings.xml
index 5988021b2a2..d838bfa9e4b 100644
--- a/components/lib/crash/src/main/res/values-hsb/strings.xml
+++ b/components/lib/crash/src/main/res/values-hsb/strings.xml
@@ -24,6 +24,9 @@
     <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
     <string name="mozac_lib_send_crash_report_in_progress">Spadowa rozprawa so %1$s sćele</string>
 
+    <!-- Label of notification showing that the crash handling service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_data_in_progress">Daty spada so hromadźa</string>
+
     <!-- Label of notification showing that the telemetry service is gathering the crash data. -->
     <string name="mozac_lib_gathering_crash_telemetry_in_progress">Telemetrijowe daty spadow so hromadźa</string>
 
diff --git a/components/lib/crash/src/main/res/values-hu/strings.xml b/components/lib/crash/src/main/res/values-hu/strings.xml
index 2f2eb7442f1..e5529da97b9 100644
--- a/components/lib/crash/src/main/res/values-hu/strings.xml
+++ b/components/lib/crash/src/main/res/values-hu/strings.xml
@@ -24,6 +24,9 @@
     <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
     <string name="mozac_lib_send_crash_report_in_progress">Összeomlás-jelentés elküldése a %1$s számára</string>
 
+    <!-- Label of notification showing that the crash handling service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_data_in_progress">Összeomlási adatok gyűjtése</string>
+
     <!-- Label of notification showing that the telemetry service is gathering the crash data. -->
     <string name="mozac_lib_gathering_crash_telemetry_in_progress">Összeomlási telemetriai adatok gyűjtése</string>
 
diff --git a/components/lib/crash/src/main/res/values-hy-rAM/strings.xml b/components/lib/crash/src/main/res/values-hy-rAM/strings.xml
index 46bbd192982..be6443788f8 100644
--- a/components/lib/crash/src/main/res/values-hy-rAM/strings.xml
+++ b/components/lib/crash/src/main/res/values-hy-rAM/strings.xml
@@ -24,6 +24,9 @@
     <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
     <string name="mozac_lib_send_crash_report_in_progress">Ուղարկել վթարի զեկույցը %1$s-ին</string>
 
+    <!-- Label of notification showing that the telemetry service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_telemetry_in_progress">Վթարի հեռաչափության տվյալների հավաքում</string>
+
     <!-- Title of the activity that shows the list of past crashes (similar to about:crashes)-->
     <string name="mozac_lib_crash_activity_title">Վթարի զեկույց</string>
 
diff --git a/components/lib/crash/src/main/res/values-ia/strings.xml b/components/lib/crash/src/main/res/values-ia/strings.xml
index 84aed2069fb..841dcecd255 100644
--- a/components/lib/crash/src/main/res/values-ia/strings.xml
+++ b/components/lib/crash/src/main/res/values-ia/strings.xml
@@ -24,6 +24,9 @@
     <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
     <string name="mozac_lib_send_crash_report_in_progress">Invio de reporto de crash a %1$s</string>
 
+    <!-- Label of notification showing that the crash handling service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_data_in_progress">Collection datos de crash</string>
+
     <!-- Label of notification showing that the telemetry service is gathering the crash data. -->
     <string name="mozac_lib_gathering_crash_telemetry_in_progress">Colligente datos de telemetria de crash</string>
 
diff --git a/components/lib/crash/src/main/res/values-in/strings.xml b/components/lib/crash/src/main/res/values-in/strings.xml
index beaa77ee8e3..24f7d67e80b 100644
--- a/components/lib/crash/src/main/res/values-in/strings.xml
+++ b/components/lib/crash/src/main/res/values-in/strings.xml
@@ -25,6 +25,9 @@
     <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
     <string name="mozac_lib_send_crash_report_in_progress">Kirim laporan mogok ke %1$s</string>
 
+    <!-- Label of notification showing that the crash handling service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_data_in_progress">Mengumpulkan data mogok</string>
+
     <!-- Label of notification showing that the telemetry service is gathering the crash data. -->
     <string name="mozac_lib_gathering_crash_telemetry_in_progress">Mengumpulkan data telemetri mogok</string>
 
diff --git a/components/lib/crash/src/main/res/values-is/strings.xml b/components/lib/crash/src/main/res/values-is/strings.xml
index 4eab4500c4a..e13fe8bef70 100644
--- a/components/lib/crash/src/main/res/values-is/strings.xml
+++ b/components/lib/crash/src/main/res/values-is/strings.xml
@@ -24,6 +24,9 @@
     <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
     <string name="mozac_lib_send_crash_report_in_progress">Senda hrunaskýrslu til %1$s</string>
 
+    <!-- Label of notification showing that the crash handling service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_data_in_progress">Safna hrungögnum</string>
+
     <!-- Label of notification showing that the telemetry service is gathering the crash data. -->
     <string name="mozac_lib_gathering_crash_telemetry_in_progress">Safna fjarmælingargögnum um hrun</string>
 
diff --git a/components/lib/crash/src/main/res/values-it/strings.xml b/components/lib/crash/src/main/res/values-it/strings.xml
index 5406dbf0739..3a1cb7deef7 100644
--- a/components/lib/crash/src/main/res/values-it/strings.xml
+++ b/components/lib/crash/src/main/res/values-it/strings.xml
@@ -24,6 +24,9 @@
     <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
     <string name="mozac_lib_send_crash_report_in_progress">Invio in corso della segnalazione di arresto anomalo a %1$s</string>
 
+    <!-- Label of notification showing that the crash handling service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_data_in_progress">Raccolta dei dati sugli arresti anomali</string>
+
     <!-- Label of notification showing that the telemetry service is gathering the crash data. -->
     <string name="mozac_lib_gathering_crash_telemetry_in_progress">Raccolta dei dati di telemetria relativi agli arresti anomali</string>
 
diff --git a/components/lib/crash/src/main/res/values-iw/strings.xml b/components/lib/crash/src/main/res/values-iw/strings.xml
index 7cf04364eb2..36da8bccdb5 100644
--- a/components/lib/crash/src/main/res/values-iw/strings.xml
+++ b/components/lib/crash/src/main/res/values-iw/strings.xml
@@ -25,6 +25,9 @@
     <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
     <string name="mozac_lib_send_crash_report_in_progress">דיווח קריסה נשלח אל %1$s</string>
 
+    <!-- Label of notification showing that the crash handling service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_data_in_progress">בתהליך איסוף נתוני קריסה</string>
+
     <!-- Label of notification showing that the telemetry service is gathering the crash data. -->
     <string name="mozac_lib_gathering_crash_telemetry_in_progress">בתהליך איסוף נתוני קריסה</string>
 
diff --git a/components/lib/crash/src/main/res/values-ka/strings.xml b/components/lib/crash/src/main/res/values-ka/strings.xml
index 30ba1a1a41d..ca895abf3dd 100644
--- a/components/lib/crash/src/main/res/values-ka/strings.xml
+++ b/components/lib/crash/src/main/res/values-ka/strings.xml
@@ -24,6 +24,9 @@
     <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
     <string name="mozac_lib_send_crash_report_in_progress">გათიშვის მოხსენება ეგზავნება %1$s-ს</string>
 
+    <!-- Label of notification showing that the crash handling service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_data_in_progress">გროვდება გათიშვის მონაცემები</string>
+
     <!-- Label of notification showing that the telemetry service is gathering the crash data. -->
     <string name="mozac_lib_gathering_crash_telemetry_in_progress">აღირიცხება უეცარი გათიშვის მონაცემები</string>
 
diff --git a/components/lib/crash/src/main/res/values-kab/strings.xml b/components/lib/crash/src/main/res/values-kab/strings.xml
index 5d9a9cd8e8d..093ac3608f0 100644
--- a/components/lib/crash/src/main/res/values-kab/strings.xml
+++ b/components/lib/crash/src/main/res/values-kab/strings.xml
@@ -24,6 +24,12 @@
     <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
     <string name="mozac_lib_send_crash_report_in_progress">Tuzna n uneqqis n uɣelluy i %1$s</string>
 
+    <!-- Label of notification showing that the crash handling service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_data_in_progress">Alqaḍ n yisefka yerrẓen</string>
+
+    <!-- Label of notification showing that the telemetry service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_telemetry_in_progress">Alqaḍ n yisefka n tilisɣelt yerrẓen</string>
+
     <!-- Title of the activity that shows the list of past crashes (similar to about:crashes)-->
     <string name="mozac_lib_crash_activity_title">Ineqqisen n uɣelluy</string>
 
diff --git a/components/lib/crash/src/main/res/values-kk/strings.xml b/components/lib/crash/src/main/res/values-kk/strings.xml
index 7515b7c4294..631c4cda4ee 100644
--- a/components/lib/crash/src/main/res/values-kk/strings.xml
+++ b/components/lib/crash/src/main/res/values-kk/strings.xml
@@ -24,6 +24,9 @@
     <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
     <string name="mozac_lib_send_crash_report_in_progress">%1$s адресіне құлау жөнінде хабарламаны жіберу</string>
 
+    <!-- Label of notification showing that the crash handling service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_data_in_progress">Құлау деректерін жинау</string>
+
     <!-- Label of notification showing that the telemetry service is gathering the crash data. -->
     <string name="mozac_lib_gathering_crash_telemetry_in_progress">Құлау телеметрия деректерін жинау</string>
 
diff --git a/components/lib/crash/src/main/res/values-ko/strings.xml b/components/lib/crash/src/main/res/values-ko/strings.xml
index ecdbd7e00f6..c3b3ce333ea 100644
--- a/components/lib/crash/src/main/res/values-ko/strings.xml
+++ b/components/lib/crash/src/main/res/values-ko/strings.xml
@@ -24,6 +24,9 @@
     <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
     <string name="mozac_lib_send_crash_report_in_progress">%1$s에 충돌 보고서 보내기</string>
 
+    <!-- Label of notification showing that the crash handling service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_data_in_progress">충돌 데이터 수집 중</string>
+
     <!-- Label of notification showing that the telemetry service is gathering the crash data. -->
     <string name="mozac_lib_gathering_crash_telemetry_in_progress">충돌 원격 분석 데이터 수집 중</string>
 
diff --git a/components/lib/crash/src/main/res/values-nb-rNO/strings.xml b/components/lib/crash/src/main/res/values-nb-rNO/strings.xml
index 4e4e2fcc293..12f4477c51d 100644
--- a/components/lib/crash/src/main/res/values-nb-rNO/strings.xml
+++ b/components/lib/crash/src/main/res/values-nb-rNO/strings.xml
@@ -24,6 +24,9 @@
     <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
     <string name="mozac_lib_send_crash_report_in_progress">Sender krasjrapport til %1$s</string>
 
+    <!-- Label of notification showing that the crash handling service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_data_in_progress">Samler inn krasjdata</string>
+
     <!-- Label of notification showing that the telemetry service is gathering the crash data. -->
     <string name="mozac_lib_gathering_crash_telemetry_in_progress">Samler krasj-telemetridata</string>
 
diff --git a/components/lib/crash/src/main/res/values-nn-rNO/strings.xml b/components/lib/crash/src/main/res/values-nn-rNO/strings.xml
index 41b034efaaa..7406570a665 100644
--- a/components/lib/crash/src/main/res/values-nn-rNO/strings.xml
+++ b/components/lib/crash/src/main/res/values-nn-rNO/strings.xml
@@ -24,6 +24,9 @@
     <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
     <string name="mozac_lib_send_crash_report_in_progress">Sender krasjrapport til %1$s</string>
 
+    <!-- Label of notification showing that the crash handling service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_data_in_progress">Samlar inn krasjdata</string>
+
     <!-- Label of notification showing that the telemetry service is gathering the crash data. -->
     <string name="mozac_lib_gathering_crash_telemetry_in_progress">Samlar krasj-telemetridata</string>
 
diff --git a/components/lib/crash/src/main/res/values-oc/strings.xml b/components/lib/crash/src/main/res/values-oc/strings.xml
index 54398d85144..58f48f7a0ce 100644
--- a/components/lib/crash/src/main/res/values-oc/strings.xml
+++ b/components/lib/crash/src/main/res/values-oc/strings.xml
@@ -25,6 +25,9 @@
     <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
     <string name="mozac_lib_send_crash_report_in_progress">Mandadís del rapòrt de plantatge a %1$s</string>
 
+    <!-- Label of notification showing that the crash handling service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_data_in_progress">Amassada de las donadas de plantatge</string>
+
     <!-- Label of notification showing that the telemetry service is gathering the crash data. -->
     <string name="mozac_lib_gathering_crash_telemetry_in_progress">Amassada de las donadas de telemetria de plantatge</string>
 
diff --git a/components/lib/crash/src/main/res/values-pa-rIN/strings.xml b/components/lib/crash/src/main/res/values-pa-rIN/strings.xml
index 88e31f68b1d..39b371daa13 100644
--- a/components/lib/crash/src/main/res/values-pa-rIN/strings.xml
+++ b/components/lib/crash/src/main/res/values-pa-rIN/strings.xml
@@ -25,6 +25,9 @@
     <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
     <string name="mozac_lib_send_crash_report_in_progress">ਕਰੈਸ਼ ਰਿਪੋਰਟ %1$s ਨੂੰ ਭੇਜੀ ਜਾ ਰਹੀ ਹੈ</string>
 
+    <!-- Label of notification showing that the crash handling service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_data_in_progress">ਕਰੈਸ਼ ਸੰਬੰਧੀ ਡਾਟੇ ਨੂੰ ਇਕੱਤਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ</string>
+
     <!-- Label of notification showing that the telemetry service is gathering the crash data. -->
     <string name="mozac_lib_gathering_crash_telemetry_in_progress">ਕਰੈਸ਼ ਟੈਲੀਮੈਂਟਰੀ ਡਾਟਾ ਇਕੱਤਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ</string>
 
diff --git a/components/lib/crash/src/main/res/values-pt-rBR/strings.xml b/components/lib/crash/src/main/res/values-pt-rBR/strings.xml
index ee67527c10f..9da369c1661 100644
--- a/components/lib/crash/src/main/res/values-pt-rBR/strings.xml
+++ b/components/lib/crash/src/main/res/values-pt-rBR/strings.xml
@@ -24,6 +24,9 @@
     <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
     <string name="mozac_lib_send_crash_report_in_progress">Enviando relatório de travamento para a %1$s</string>
 
+    <!-- Label of notification showing that the crash handling service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_data_in_progress">Coletando dados de falha</string>
+
     <!-- Label of notification showing that the telemetry service is gathering the crash data. -->
     <string name="mozac_lib_gathering_crash_telemetry_in_progress">Recolhendo dados de telemetria de travamentos</string>
 
diff --git a/components/lib/crash/src/main/res/values-ru/strings.xml b/components/lib/crash/src/main/res/values-ru/strings.xml
index fb564a37b85..e99e7015eaf 100644
--- a/components/lib/crash/src/main/res/values-ru/strings.xml
+++ b/components/lib/crash/src/main/res/values-ru/strings.xml
@@ -24,6 +24,9 @@
     <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
     <string name="mozac_lib_send_crash_report_in_progress">Сообщение о падении отправляется в %1$s</string>
 
+    <!-- Label of notification showing that the crash handling service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_data_in_progress">Сбор данных о падении</string>
+
     <!-- Label of notification showing that the telemetry service is gathering the crash data. -->
     <string name="mozac_lib_gathering_crash_telemetry_in_progress">Сбор данных телеметрии о падениях</string>
 
diff --git a/components/lib/crash/src/main/res/values-sk/strings.xml b/components/lib/crash/src/main/res/values-sk/strings.xml
index afbe12006f1..2d35f006a0e 100644
--- a/components/lib/crash/src/main/res/values-sk/strings.xml
+++ b/components/lib/crash/src/main/res/values-sk/strings.xml
@@ -24,6 +24,9 @@
     <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
     <string name="mozac_lib_send_crash_report_in_progress">Odosielanie správy o zlyhaní spoločnosti %1$s</string>
 
+    <!-- Label of notification showing that the crash handling service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_data_in_progress">Zhromažďujú sa údaje o zlyhaní</string>
+
     <!-- Label of notification showing that the telemetry service is gathering the crash data. -->
     <string name="mozac_lib_gathering_crash_telemetry_in_progress">Zhromažďujú sa telemetrické údaje o zlyhaní</string>
 
diff --git a/components/lib/crash/src/main/res/values-sv-rSE/strings.xml b/components/lib/crash/src/main/res/values-sv-rSE/strings.xml
index b65cf8a6108..a4c7ed95112 100644
--- a/components/lib/crash/src/main/res/values-sv-rSE/strings.xml
+++ b/components/lib/crash/src/main/res/values-sv-rSE/strings.xml
@@ -25,6 +25,9 @@
     <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
     <string name="mozac_lib_send_crash_report_in_progress">Skicka kraschrapport till %1$s</string>
 
+    <!-- Label of notification showing that the crash handling service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_data_in_progress">Samlar in kraschdata</string>
+
     <!-- Label of notification showing that the telemetry service is gathering the crash data. -->
     <string name="mozac_lib_gathering_crash_telemetry_in_progress">Samlar in krasch-telemetridata</string>
 
diff --git a/components/lib/crash/src/main/res/values-tg/strings.xml b/components/lib/crash/src/main/res/values-tg/strings.xml
index c003cd24439..ed7ddd9b30d 100644
--- a/components/lib/crash/src/main/res/values-tg/strings.xml
+++ b/components/lib/crash/src/main/res/values-tg/strings.xml
@@ -24,6 +24,9 @@
     <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
     <string name="mozac_lib_send_crash_report_in_progress">Гузориш дар бораи вайронӣ ба %1$s фиристода шуда истодааст</string>
 
+    <!-- Label of notification showing that the crash handling service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_data_in_progress">Ҷамъоварии маълумот дар бораи вайрониҳо</string>
+
     <!-- Label of notification showing that the telemetry service is gathering the crash data. -->
     <string name="mozac_lib_gathering_crash_telemetry_in_progress">Ҷамъоварии маълумот дар бораи вайрониҳои дурсанҷӣ (телеметрия)</string>
 
diff --git a/components/lib/crash/src/main/res/values-th/strings.xml b/components/lib/crash/src/main/res/values-th/strings.xml
index 2150643b3df..f32997c9b7d 100644
--- a/components/lib/crash/src/main/res/values-th/strings.xml
+++ b/components/lib/crash/src/main/res/values-th/strings.xml
@@ -24,6 +24,9 @@
     <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
     <string name="mozac_lib_send_crash_report_in_progress">กำลังส่งรายงานข้อขัดข้องไปยัง %1$s</string>
 
+    <!-- Label of notification showing that the crash handling service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_data_in_progress">กำลังรวบรวมข้อมูลข้อขัดข้อง</string>
+
     <!-- Title of the activity that shows the list of past crashes (similar to about:crashes)-->
     <string name="mozac_lib_crash_activity_title">รายงานข้อขัดข้อง</string>
 
diff --git a/components/lib/crash/src/main/res/values-tr/strings.xml b/components/lib/crash/src/main/res/values-tr/strings.xml
index 55e785bcc1f..c4b923ffb7f 100644
--- a/components/lib/crash/src/main/res/values-tr/strings.xml
+++ b/components/lib/crash/src/main/res/values-tr/strings.xml
@@ -25,6 +25,9 @@
     <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
     <string name="mozac_lib_send_crash_report_in_progress">Çökme raporu %1$s\'ya gönderiliyor</string>
 
+    <!-- Label of notification showing that the crash handling service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_data_in_progress">Çökme verileri toplanıyor</string>
+
     <!-- Label of notification showing that the telemetry service is gathering the crash data. -->
     <string name="mozac_lib_gathering_crash_telemetry_in_progress">Çökme verileri toplanıyor</string>
 
diff --git a/components/lib/crash/src/main/res/values-uk/strings.xml b/components/lib/crash/src/main/res/values-uk/strings.xml
index 4ed57a5f81b..26c3f264f26 100644
--- a/components/lib/crash/src/main/res/values-uk/strings.xml
+++ b/components/lib/crash/src/main/res/values-uk/strings.xml
@@ -24,6 +24,9 @@
     <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
     <string name="mozac_lib_send_crash_report_in_progress">Надсилання звіту про збій до %1$s</string>
 
+    <!-- Label of notification showing that the crash handling service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_data_in_progress">Збір даних про збої</string>
+
     <!-- Label of notification showing that the telemetry service is gathering the crash data. -->
     <string name="mozac_lib_gathering_crash_telemetry_in_progress">Збір даних телеметрії про збої</string>
 
diff --git a/components/lib/crash/src/main/res/values-vi/strings.xml b/components/lib/crash/src/main/res/values-vi/strings.xml
index 3ccd10f9f8b..fe466d3e2e7 100644
--- a/components/lib/crash/src/main/res/values-vi/strings.xml
+++ b/components/lib/crash/src/main/res/values-vi/strings.xml
@@ -24,6 +24,9 @@
     <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
     <string name="mozac_lib_send_crash_report_in_progress">Gửi báo cáo sự cố đến %1$s</string>
 
+    <!-- Label of notification showing that the crash handling service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_data_in_progress">Thu thập dữ liệu sự cố</string>
+
     <!-- Label of notification showing that the telemetry service is gathering the crash data. -->
     <string name="mozac_lib_gathering_crash_telemetry_in_progress">Thu thập dữ liệu đo từ xa của sự cố</string>
 
diff --git a/components/lib/crash/src/main/res/values-yo/strings.xml b/components/lib/crash/src/main/res/values-yo/strings.xml
new file mode 100644
index 00000000000..0676f335e14
--- /dev/null
+++ b/components/lib/crash/src/main/res/values-yo/strings.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Title of the crash reporter dialog. %1$s will be replaced with the name of the app (e.g. Firefox Focus). -->
+    <string name="mozac_lib_crash_dialog_title">Pẹ̀lẹ́. %1$s ní ìṣòro tó sì lulẹ̀.</string>
+
+    <!-- Label of the checkbox for sending crash reports in the crash reporter dialog. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
+    <string name="mozac_lib_crash_dialog_checkbox">Fi àwọn ìròyìn ìjákulẹ̀ ránṣẹ́ sí %1$s</string>
+
+    <!-- Label of the button closing the crash reporter dialog. -->
+    <string name="mozac_lib_crash_dialog_button_close">Padé</string>
+
+    <!-- Label of the button closing the crash reporter dialog and restarting the app. -->
+    <string name="mozac_lib_crash_dialog_button_restart">Tún-un bẹ̀rẹ̀ %1$s</string>
+
+    <!-- Name of the "notification channel" used for displaying a notification when the app crashed and we can't show a prompt. See https://developer.android.com/training/notify-user/channels -->
+    <string name="mozac_lib_crash_channel">Àwọn ìjákulẹ̀</string>
+
+    <!-- Title of the crash reporter notification for background process crashes. %1$s will be replaced with the name of the app (e.g. Firefox Focus). -->
+    <string name="mozac_lib_crash_background_process_notification_title">Pẹ̀lẹ́. Ìṣòrò kan wáyé ní %1$s.</string>
+
+    <!-- Label of a notification action/button that will send the crash report to Mozilla. -->
+    <string name="mozac_lib_crash_notification_action_report">Ìròyìn              </string>
+
+    <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
+    <string name="mozac_lib_send_crash_report_in_progress">Fifi àwọn ìròyìn ìjákulẹ̀ ránṣẹ́ sí %1$s</string>
+
+    <!-- Label of notification showing that the crash handling service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_data_in_progress">Kíkó àwọn dátà tó ti ní ìjákulẹ̀ pọ̀</string>
+
+    <!-- Label of notification showing that the telemetry service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_telemetry_in_progress">Kíkó àwọn dátà tẹlímẹ́tírì tó ti ní ìjákulẹ̀ pọ̀</string>
+
+    <!-- Title of the activity that shows the list of past crashes (similar to about:crashes)-->
+    <string name="mozac_lib_crash_activity_title">Àwọn ìròyìn ìjákulẹ̀</string>
+
+    <!-- Text shown instead of crash list if no crashes have been submitted yet -->
+    <string name="mozac_lib_crash_no_crashes">Kò sí àwọn ìròyìn ìjákulẹ̀ tí a ti fi sílẹ̀.</string>
+
+    <!-- Text link that will show an app chooser to share a crash report with a third-party app (e.g. gmail) -->
+    <string name="mozac_lib_crash_share">Pín</string>
+</resources>
diff --git a/components/lib/crash/src/main/res/values-zh-rTW/strings.xml b/components/lib/crash/src/main/res/values-zh-rTW/strings.xml
index d5558cf3cd9..21177e0a22f 100644
--- a/components/lib/crash/src/main/res/values-zh-rTW/strings.xml
+++ b/components/lib/crash/src/main/res/values-zh-rTW/strings.xml
@@ -24,6 +24,9 @@
     <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
     <string name="mozac_lib_send_crash_report_in_progress">正在傳送錯誤報告給 %1$s</string>
 
+    <!-- Label of notification showing that the crash handling service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_data_in_progress">收集錯誤資料</string>
+
     <!-- Label of notification showing that the telemetry service is gathering the crash data. -->
     <string name="mozac_lib_gathering_crash_telemetry_in_progress">正在取得發生錯誤的 telemetry 資料</string>
 
diff --git a/components/lib/crash/src/main/res/values/strings.xml b/components/lib/crash/src/main/res/values/strings.xml
index 8b372a8ceb8..c0403c6995a 100644
--- a/components/lib/crash/src/main/res/values/strings.xml
+++ b/components/lib/crash/src/main/res/values/strings.xml
@@ -27,6 +27,9 @@
     <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
     <string name="mozac_lib_send_crash_report_in_progress">Sending crash report to %1$s</string>
 
+    <!-- Label of notification showing that the crash handling service is gathering the crash data. -->
+    <string name="mozac_lib_gathering_crash_data_in_progress">Gathering crash data</string>
+
     <!-- Label of notification showing that the telemetry service is gathering the crash data. -->
     <string name="mozac_lib_gathering_crash_telemetry_in_progress">Gathering crash telemetry data</string>
 
diff --git a/components/lib/crash/src/test/java/mozilla/components/lib/crash/prompt/CrashReporterActivityTest.kt b/components/lib/crash/src/test/java/mozilla/components/lib/crash/prompt/CrashReporterActivityTest.kt
index f5e5a120ae6..1800518cd9c 100644
--- a/components/lib/crash/src/test/java/mozilla/components/lib/crash/prompt/CrashReporterActivityTest.kt
+++ b/components/lib/crash/src/test/java/mozilla/components/lib/crash/prompt/CrashReporterActivityTest.kt
@@ -196,6 +196,31 @@ class CrashReporterActivityTest {
             assertEquals(activity.restartButton.visibility, View.GONE)
         }
     }
+
+    @Test
+    fun `WHEN crash is native AND background child THEN is background returns true`() = runTestOnMain {
+        CrashReporter(
+            context = testContext,
+            shouldPrompt = CrashReporter.Prompt.ALWAYS,
+            services = listOf(service),
+            scope = scope
+        ).install(testContext)
+
+        val crash = Crash.NativeCodeCrash(
+            123,
+            "",
+            true,
+            "",
+            Crash.NativeCodeCrash.PROCESS_TYPE_BACKGROUND_CHILD,
+            arrayListOf()
+        )
+
+        val scenario = coroutineContext.launchActivityWithCrash(crash)
+
+        scenario.onActivity { activity ->
+            assert(activity.isRecoverableBackgroundCrash(crash))
+        }
+    }
 }
 
 /**
diff --git a/components/service/nimbus/src/main/res/values-yo/strings.xml b/components/service/nimbus/src/main/res/values-yo/strings.xml
new file mode 100644
index 00000000000..3ae1b05c962
--- /dev/null
+++ b/components/service/nimbus/src/main/res/values-yo/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Text displayed when there are no experiments to be shown -->
+    <string name="mozac_service_nimbus_no_experiments">Kò sí ìṣàyẹ̀wò níbí</string>
+</resources>
diff --git a/components/support/base/src/main/res/values-yo/strings.xml b/components/support/base/src/main/res/values-yo/strings.xml
new file mode 100644
index 00000000000..55dc8e49db6
--- /dev/null
+++ b/components/support/base/src/main/res/values-yo/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Text for the positive action button, that will take the user to the settings page -->
+    <string name="mozac_support_base_permissions_needed_positive_button">Lọ sí àwọn ètò</string>
+    <!-- Text for the negative action button to dismiss the dialog. -->
+    <string name="mozac_support_base_permissions_needed_negative_button">Yọ ọ́ kúrò</string>
+</resources>
diff --git a/components/support/ktx/src/main/java/mozilla/components/support/ktx/android/view/Activity.kt b/components/support/ktx/src/main/java/mozilla/components/support/ktx/android/view/Activity.kt
index 31c47a38a76..6348ea5166f 100644
--- a/components/support/ktx/src/main/java/mozilla/components/support/ktx/android/view/Activity.kt
+++ b/components/support/ktx/src/main/java/mozilla/components/support/ktx/android/view/Activity.kt
@@ -6,7 +6,6 @@ package mozilla.components.support.ktx.android.view
 
 import android.app.Activity
 import android.view.View
-import android.view.WindowManager
 import androidx.annotation.VisibleForTesting
 import androidx.core.view.ViewCompat
 import androidx.core.view.ViewCompat.onApplyWindowInsets
@@ -21,7 +20,7 @@ import mozilla.components.support.base.log.logger.Logger
  * - a system visibility listener: [View.OnSystemUiVisibilityChangeListener] for below APIs.
  *
  * to restore immersive mode if interactions with various other widgets like the keyboard or dialogs
- * got the activity out of immersive mode without [exitImmersiveModeIfNeeded] being called.
+ * got the activity out of immersive mode without [exitImmersiveMode] being called.
  */
 fun Activity.enterToImmersiveMode() {
     setAsImmersive()
@@ -30,7 +29,6 @@ fun Activity.enterToImmersiveMode() {
 
 @VisibleForTesting
 internal fun Activity.setAsImmersive() {
-    window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
     window.getWindowInsetsController().apply {
         hide(WindowInsetsCompat.Type.systemBars())
         systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
@@ -57,15 +55,9 @@ internal fun Activity.enableImmersiveModeRestore() {
 /**
  * Attempts to come out from immersive mode.
  */
-fun Activity.exitImmersiveModeIfNeeded() {
-    if (WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON and window.attributes.flags == 0) {
-        // We left immersive mode already.
-        return
-    }
-
+fun Activity.exitImmersiveMode() {
     ViewCompat.setOnApplyWindowInsetsListener(window.decorView, null)
 
-    window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
     window.getWindowInsetsController().apply {
         show(WindowInsetsCompat.Type.systemBars())
     }
diff --git a/components/support/ktx/src/main/res/values-yo/strings.xml b/components/support/ktx/src/main/res/values-yo/strings.xml
new file mode 100644
index 00000000000..3014483150f
--- /dev/null
+++ b/components/support/ktx/src/main/res/values-yo/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Text displayed when choosing which app to call with after selecting a phone number-->
+    <string name="mozac_support_ktx_menu_call_with">Pè pẹ̀lú…</string>
+    <!-- Text displayed when choosing which app to email with after selecting an email address-->
+    <string name="mozac_support_ktx_menu_email_with">Ímeelì pẹ̀lú…</string>
+    <string name="mozac_support_ktx_menu_share_with">Pín-in pẹ̀lú…</string>
+    <string name="mozac_support_ktx_share_dialog_title">Pín-in nípasẹ̀</string>
+</resources>
diff --git a/components/support/ktx/src/test/java/mozilla/components/support/ktx/android/view/ActivityTest.kt b/components/support/ktx/src/test/java/mozilla/components/support/ktx/android/view/ActivityTest.kt
index 3e2bd91fd2f..e4997d9bcb5 100644
--- a/components/support/ktx/src/test/java/mozilla/components/support/ktx/android/view/ActivityTest.kt
+++ b/components/support/ktx/src/test/java/mozilla/components/support/ktx/android/view/ActivityTest.kt
@@ -9,7 +9,6 @@ import android.view.View
 import android.view.ViewTreeObserver
 import android.view.Window
 import android.view.WindowInsets
-import android.view.WindowManager
 import androidx.core.view.WindowInsetsCompat
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import mozilla.components.support.test.any
@@ -21,7 +20,6 @@ import org.junit.runner.RunWith
 import org.mockito.Mockito.`when`
 import org.mockito.Mockito.anyInt
 import org.mockito.Mockito.doReturn
-import org.mockito.Mockito.mock
 import org.mockito.Mockito.never
 import org.mockito.Mockito.times
 import org.mockito.Mockito.verify
@@ -59,7 +57,6 @@ class ActivityTest {
         activity.enterToImmersiveMode()
 
         // verify entering immersive mode
-        verify(window).addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
         verify(decorView).systemUiVisibility = View.SYSTEM_UI_FLAG_FULLSCREEN
         verify(decorView).systemUiVisibility = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
         // verify that the immersive mode restoration is set as expected
@@ -70,7 +67,6 @@ class ActivityTest {
     fun `check setAsImmersive sets the correct flags`() {
         activity.setAsImmersive()
 
-        verify(window).addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
         verify(decorView).systemUiVisibility = View.SYSTEM_UI_FLAG_FULLSCREEN
         verify(decorView).systemUiVisibility = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
         verify(window.decorView, never()).setOnSystemUiVisibilityChangeListener(any())
@@ -95,7 +91,6 @@ class ActivityTest {
         insetListenerCaptor.value.onApplyWindowInsets(window.decorView, windowInsets)
 
         // Cannot test if "setAsImmersive()" was called it being an extension function but we can check the effect of that call.
-        verify(window).addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
         verify(decorView).systemUiVisibility = View.SYSTEM_UI_FLAG_FULLSCREEN
         verify(decorView).systemUiVisibility = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
     }
@@ -118,39 +113,16 @@ class ActivityTest {
     }
 
     @Test
-    fun `check exitImmersiveModeIfNeeded sets the correct flags`() {
-        val attributes = mock(WindowManager.LayoutParams::class.java)
-        `when`(window.attributes).thenReturn(attributes)
-        attributes.flags = 0
+    fun `check exitImmersiveMode sets the correct flags`() {
+        activity.exitImmersiveMode()
 
-        activity.exitImmersiveModeIfNeeded()
-
-        verify(window, never()).clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
-        verify(decorView, never()).systemUiVisibility = View.SYSTEM_UI_FLAG_FULLSCREEN.inv()
-        verify(decorView, never()).systemUiVisibility = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION.inv()
-        verify(decorView, never()).setOnApplyWindowInsetsListener(null)
-
-        attributes.flags = WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
-
-        activity.exitImmersiveModeIfNeeded()
-
-        verify(window).clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
         verify(decorView, times(2)).systemUiVisibility = View.SYSTEM_UI_FLAG_VISIBLE
         verify(decorView).setOnApplyWindowInsetsListener(null)
     }
 
     @Test
-    fun `check exitImmersiveModeIfNeeded correctly cleanups the insets listeners`() {
-        val attributes = mock(WindowManager.LayoutParams::class.java)
-        `when`(window.attributes).thenReturn(attributes)
-        attributes.flags = 0
-
-        activity.exitImmersiveModeIfNeeded()
-
-        verify(decorView, never()).setOnApplyWindowInsetsListener(null)
-
-        attributes.flags = WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
-        activity.exitImmersiveModeIfNeeded()
+    fun `check exitImmersiveMode correctly cleanups the insets listeners`() {
+        activity.exitImmersiveMode()
 
         verify(decorView).setOnApplyWindowInsetsListener(null)
     }
diff --git a/components/support/migration/src/main/res/values-yo/strings.xml b/components/support/migration/src/main/res/values-yo/strings.xml
new file mode 100644
index 00000000000..ac1de43ef3c
--- /dev/null
+++ b/components/support/migration/src/main/res/values-yo/strings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Title of the notification shown while we upgrade Fennec to Fenix. -->
+    <string name="mozac_support_migration_ongoing_notification_title">Ìsọdọ̀tun ń lọ lọ́wọ́</string>
+    <!-- Text of the notification shown while we upgrade Fennec to Fenix. -->
+    <string name="mozac_support_migration_ongoing_notification_text">Firefox yóò ṣetán láìpẹ́…</string>
+    <!-- Title of the notification shown the upgrade from Fennec to Fenix is complete. -->
+    <string name="mozac_support_migration_complete_notification_title">Ìsọdọ̀tun ti parí</string>
+    <!-- Text of the notification shown the upgrade from Fennec to Fenix is complete. -->
+    <string name="mozac_support_migration_complete_notification_text">Wọ́n ti sọ Firefox dọ̀tun - àti ó ti ní ìlọsíwájú!</string>
+</resources>
diff --git a/components/ui/tabcounter/src/main/res/values-yo/strings.xml b/components/ui/tabcounter/src/main/res/values-yo/strings.xml
new file mode 100644
index 00000000000..13d72778f60
--- /dev/null
+++ b/components/ui/tabcounter/src/main/res/values-yo/strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Message announced to the user when tab tray is selected with 1 tab -->
+    <string name="mozac_tab_counter_open_tab_tray_single">1 sí táàbù. Tẹ̀ ẹ́ láti bọ́ sí àwọn táàbù.</string>
+    <!-- Message announced to the user when tab tray is selected with multiple tabs -->
+    <string name="mozac_tab_counter_open_tab_tray_plural">%1$s sí táàbù. Tẹ̀ ẹ́ láti bọ́ sí àwọn táàbù.</string>
+    <!-- Browser menu button that creates a new tab -->
+    <string name="mozac_browser_menu_new_tab">Táàbù tuntun</string>
+    <!-- Browser menu button that creates a private tab -->
+    <string name="mozac_browser_menu_new_private_tab">Táàbù ìkọ̀kọ̀ tuntun</string>
+    <!-- Browser menu button to close tab. Closes the current session when pressed. -->
+    <string name="mozac_close_tab">Pa táàbù dé</string>
+    <!-- Menu option to duplicate the current tab -->
+    <string name="mozac_ui_tabcounter_duplicate_tab">Ẹ̀dà táàbù</string>
+    <!-- Content description of the tab counter toolbar button -->
+    <string name="mozac_tab_counter_content_description">Táàbù náà rí bọ́tìnì irinṣé.</string>
+</resources>
diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
index 0f50adc2898..4ae380cf2ca 100644
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@@ -242,7 +242,7 @@ GEM
     thread_safe (0.3.6)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    tzinfo (1.2.7)
+    tzinfo (1.2.10)
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
diff --git a/docs/changelog.md b/docs/changelog.md
index d3bb87452b3..47a0e2207a0 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -11,6 +11,9 @@ permalink: /changelog/
 * [Gecko](https://github.com/mozilla-mobile/android-components/blob/main/buildSrc/src/main/java/Gecko.kt)
 * [Configuration](https://github.com/mozilla-mobile/android-components/blob/main/.config.yml)
 
+* **feature-prompts**:
+  * Added prompt dismiss listener to `ChoicePromptDelegate`. [#12562](https://github.com/mozilla-mobile/android-components/issues/12562)
+
 * **browser-storage-sync**:
   * Stop reporting to the crash servers the expected `OperationInterrupted` exceptions for when interrupting in progress reads/writes from Application-Services. [#12557](https://github.com/mozilla-mobile/android-components/issues/12557), [#12569](https://github.com/mozilla-mobile/android-components/issues/12569).
 
diff --git a/docs/contribute/release_checklist.md b/docs/contribute/release_checklist.md
index c00baebc1b8..033c59c8fef 100644
--- a/docs/contribute/release_checklist.md
+++ b/docs/contribute/release_checklist.md
@@ -8,11 +8,12 @@ These are instructions for preparing a release branch for Android Components and
 
 ## [Release Management] Creating a new Beta release branch
 
-**This part is 100% covered by the Release Management team. Please do not handle it anymore.**
+**This part is 100% covered by the Release Management team. The dev team should not perform these steps.**
 
 1. Create a branch name with the format `releases/[beta_version].0` off of the `main` branch (for example, `releases/98.0`) through the GitHub UI.
 `[beta_version]` should follow the Firefox Beta release number. See [Firefox Release Calendar](https://wiki.mozilla.org/Release_Management/Calendar).
-2. In [Gecko.kt](https://github.com/mozilla-mobile/android-components/blob/main/buildSrc/src/main/java/Gecko.kt):
+2. Notify the dev team that they can start the new Nightly development cycle per the steps given in the next section ⬇️
+3. In [Gecko.kt](https://github.com/mozilla-mobile/android-components/blob/main/buildSrc/src/main/java/Gecko.kt):
    - Set the `channel` to `val channel = GeckoChannel.BETA`.
 
     ```diff
@@ -30,11 +31,17 @@ These are instructions for preparing a release branch for Android Components and
 
     /**
     ```
-3. Create a commit and pull request named `Switch to GeckoView Beta` for this change. The pull request should be committed into the `releases/[beta_version].0` branch. Land the pull request. This will create busted builds which are expected. The next step should green it up.
-4. Let the Github Action bump the geckoview version like in [#12485](https://github.com/mozilla-mobile/android-components/pull/12485).
-5. Once both pull requests are landed, go to [Shipit](https://shipit.mozilla-releng.net/) and kick off a new release.
-6. After 30-60 minutes, follow up to see if a `[beta_version].0.0` build is available in one of the AC components on [maven/components](https://maven.mozilla.org/?prefix=maven2/org/mozilla/components/).
-7. Tell the dev team they can handle the changes down below ⬇️
+4. Create a commit named `Switch to GeckoView Beta` for this change. This change can either be directly committed to the newly-created `releases/[beta_version].0` branch or a pull request can be created against it and then merged. Once landed, it is expected that this will create busted builds. The next step should green it up.
+5. The Github Action will automatically bump the GeckoView version once the new Beta build is created and uploaded to Maven, as shown in [#12547](https://github.com/mozilla-mobile/android-components/pull/12547) for example.
+6. Once both of the above commits have landed, create a new AC release in [Ship-It](https://shipit.mozilla-releng.net/) per normal practice.
+7. When the release automation completes, a new `v[beta_version].0.0` release tag will be created in Github.
+   - Following the template below, update the description with the release notes URL, commit range, and milestone like shown in [v104.0.0](https://github.com/mozilla-mobile/android-components/releases/tag/v104.0.0) and click `Update release` when ready.
+
+    ```
+    * [Release notes](https://mozac.org/changelog/#9800)
+    * [Commits](https://github.com/mozilla-mobile/android-components/compare/v97.0.0...v98.0.0)
+    * [Milestone](https://github.com/mozilla-mobile/android-components/milestone/145?closed=1)
+    ```
 
 ## [Dev team] Starting the next Nightly development cycle
 
@@ -90,7 +97,7 @@ These are instructions for preparing a release branch for Android Components and
 5. Create a pull request with these 2 commits and land.
   - If this is landed after the scheduled [cron task](https://github.com/mozilla-mobile/android-components/blob/main/.cron.yml#L13) that will build and bump AC automatically, trigger a manual AC build through the [hook](https://firefox-ci-tc.services.mozilla.com/hooks/project-releng/cron-task-mozilla-mobile-android-components%2Fnightly). At time of writing, the morning cron task is schedule to run at 14:30 UTC (9:30AM EST).
   - When the manual AC build is complete, trigger the [hook](https://firefox-ci-tc.services.mozilla.com/hooks/project-releng/cron-task-mozilla-mobile-fenix%2Fbump-android-components) to bump AC in Fenix.
-6. After an hour, follow up by checking if a new `[nightly_version]` AC build is available in [nightly.maven/components](https://nightly.maven.mozilla.org/?prefix=maven2/org/mozilla/components/). Fenix will automatically receive the Nightly AC bump.
+6. After an hour, follow up by checking if a new `[nightly_version]` AC build is available in [nightly.maven/components](https://nightly.maven.mozilla.org/?prefix=maven2/org/mozilla/components/). Fenix and Focus will automatically receive the Nightly AC bump.
 
 See [https://github.com/mozilla-mobile/android-components/pull/11519](https://github.com/mozilla-mobile/android-components/pull/11519) for an example.
 
diff --git a/samples/browser/src/main/java/org/mozilla/samples/browser/BrowserFragment.kt b/samples/browser/src/main/java/org/mozilla/samples/browser/BrowserFragment.kt
index 8148b14be0f..09d021e55dc 100644
--- a/samples/browser/src/main/java/org/mozilla/samples/browser/BrowserFragment.kt
+++ b/samples/browser/src/main/java/org/mozilla/samples/browser/BrowserFragment.kt
@@ -21,7 +21,7 @@ import mozilla.components.feature.toolbar.WebExtensionToolbarFeature
 import mozilla.components.support.base.feature.UserInteractionHandler
 import mozilla.components.support.base.feature.ViewBoundFeatureWrapper
 import mozilla.components.support.ktx.android.view.enterToImmersiveMode
-import mozilla.components.support.ktx.android.view.exitImmersiveModeIfNeeded
+import mozilla.components.support.ktx.android.view.exitImmersiveMode
 import org.mozilla.samples.browser.ext.components
 import org.mozilla.samples.browser.integration.ReaderViewIntegration
 
@@ -111,7 +111,7 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
                 if (inFullScreen) {
                     activity?.enterToImmersiveMode()
                 } else {
-                    activity?.exitImmersiveModeIfNeeded()
+                    activity?.exitImmersiveMode()
                 }
             },
             owner = this,