diff --git a/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt b/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt
index a12c546e3..110f1ff40 100644
--- a/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt
@@ -98,10 +98,10 @@ class AddonsManagementFragment : Fragment(R.layout.fragment_add_ons_management),
     private fun bindRecyclerView(view: View) {
         val recyclerView = view.add_ons_list
         recyclerView.layoutManager = LinearLayoutManager(requireContext())
-        viewLifecycleOwner.lifecycleScope.launch(IO) {
+        lifecycleScope.launch(IO) {
             try {
                 val addons = requireContext().components.addonManager.getAddons()
-                viewLifecycleOwner.lifecycleScope.launch(Dispatchers.Main) {
+                lifecycleScope.launch(Dispatchers.Main) {
                     runIfFragmentIsAttached {
                         val adapter = AddonsManagerAdapter(
                             requireContext().components.addonCollectionProvider,
@@ -117,7 +117,7 @@ class AddonsManagementFragment : Fragment(R.layout.fragment_add_ons_management),
                     }
                 }
             } catch (e: AddonManagerException) {
-                viewLifecycleOwner.lifecycleScope.launch(Dispatchers.Main) {
+                lifecycleScope.launch(Dispatchers.Main) {
                     runIfFragmentIsAttached {
                         showSnackBar(
                             view,
diff --git a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
index f60431fb1..c34b07cc2 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
@@ -51,7 +51,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
     private val accountObserver = object : AccountObserver {
         private fun updateAccountUi(profile: Profile? = null) {
             val context = context ?: return
-            viewLifecycleOwner.lifecycleScope.launch {
+            lifecycleScope.launch {
                 updateAccountUIState(
                     context = context,
                     profile = profile
@@ -377,7 +377,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
             preferenceSignIn?.isVisible = false
 
             profile?.avatar?.url?.let { avatarUrl ->
-                viewLifecycleOwner.lifecycleScope.launch(Main) {
+                lifecycleScope.launch(Main) {
                     val roundedDrawable =
                         avatarUrl.toRoundedDrawable(context, requireComponents.core.client)
                     preferenceFirefoxAccount?.icon =
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index 89c9a58e2..4c435c459 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -21,7 +21,7 @@ object Versions {
     const val androidx_legacy = "1.0.0"
     const val androidx_annotation = "1.1.0"
     const val androidx_lifecycle = "2.2.0"
-    const val androidx_fragment = "1.2.1"
+    const val androidx_fragment = "1.2.4"
     const val androidx_navigation = "2.2.1"
     const val androidx_recyclerview = "1.1.0"
     const val androidx_core = "1.2.0"