diff --git a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
index 3af8972b19..4addbb583b 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
@@ -86,6 +86,7 @@ import org.mozilla.fenix.ext.sessionsOfType
 import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.settings.SupportUtils
 import org.mozilla.fenix.theme.ThemeManager
+import org.mozilla.fenix.utils.FragmentPreDrawManager
 
 /**
  * Base fragment extended by [BrowserFragment].
@@ -141,6 +142,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session
     }
 
     final override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        FragmentPreDrawManager(this).execute {}
         browserInitialized = initializeUI(view) != null
     }
 
diff --git a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
index 3e2ffceff7..3ff71b5ac8 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
@@ -62,9 +62,6 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
     ): View {
         val view = super.onCreateView(inflater, container, savedInstanceState)
         view.browserLayout.transitionName = "$TAB_ITEM_TRANSITION_NAME${getSessionById()?.id}"
-
-        startPostponedEnterTransition()
-
         return view
     }
 
diff --git a/app/src/main/res/layout/tab_list_row.xml b/app/src/main/res/layout/tab_list_row.xml
index 8ae128c329..63a4349aaf 100644
--- a/app/src/main/res/layout/tab_list_row.xml
+++ b/app/src/main/res/layout/tab_list_row.xml
@@ -2,91 +2,91 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<androidx.cardview.widget.CardView
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/item_tab"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="12dp"
-        android:clickable="true"
-        android:clipToPadding="false"
-        android:focusable="true"
-        android:foreground="?android:attr/selectableItemBackground"
-        android:transitionGroup="true"
-        app:cardBackgroundColor="?above"
-        app:cardCornerRadius="@dimen/tab_corner_radius"
-        app:cardElevation="5dp">
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/item_tab"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="12dp"
+    android:clickable="true"
+    android:clipToPadding="false"
+    android:focusable="true"
+    android:foreground="?android:attr/selectableItemBackground"
+    android:transitionGroup="true"
+    app:cardBackgroundColor="?above"
+    app:cardCornerRadius="@dimen/tab_corner_radius"
+    app:cardElevation="5dp">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+        android:id="@+id/inner_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
         <ImageView
-                android:id="@+id/favicon_image"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_margin="8dp"
-                android:adjustViewBounds="true"
-                android:importantForAccessibility="no"
-                android:scaleType="fitCenter"
-                app:layout_constraintDimensionRatio="1:1"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+            android:id="@+id/favicon_image"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_margin="8dp"
+            android:adjustViewBounds="true"
+            android:importantForAccessibility="no"
+            android:scaleType="fitCenter"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintDimensionRatio="1:1"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <ImageButton
             android:id="@+id/play_pause_button"
-            android:contentDescription="@string/mozac_feature_media_notification_action_pause"
             android:layout_width="24dp"
             android:layout_height="24dp"
-            android:elevation="10dp"
             android:background="?attr/selectableItemBackgroundBorderless"
-            app:srcCompat="@drawable/pause_with_background"
+            android:contentDescription="@string/mozac_feature_media_notification_action_pause"
+            android:elevation="10dp"
             android:visibility="gone"
+            app:layout_constraintCircle="@id/favicon_image"
             app:layout_constraintCircleAngle="45"
             app:layout_constraintCircleRadius="28dp"
-            app:layout_constraintCircle="@id/favicon_image"
             app:layout_constraintEnd_toEndOf="@id/favicon_image"
+            app:layout_constraintTop_toTopOf="@id/favicon_image"
+            app:srcCompat="@drawable/pause_with_background" />
+
+        <TextView
+            android:id="@+id/hostname"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:ellipsize="none"
+            android:singleLine="true"
+            android:textAppearance="@style/Header12TextStyle"
+            app:layout_constraintEnd_toStartOf="@id/close_tab_button"
+            app:layout_constraintStart_toEndOf="@id/favicon_image"
             app:layout_constraintTop_toTopOf="@id/favicon_image" />
 
         <TextView
-                android:id="@+id/hostname"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:ellipsize="none"
-                android:singleLine="true"
-                android:textAppearance="@style/Header12TextStyle"
-                app:layout_constraintEnd_toStartOf="@id/close_tab_button"
-                app:layout_constraintStart_toEndOf="@id/favicon_image"
-                app:layout_constraintTop_toTopOf="@id/favicon_image" />
-
-        <TextView
-                android:id="@+id/tab_title"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:layout_marginBottom="8dp"
-                android:ellipsize="end"
-                android:maxLines="2"
-                android:minLines="2"
-                android:textColor="?primaryText"
-                android:textSize="14sp"
-                app:layout_constraintStart_toEndOf="@id/favicon_image"
-                app:layout_constraintEnd_toEndOf="@id/hostname"
-                app:layout_constraintTop_toBottomOf="@id/hostname"
-                app:layout_constraintBottom_toBottomOf="parent"/>
+            android:id="@+id/tab_title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginBottom="8dp"
+            android:ellipsize="end"
+            android:maxLines="2"
+            android:minLines="2"
+            android:textColor="?primaryText"
+            android:textSize="14sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="@id/hostname"
+            app:layout_constraintStart_toEndOf="@id/favicon_image"
+            app:layout_constraintTop_toBottomOf="@id/hostname" />
 
         <ImageButton
-                android:id="@+id/close_tab_button"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:alpha="0.8"
-                app:srcCompat="@drawable/ic_close"
-                android:background="?android:attr/selectableItemBackgroundBorderless"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent"/>
+            android:id="@+id/close_tab_button"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:alpha="0.8"
+            android:background="?android:attr/selectableItemBackgroundBorderless"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@drawable/ic_close" />
 
         <View
             android:id="@+id/selected_border"
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index 594ce8ac02..c2c10f0aec 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -15,22 +15,22 @@ object Versions {
 
     const val androidx_appcompat = "1.1.0"
     const val androidx_biometric = "1.0.1"
-    const val androidx_coordinator_layout = "1.1.0-beta01"
-    const val androidx_constraint_layout = "2.0.0-beta2"
+    const val androidx_coordinator_layout = "1.1.0-rc01"
+    const val androidx_constraint_layout = "2.0.0-beta4"
     const val androidx_preference = "1.1.0"
     const val androidx_legacy = "1.0.0"
     const val androidx_annotation = "1.1.0"
-    const val androidx_lifecycle = "2.2.0-rc02"
-    const val androidx_fragment = "1.2.0-beta02"
-    const val androidx_navigation = "2.2.0-beta01"
-    const val androidx_recyclerview = "1.1.0-beta04"
+    const val androidx_lifecycle = "2.2.0"
+    const val androidx_fragment = "1.2.1"
+    const val androidx_navigation = "2.2.1"
+    const val androidx_recyclerview = "1.1.0"
     const val androidx_testing = "1.2.1-alpha02"
     const val androidx_test_ext = "1.0.0"
-    const val androidx_core = "1.2.0-beta01"
+    const val androidx_core = "1.2.0"
     const val androidx_paging = "2.1.0"
-    const val androidx_transition = "1.3.0-beta01"
+    const val androidx_transition = "1.3.0"
     const val androidx_work = "2.2.0"
-    const val google_material = "1.1.0-beta01"
+    const val google_material = "1.1.0"
 
     const val mozilla_android_components = "31.0.0-SNAPSHOT"
     // Note that android-components also depends on application-services,