diff --git a/app/src/androidTest/java/org/mozilla/fenix/glean/BaselinePingTest.kt b/app/src/androidTest/java/org/mozilla/fenix/glean/BaselinePingTest.kt
index cf545f0b3..614fd1794 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/glean/BaselinePingTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/glean/BaselinePingTest.kt
@@ -4,16 +4,13 @@
 
 package org.mozilla.fenix.glean
 
+import android.content.Context
 import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.ActivityTestRule
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.junit.Assert.assertEquals
-
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
 import androidx.test.uiautomator.UiDevice
+import androidx.test.uiautomator.UiSelector
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
@@ -21,10 +18,14 @@ import mozilla.components.service.glean.Glean
 import mozilla.components.service.glean.config.Configuration
 import mozilla.components.service.glean.testing.GleanTestLocalServer
 import org.json.JSONObject
-import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
+import org.junit.Assert.assertFalse
 import org.junit.BeforeClass
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
 import org.mozilla.fenix.HomeActivity
+import org.mozilla.fenix.R
 import org.mozilla.fenix.helpers.HomeActivityTestRule
 import org.mozilla.fenix.helpers.MockWebServerHelper
 import java.util.concurrent.TimeUnit
@@ -56,8 +57,17 @@ class BaselinePingTest {
         }
     }
 
+    /**
+     * Wait for a specific ping to be received by the local server and
+     * return its parsed JSON content.
+     *
+     * @param pingName the name of the ping to wait for
+     * @param pingReason the value of the `reason` field for the received ping
+     * @param maxAttempts how many times should a wait be attempted
+     */
     private fun waitForPingContent(
         pingName: String,
+        pingReason: String?,
         maxAttempts: Int = 3
     ): JSONObject? {
         var attempts = 0
@@ -66,7 +76,16 @@ class BaselinePingTest {
             val request = server.takeRequest(20L, TimeUnit.SECONDS)
             val docType = request.path.split("/")[3]
             if (pingName == docType) {
-                return JSONObject(request.body.readUtf8())
+                val parsedPayload = JSONObject(request.body.readUtf8())
+                if (pingReason == null) {
+                    return parsedPayload
+                }
+
+                // If we requested a specific ping reason, look for it.
+                val reason = parsedPayload.getJSONObject("ping_info").getString("reason")
+                if (reason == pingReason) {
+                    return parsedPayload
+                }
             }
         } while (attempts < maxAttempts)
 
@@ -87,9 +106,17 @@ class BaselinePingTest {
         // Move it to background.
         device.pressHome()
 
+        // Due to bug 1632184, we need move the activity to foreground again, in order
+        // for a 'background' ping with reason 'foreground' to be generated and also trigger
+        // sending the ping that was submitted on background. This can go away once bug 1634375
+        // is fixed.
+        device.pressRecentApps()
+        device.findObject(UiSelector().descriptionContains(
+            ApplicationProvider.getApplicationContext<Context>().getString(R.string.app_name)))
+            .click()
+
         // Validate the received data.
-        val baselinePing = waitForPingContent("baseline")!!
-        assertEquals("baseline", baselinePing.getJSONObject("ping_info")["ping_type"])
+        val baselinePing = waitForPingContent("baseline", "background")!!
 
         val metrics = baselinePing.getJSONObject("metrics")
 
diff --git a/app/src/fennecBeta/res/drawable-hdpi/fenix_search_widget.png b/app/src/fennecBeta/res/drawable-hdpi/fenix_search_widget.png
index fc61b67ad..22a4a3fc7 100644
Binary files a/app/src/fennecBeta/res/drawable-hdpi/fenix_search_widget.png and b/app/src/fennecBeta/res/drawable-hdpi/fenix_search_widget.png differ
diff --git a/app/src/fennecBeta/res/mipmap-xhdpi/ic_launcher.png b/app/src/fennecBeta/res/mipmap-xhdpi/ic_launcher.png
index 8f3e8bace..eada33642 100644
Binary files a/app/src/fennecBeta/res/mipmap-xhdpi/ic_launcher.png and b/app/src/fennecBeta/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/drawable-hdpi/fenix_search_widget.png b/app/src/main/res/drawable-hdpi/fenix_search_widget.png
index aa7a12b8e..216234c14 100644
Binary files a/app/src/main/res/drawable-hdpi/fenix_search_widget.png and b/app/src/main/res/drawable-hdpi/fenix_search_widget.png differ
diff --git a/app/src/main/res/drawable-ldrtl-hdpi/onboarding_dark_theme.png b/app/src/main/res/drawable-ldrtl-hdpi/onboarding_dark_theme.png
index dce01c443..349c56c52 100644
Binary files a/app/src/main/res/drawable-ldrtl-hdpi/onboarding_dark_theme.png and b/app/src/main/res/drawable-ldrtl-hdpi/onboarding_dark_theme.png differ
diff --git a/app/src/main/res/drawable-ldrtl-hdpi/onboarding_light_theme.png b/app/src/main/res/drawable-ldrtl-hdpi/onboarding_light_theme.png
index 7fb5ce3bf..e6767b9dd 100644
Binary files a/app/src/main/res/drawable-ldrtl-hdpi/onboarding_light_theme.png and b/app/src/main/res/drawable-ldrtl-hdpi/onboarding_light_theme.png differ
diff --git a/app/src/main/res/drawable-ldrtl-hdpi/onboarding_toolbar_bottom.png b/app/src/main/res/drawable-ldrtl-hdpi/onboarding_toolbar_bottom.png
index 3e943d24c..b3e6f74e7 100644
Binary files a/app/src/main/res/drawable-ldrtl-hdpi/onboarding_toolbar_bottom.png and b/app/src/main/res/drawable-ldrtl-hdpi/onboarding_toolbar_bottom.png differ
diff --git a/app/src/main/res/drawable-ldrtl-hdpi/onboarding_toolbar_top.png b/app/src/main/res/drawable-ldrtl-hdpi/onboarding_toolbar_top.png
index 8d510326a..25588e812 100644
Binary files a/app/src/main/res/drawable-ldrtl-hdpi/onboarding_toolbar_top.png and b/app/src/main/res/drawable-ldrtl-hdpi/onboarding_toolbar_top.png differ
diff --git a/app/src/main/res/drawable-ldrtl-mdpi/onboarding_dark_theme.png b/app/src/main/res/drawable-ldrtl-mdpi/onboarding_dark_theme.png
index 1385eee63..d9a331704 100644
Binary files a/app/src/main/res/drawable-ldrtl-mdpi/onboarding_dark_theme.png and b/app/src/main/res/drawable-ldrtl-mdpi/onboarding_dark_theme.png differ
diff --git a/app/src/main/res/drawable-ldrtl-mdpi/onboarding_toolbar_bottom.png b/app/src/main/res/drawable-ldrtl-mdpi/onboarding_toolbar_bottom.png
index c3aeaa711..acbebc2bd 100644
Binary files a/app/src/main/res/drawable-ldrtl-mdpi/onboarding_toolbar_bottom.png and b/app/src/main/res/drawable-ldrtl-mdpi/onboarding_toolbar_bottom.png differ
diff --git a/app/src/main/res/drawable-ldrtl-mdpi/onboarding_toolbar_top.png b/app/src/main/res/drawable-ldrtl-mdpi/onboarding_toolbar_top.png
index ddb085028..f3031a012 100644
Binary files a/app/src/main/res/drawable-ldrtl-mdpi/onboarding_toolbar_top.png and b/app/src/main/res/drawable-ldrtl-mdpi/onboarding_toolbar_top.png differ
diff --git a/app/src/main/res/drawable-ldrtl-xhdpi/onboarding_dark_theme.png b/app/src/main/res/drawable-ldrtl-xhdpi/onboarding_dark_theme.png
index 105da2ce1..1dc699617 100644
Binary files a/app/src/main/res/drawable-ldrtl-xhdpi/onboarding_dark_theme.png and b/app/src/main/res/drawable-ldrtl-xhdpi/onboarding_dark_theme.png differ
diff --git a/app/src/main/res/drawable-ldrtl-xhdpi/onboarding_light_theme.png b/app/src/main/res/drawable-ldrtl-xhdpi/onboarding_light_theme.png
index 7f12a7559..329046b69 100644
Binary files a/app/src/main/res/drawable-ldrtl-xhdpi/onboarding_light_theme.png and b/app/src/main/res/drawable-ldrtl-xhdpi/onboarding_light_theme.png differ
diff --git a/app/src/main/res/drawable-ldrtl-xhdpi/onboarding_toolbar_bottom.png b/app/src/main/res/drawable-ldrtl-xhdpi/onboarding_toolbar_bottom.png
index 163ad40a5..396b2c085 100644
Binary files a/app/src/main/res/drawable-ldrtl-xhdpi/onboarding_toolbar_bottom.png and b/app/src/main/res/drawable-ldrtl-xhdpi/onboarding_toolbar_bottom.png differ
diff --git a/app/src/main/res/drawable-ldrtl-xhdpi/onboarding_toolbar_top.png b/app/src/main/res/drawable-ldrtl-xhdpi/onboarding_toolbar_top.png
index 3fd8ff5ee..79b27e490 100644
Binary files a/app/src/main/res/drawable-ldrtl-xhdpi/onboarding_toolbar_top.png and b/app/src/main/res/drawable-ldrtl-xhdpi/onboarding_toolbar_top.png differ
diff --git a/app/src/main/res/drawable-ldrtl-xxhdpi/onboarding_toolbar_bottom.png b/app/src/main/res/drawable-ldrtl-xxhdpi/onboarding_toolbar_bottom.png
index d3fad41eb..bad95f884 100644
Binary files a/app/src/main/res/drawable-ldrtl-xxhdpi/onboarding_toolbar_bottom.png and b/app/src/main/res/drawable-ldrtl-xxhdpi/onboarding_toolbar_bottom.png differ
diff --git a/app/src/main/res/drawable-ldrtl-xxhdpi/onboarding_toolbar_top.png b/app/src/main/res/drawable-ldrtl-xxhdpi/onboarding_toolbar_top.png
index 90fe486b0..d3ee39924 100644
Binary files a/app/src/main/res/drawable-ldrtl-xxhdpi/onboarding_toolbar_top.png and b/app/src/main/res/drawable-ldrtl-xxhdpi/onboarding_toolbar_top.png differ
diff --git a/app/src/main/res/drawable-ldrtl-xxxhdpi/onboarding_light_theme.png b/app/src/main/res/drawable-ldrtl-xxxhdpi/onboarding_light_theme.png
index 65c91ec28..341122b6f 100644
Binary files a/app/src/main/res/drawable-ldrtl-xxxhdpi/onboarding_light_theme.png and b/app/src/main/res/drawable-ldrtl-xxxhdpi/onboarding_light_theme.png differ
diff --git a/app/src/main/res/drawable-ldrtl-xxxhdpi/onboarding_toolbar_bottom.png b/app/src/main/res/drawable-ldrtl-xxxhdpi/onboarding_toolbar_bottom.png
index 03c924a97..be7a8e7d0 100644
Binary files a/app/src/main/res/drawable-ldrtl-xxxhdpi/onboarding_toolbar_bottom.png and b/app/src/main/res/drawable-ldrtl-xxxhdpi/onboarding_toolbar_bottom.png differ
diff --git a/app/src/main/res/drawable-ldrtl-xxxhdpi/onboarding_toolbar_top.png b/app/src/main/res/drawable-ldrtl-xxxhdpi/onboarding_toolbar_top.png
index a30e91dee..9559e1975 100644
Binary files a/app/src/main/res/drawable-ldrtl-xxxhdpi/onboarding_toolbar_top.png and b/app/src/main/res/drawable-ldrtl-xxxhdpi/onboarding_toolbar_top.png differ
diff --git a/app/src/main/res/layout/fragment_tab_tray.xml b/app/src/main/res/layout/fragment_tab_tray.xml
index 6e748eb0d..c5573bded 100644
--- a/app/src/main/res/layout/fragment_tab_tray.xml
+++ b/app/src/main/res/layout/fragment_tab_tray.xml
@@ -59,7 +59,7 @@
     <View
         android:id="@+id/tab_tray_controls"
         android:layout_width="0dp"
-        android:layout_height="48dp"
+        android:layout_height="@dimen/browser_toolbar_height"
         android:background="?bottomBarBackground"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -67,23 +67,27 @@
 
     <ImageButton
         android:id="@+id/private_browsing_button"
-        android:layout_width="@dimen/glyph_button_height"
-        android:layout_height="@dimen/glyph_button_height"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginStart="32dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/content_description_private_browsing_button"
         app:srcCompat="@drawable/private_browsing_button"
+        app:layout_constraintHorizontal_chainStyle="spread_inside"
         app:layout_constraintTop_toTopOf="@id/tab_tray_controls"
+        app:layout_constraintDimensionRatio="1.0"
         app:layout_constraintBottom_toBottomOf="@+id/tab_tray_controls"
         app:layout_constraintEnd_toStartOf="@+id/tab_tray_go_home"
         app:layout_constraintStart_toStartOf="@id/tab_tray_controls" />
 
     <ImageButton
         android:id="@+id/tab_tray_go_home"
-        android:layout_width="@dimen/glyph_button_height"
-        android:layout_height="@dimen/glyph_button_height"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/tab_tray_menu_home"
         app:srcCompat="@drawable/ic_home"
+        app:layout_constraintDimensionRatio="1.0"
         app:layout_constraintTop_toTopOf="@id/tab_tray_controls"
         app:layout_constraintBottom_toBottomOf="@+id/tab_tray_controls"
         app:layout_constraintEnd_toStartOf="@+id/tab_tray_open_new_tab"
@@ -91,11 +95,13 @@
 
     <ImageButton
         android:id="@+id/tab_tray_open_new_tab"
-        android:layout_width="@dimen/glyph_button_height"
-        android:layout_height="@dimen/glyph_button_height"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginEnd="32dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/tab_tray_menu_open_new_tab"
         app:srcCompat="@drawable/ic_new"
+        app:layout_constraintDimensionRatio="1.0"
         app:layout_constraintTop_toTopOf="@id/tab_tray_controls"
         app:layout_constraintBottom_toBottomOf="@+id/tab_tray_controls"
         app:layout_constraintEnd_toEndOf="@+id/tab_tray_controls"
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 445e9d9f9..c874e10ed 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -487,6 +487,10 @@
     <string name="history_delete_all">Cancella cronologia</string>
     <!-- Text for the dialog to confirm clearing all history -->
     <string name="history_delete_all_dialog">Cancellare la cronologia?</string>
+    <!-- Text for the snackbar to confirm that multiple browsing history items has been deleted -->
+    <string name="history_delete_multiple_items_snackbar">Cronologia eliminata</string>
+    <!-- Text for the snackbar to confirm that a single browsing history item has been deleted. The first parameter is the shortened URL of the deleted history item. -->
+    <string name="history_delete_single_item_snackbar">%1$s eliminato</string>
     <!-- Text for positive action to delete history in deleting history dialog -->
     <string name="history_clear_dialog">Cancella</string>
     <!-- History overflow menu copy button -->
@@ -543,6 +547,10 @@
     <string name="bookmark_edit">Modifica segnalibro</string>
     <!-- Screen title for selecting a bookmarks folder -->
     <string name="bookmark_select_folder">Seleziona cartella</string>
+    <!-- Confirmation message for a dialog confirming if the user wants to delete the selected folder -->
+    <string name="bookmark_delete_folder_confirmation_dialog">Eliminare questa cartella?</string>
+    <!-- Snackbar title shown after a folder has been deleted. This first parameter is the name of the deleted folder -->
+    <string name="bookmark_delete_folder_snackbar">%1$s eliminata</string>
     <!-- Screen title for adding a bookmarks folder -->
     <string name="bookmark_add_folder">Aggiungi cartella</string>
     <!-- deprecated: Snackbar title shown after a bookmark has been created. -->
@@ -597,7 +605,7 @@
      The first parameter is the host part of the URL of the bookmark deleted, if any -->
     <string name="bookmark_deletion_snackbar_message">Eliminato %1$s</string>
     <!-- Bookmark snackbar message on deleting multiple bookmarks -->
-    <string name="bookmark_deletion_multiple_snackbar_message">Eliminazione dei segnalibri selezionati</string>
+    <string name="bookmark_deletion_multiple_snackbar_message_2">Segnalibri eliminati</string>
     <!-- Bookmark undo button for deletion snackbar action -->
     <string name="bookmark_undo_deletion">ANNULLA</string>
 
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index ea5395ce0..da0e54a41 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -475,6 +475,10 @@
     <!-- Text for the dialog to confirm clearing all history -->
     <string name="history_delete_all_dialog">Ar tikrai norite išvalyti naršymo žurnalą?</string>
 
+    <!-- Text for the snackbar to confirm that multiple browsing history items has been deleted -->
+    <string name="history_delete_multiple_items_snackbar">Žurnalas išvalytas</string>
+    <!-- Text for the snackbar to confirm that a single browsing history item has been deleted. The first parameter is the shortened URL of the deleted history item. -->
+    <string name="history_delete_single_item_snackbar">Pašalinta %1$s</string>
     <!-- Text for positive action to delete history in deleting history dialog -->
     <string name="history_clear_dialog">Išvalyti</string>
     <!-- History overflow menu copy button -->
@@ -530,6 +534,10 @@
     <!-- Screen title for selecting a bookmarks folder -->
     <string name="bookmark_select_folder">Pasirinkite aplanką</string>
 
+    <!-- Confirmation message for a dialog confirming if the user wants to delete the selected folder -->
+    <string name="bookmark_delete_folder_confirmation_dialog">Ar tikrai norite pašalinti šį aplanką?</string>
+    <!-- Snackbar title shown after a folder has been deleted. This first parameter is the name of the deleted folder -->
+    <string name="bookmark_delete_folder_snackbar">Pašalintas „%1$s“</string>
     <!-- Screen title for adding a bookmarks folder -->
     <string name="bookmark_add_folder">Įtraukti aplanką</string>
     <!-- deprecated: Snackbar title shown after a bookmark has been created. -->
@@ -584,7 +592,7 @@
     <string name="bookmark_deletion_snackbar_message">Pašalintas %1$s</string>
 
     <!-- Bookmark snackbar message on deleting multiple bookmarks -->
-    <string name="bookmark_deletion_multiple_snackbar_message">Šalinami pasirinkti įrašai</string>
+    <string name="bookmark_deletion_multiple_snackbar_message_2">Adresyno įrašai pašalinti</string>
     <!-- Bookmark undo button for deletion snackbar action -->
     <string name="bookmark_undo_deletion">Atšaukti</string>
 
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 9a87e61d8..92d6af59e 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -25,6 +25,10 @@
     <!-- Title for private session option -->
     <string name="private_browsing_title">Du er i en privat økt</string>
 
+    <!-- Explanation for private browsing displayed to users on home view when they first enable private mode
+        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
+    <string name="private_browsing_placeholder_description_2">%1$s fjerner søk- og nettleserhistorikken fra private nettlesingsfaner når du lukker dem eller avslutter appen. Selv om dette ikke gjør deg anonym for nettsteder eller internett-leverandøren din, vil det gjøre det lettere
+        å beholde det du gjør på nettet privat fra alle andre som bruker denne enheten.</string>
     <string name="private_browsing_common_myths">Vanlige myter om privat nettlesing</string>
     <!-- Delete session button to erase your history in a private session -->
     <string name="private_browsing_delete_session">Slett økt</string>
@@ -474,6 +478,10 @@
     <string name="history_delete_all">Slett historikk</string>
     <!-- Text for the dialog to confirm clearing all history -->
     <string name="history_delete_all_dialog">Er du sikker på at du vil tømme historikken din?</string>
+    <!-- Text for the snackbar to confirm that multiple browsing history items has been deleted -->
+    <string name="history_delete_multiple_items_snackbar">Historikk slettet</string>
+    <!-- Text for the snackbar to confirm that a single browsing history item has been deleted. The first parameter is the shortened URL of the deleted history item. -->
+    <string name="history_delete_single_item_snackbar">Slettet %1$s</string>
     <!-- Text for positive action to delete history in deleting history dialog -->
     <string name="history_clear_dialog">Tøm</string>
     <!-- History overflow menu copy button -->
@@ -529,6 +537,10 @@
     <string name="bookmark_edit">Rediger bokmerke</string>
     <!-- Screen title for selecting a bookmarks folder -->
     <string name="bookmark_select_folder">Velg mappe</string>
+    <!-- Confirmation message for a dialog confirming if the user wants to delete the selected folder -->
+    <string name="bookmark_delete_folder_confirmation_dialog">Er du sikker på at du vil slette denne mappen?</string>
+    <!-- Snackbar title shown after a folder has been deleted. This first parameter is the name of the deleted folder -->
+    <string name="bookmark_delete_folder_snackbar">Slettet %1$s</string>
     <!-- Screen title for adding a bookmarks folder -->
     <string name="bookmark_add_folder">Legg til mappe</string>
     <!-- deprecated: Snackbar title shown after a bookmark has been created. -->
@@ -582,6 +594,8 @@
      The first parameter is the host part of the URL of the bookmark deleted, if any -->
     <string name="bookmark_deletion_snackbar_message">Slettet %1$s</string>
 
+    <!-- Bookmark snackbar message on deleting multiple bookmarks -->
+    <string name="bookmark_deletion_multiple_snackbar_message_2">Bokmerker slettet</string>
     <!-- Bookmark undo button for deletion snackbar action -->
     <string name="bookmark_undo_deletion">ANGRE</string>
 
@@ -859,6 +873,9 @@
     <!-- text for firefox preview moving tip header "Firefox Preview" and "Firefox Nightly" are intentionally hardcoded -->
     <string name="tip_firefox_preview_moved_header">Firefox Preview er nå Firefox Nightly</string>
 
+    <!-- text for firefox preview moving tip description -->
+    <string name="tip_firefox_preview_moved_description">Firefox Nightly blir oppdatert hver natt og har eksperimentelle nye funksjoner.
+        Imidlertid kan den være mindre stabilt. Last ned betaversjonen vår for en mer stabil opplevelse.</string>
     <!-- text for firefox preview moving tip button. "Mozilla Firefox Browser" is intentionally hardcoded -->
     <string name="tip_firefox_preview_moved_button">Få Mozilla Firefox nettleser</string>
 
@@ -1158,6 +1175,9 @@
     <!-- Placeholder text for the TextView in the Add to Homescreen dialog -->
     <string name="add_to_homescreen_text_placeholder">Navn på snarvei</string>
 
+    <!-- Describes the add to homescreen functionality -->
+    <string name="add_to_homescreen_description">Du kan enkelt legge til dette nettstedet på telefonens startskjermen for å få øyeblikkelig tilgang og surfe raskere med en app-lignende opplevelse.</string>
+
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Innlogginger og passord</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 8370ea77f..ab74e8ec8 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -477,6 +477,10 @@
     <string name="history_delete_all">Usuń historię</string>
     <!-- Text for the dialog to confirm clearing all history -->
     <string name="history_delete_all_dialog">Czy na pewno usunąć historię przeglądania?</string>
+    <!-- Text for the snackbar to confirm that multiple browsing history items has been deleted -->
+    <string name="history_delete_multiple_items_snackbar">Usunięto historię</string>
+    <!-- Text for the snackbar to confirm that a single browsing history item has been deleted. The first parameter is the shortened URL of the deleted history item. -->
+    <string name="history_delete_single_item_snackbar">Usunięto „%1$s”</string>
     <!-- Text for positive action to delete history in deleting history dialog -->
     <string name="history_clear_dialog">Usuń</string>
     <!-- History overflow menu copy button -->
@@ -532,6 +536,10 @@
     <string name="bookmark_edit">Edytuj zakładkę</string>
     <!-- Screen title for selecting a bookmarks folder -->
     <string name="bookmark_select_folder">Wybierz folder</string>
+    <!-- Confirmation message for a dialog confirming if the user wants to delete the selected folder -->
+    <string name="bookmark_delete_folder_confirmation_dialog">Czy na pewno usunąć ten folder?</string>
+    <!-- Snackbar title shown after a folder has been deleted. This first parameter is the name of the deleted folder -->
+    <string name="bookmark_delete_folder_snackbar">Usunięto folder „%1$s”</string>
     <!-- Screen title for adding a bookmarks folder -->
     <string name="bookmark_add_folder">Dodaj folder</string>
     <!-- deprecated: Snackbar title shown after a bookmark has been created. -->
@@ -583,9 +591,9 @@
     <string name="bookmarks_empty_message">Nie ma jeszcze zakładek</string>
     <!-- Bookmark snackbar message on deletion
      The first parameter is the host part of the URL of the bookmark deleted, if any -->
-    <string name="bookmark_deletion_snackbar_message">Usunięto „%1$s”</string>
+    <string name="bookmark_deletion_snackbar_message">Usunięto zakładkę „%1$s”</string>
     <!-- Bookmark snackbar message on deleting multiple bookmarks -->
-    <string name="bookmark_deletion_multiple_snackbar_message">Usuwanie zaznaczonych zakładek</string>
+    <string name="bookmark_deletion_multiple_snackbar_message_2">Usunięto zakładki</string>
     <!-- Bookmark undo button for deletion snackbar action -->
     <string name="bookmark_undo_deletion">Cofnij</string>
 
@@ -1296,7 +1304,7 @@
     <!-- Text shown when a user successfully edits a custom search engine -->
     <string name="search_edit_custom_engine_success_message">Zapisano „%s”</string>
     <!-- Text shown when a user successfully deletes a custom search engine -->
-    <string name="search_delete_search_engine_success_message">Usunięto „%s”</string>
+    <string name="search_delete_search_engine_success_message">Usunięto wyszukiwarkę „%s”</string>
 
     <!-- Title text shown for the migration screen to the new browser. Placeholder replaced with app name -->
     <string name="migration_title">Witamy w zupełnie nowej przeglądarce %s</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 8f4d69fad..5870fc051 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -80,7 +80,7 @@
     <!-- Browser menu toggle that requests a desktop site -->
     <string name="browser_menu_desktop_site">Site do desktop</string>
     <!-- Browser menu toggle that adds a shortcut to the site on the device home screen. -->
-    <string name="browser_menu_add_to_homescreen">Adicionar à tela inicial</string>
+    <string name="browser_menu_add_to_homescreen">Adicionar à tela</string>
     <!-- Browser menu toggle that installs a Progressive Web App shortcut to the site on the device home screen. -->
     <string name="browser_menu_install_on_homescreen">Instalar</string>
     <!-- Browser menu button that opens the find in page menu -->
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index d749e595d..2a680bce7 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -19,13 +19,15 @@
     <!-- No Open Tabs Message Description -->
     <string name="no_open_tabs_description">Os seus separadores abertos serão mostrados aqui.</string>
 
+    <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
+    <string name="about_content">%1$s é criado pela Mozilla.</string>
+
     <!-- Private Browsing -->
     <!-- Title for private session option -->
     <string name="private_browsing_title">Está numa sessão privada</string>
     <!-- Explanation for private browsing displayed to users on home view when they first enable private mode
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="private_browsing_placeholder_description">O %1$s limpa o seu histórico de pesquisa e de navegação quando sai da aplicação ou fecha todos os separadores e janelas de navegação privada. Embora isto não o torne anónimo para os sites ou para o seu fornecedor de serviço de Internet, torna mais
-        simples manter o que faz na Internet privado de qualquer outra pessoa que utilize este dispositivo.</string>
+    <string name="private_browsing_placeholder_description_2">%1$s limpa o seu histórico de pesquisa e de navegação dos separadores privados quando os fecha ou sai da aplicação. Enquanto isto não o torna anónimo nos websites ou no seu provedor de serviços da Internet, este torna mais fácil em manter privado o que você faz online de qualquer pessoa que utiliza este dispositivo.</string>
     <string name="private_browsing_common_myths">
        Mitos comuns sobre a navegação privada
     </string>
@@ -474,6 +476,10 @@
     <string name="history_delete_all">Eliminar histórico</string>
     <!-- Text for the dialog to confirm clearing all history -->
     <string name="history_delete_all_dialog">Tem a certeza que pretende limpar o histórico?</string>
+    <!-- Text for the snackbar to confirm that multiple browsing history items has been deleted -->
+    <string name="history_delete_multiple_items_snackbar">Histórico eliminado</string>
+    <!-- Text for the snackbar to confirm that a single browsing history item has been deleted. The first parameter is the shortened URL of the deleted history item. -->
+    <string name="history_delete_single_item_snackbar">Eliminado %1$s</string>
     <!-- Text for positive action to delete history in deleting history dialog -->
     <string name="history_clear_dialog">Limpar</string>
     <!-- History overflow menu copy button -->
@@ -529,6 +535,10 @@
     <string name="bookmark_edit">Editar marcador</string>
     <!-- Screen title for selecting a bookmarks folder -->
     <string name="bookmark_select_folder">Selecionar pasta</string>
+    <!-- Confirmation message for a dialog confirming if the user wants to delete the selected folder -->
+    <string name="bookmark_delete_folder_confirmation_dialog">Tem a certeza que deseja eliminar esta pasta?</string>
+    <!-- Snackbar title shown after a folder has been deleted. This first parameter is the name of the deleted folder -->
+    <string name="bookmark_delete_folder_snackbar">Eliminada %1$s</string>
     <!-- Screen title for adding a bookmarks folder -->
     <string name="bookmark_add_folder">Adicionar pasta</string>
     <!-- deprecated: Snackbar title shown after a bookmark has been created. -->
@@ -582,7 +592,7 @@
      The first parameter is the host part of the URL of the bookmark deleted, if any -->
     <string name="bookmark_deletion_snackbar_message">%1$s eliminado</string>
     <!-- Bookmark snackbar message on deleting multiple bookmarks -->
-    <string name="bookmark_deletion_multiple_snackbar_message">A eliminar marcadores selecionados</string>
+    <string name="bookmark_deletion_multiple_snackbar_message_2">Marcadores eliminados</string>
     <!-- Bookmark undo button for deletion snackbar action -->
     <string name="bookmark_undo_deletion">ANULAR</string>
 
@@ -853,6 +863,31 @@
     <!-- Text for the snackbar to show the user that the deletion of browsing data is in progress -->
     <string name="deleting_browsing_data_in_progress">A eliminar dados de navegação…</string>
 
+    <!-- Tips -->
+    <!-- text for firefox preview moving tip header "Firefox Preview" and "Firefox Nightly" are intentionally hardcoded -->
+    <string name="tip_firefox_preview_moved_header">Firefox Preview agora é Firefox Nightly</string>
+    <!-- text for firefox preview moving tip description -->
+    <string name="tip_firefox_preview_moved_description">Firefox Nightly é atualizado todas as noites e possui novas funcionalidades experimentais.
+        No entanto, pode ser menos estável. Transfira o nosso navegador beta para uma experiência mais estável.</string>
+    <!-- text for firefox preview moving tip button. "Mozilla Firefox Browser" is intentionally hardcoded -->
+    <string name="tip_firefox_preview_moved_button">Obter o Navegador Mozilla Firefox</string>
+
+    <!-- text for firefox preview moving tip header. "Firefox Nightly" is intentionally hardcoded -->
+    <string name="tip_firefox_preview_moved_header_preview_installed">Firefox Nightly mudou-se</string>
+    <!-- text for firefox preview moving tip description -->
+    <string name="tip_firefox_preview_moved_description_preview_installed">Esta aplicação não irá receber mais atualizações de segurança. Não utilize mais esta aplicação e mude para o novo Nightly.
+        \n\nPara transferir os seus marcadores, credenciais, e histórico para outra aplicação, crie uma conta Firefox.</string>
+    <!-- text for firefox preview moving tip button  -->
+    <string name="tip_firefox_preview_moved_button_preview_installed">Mudar para o novo Nightly</string>
+
+    <!-- text for firefox preview moving tip header. "Firefox Nightly" is intentionally hardcoded -->
+    <string name="tip_firefox_preview_moved_header_preview_not_installed">Firefox Nightly mudou-se</string>
+    <!-- text for firefox preview moving tip description -->
+    <string name="tip_firefox_preview_moved_description_preview_not_installed">Esta aplicação não irá receber mais atualizações de segurança. Obtenha o novo Nightly e não utilize mais esta aplicação.
+        \n\nPara transferir os seus marcadores, credenciais, e histórico para outra aplicação, crie uma conta Firefox.</string>
+    <!-- text for firefox preview moving tip button  -->
+    <string name="tip_firefox_preview_moved_button_preview_not_installed">Obter o novo Nightly</string>
+
     <!-- Onboarding -->
     <!-- Text for onboarding welcome message
     The first parameter is the name of the app (e.g. Firefox Preview) -->
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 14fbe52ca..6a262a24d 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -451,7 +451,7 @@
     <!-- Button in the current session menu. Opens the share menu when pressed -->
     <string name="current_session_share">Partajează</string>
     <!-- Content description (not visible, for screen readers etc.): Title icon for current session menu -->
-    <string name="current_session_image">Imaginea sesiunii curente</string>
+    <string name="current_session_image">Imaginea sesiunii actuale</string>
     <!-- Button to save the current set of tabs into a collection -->
     <string name="save_to_collection">Salvează în colecție</string>
     <!-- Text for the menu button to delete a collection -->
diff --git a/automation/taskcluster/androidTest/flank-x86.yml b/automation/taskcluster/androidTest/flank-x86.yml
index 61ac36e39..15e72ac14 100644
--- a/automation/taskcluster/androidTest/flank-x86.yml
+++ b/automation/taskcluster/androidTest/flank-x86.yml
@@ -39,6 +39,7 @@ gcloud:
 
   test-targets:
    - package org.mozilla.fenix.ui
+   - package org.mozilla.fenix.glean
 
   device:
    - model: Pixel2
diff --git a/automation/taskcluster/androidTest/ui-test.sh b/automation/taskcluster/androidTest/ui-test.sh
index 45b1ae44a..bd2f699a2 100755
--- a/automation/taskcluster/androidTest/ui-test.sh
+++ b/automation/taskcluster/androidTest/ui-test.sh
@@ -99,15 +99,9 @@ function failure_check() {
     if [[ $exitcode -ne 0 ]]; then
         echo "FAILURE: UI test run failed, please check above URL"
     else
-	echo "All UI test(s) have passed!"
+	      echo "All UI test(s) have passed!"
     fi
 
-    echo
-    echo "RESULTS"
-    echo
-    ls -la "${RESULTS_DIR}" 
-
-
     echo
     echo "RESULTS"
     echo
diff --git a/buildSrc/src/main/java/AndroidComponents.kt b/buildSrc/src/main/java/AndroidComponents.kt
index ef02785cc..76282636d 100644
--- a/buildSrc/src/main/java/AndroidComponents.kt
+++ b/buildSrc/src/main/java/AndroidComponents.kt
@@ -3,5 +3,5 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 object AndroidComponents {
-    const val VERSION = "40.0.20200430224518"
+    const val VERSION = "40.0.20200504130127"
 }