diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml
index c76a534fcd97..7b0553a0c29f 100644
--- a/app/lint-baseline.xml
+++ b/app/lint-baseline.xml
@@ -8,28 +8,6 @@
             file="app"/>
     </issue>
 
-    <issue
-        id="ScopedStorage"
-        message="WRITE_EXTERNAL_STORAGE no longer provides write access when targeting Android 10+"
-        errorLine1="    &lt;uses-permission android:name=&quot;android.permission.WRITE_EXTERNAL_STORAGE&quot; />"
-        errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/AndroidManifest.xml"
-            line="9"
-            column="36"/>
-    </issue>
-
-    <issue
-        id="ScopedStorage"
-        message="WRITE_EXTERNAL_STORAGE no longer provides write access when targeting Android 10+"
-        errorLine1="    &lt;uses-permission android:name=&quot;android.permission.WRITE_EXTERNAL_STORAGE&quot; />"
-        errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/debug/AndroidManifest.xml"
-            line="12"
-            column="36"/>
-    </issue>
-
     <issue
         id="UnusedAttribute"
         message="Attribute `android:foreground` has no effect on API levels lower than 23 (current min is 21)"
@@ -701,149 +679,6 @@
             column="5"/>
     </issue>
 
-    <issue
-        id="FragmentTagUsage"
-        message="Replace the &lt;fragment> tag with FragmentContainerView."
-        errorLine1="    &lt;fragment"
-        errorLine2="     ~~~~~~~~">
-        <location
-            file="src/main/res/layout/activity_home.xml"
-            line="21"
-            column="6"/>
-    </issue>
-
-    <issue
-        id="InflateParams"
-        message="Avoid passing `null` as the view root (needed to resolve layout parameters on the inflated layout&apos;s root element)"
-        errorLine1="            .inflate(R.layout.custom_search_engine_radio_button, null) as ConstraintLayout"
-        errorLine2="                                                                 ~~~~">
-        <location
-            file="src/main/java/org/mozilla/fenix/settings/search/AddSearchEngineFragment.kt"
-            line="243"
-            column="66"/>
-    </issue>
-
-    <issue
-        id="InflateParams"
-        message="Avoid passing `null` as the view root (needed to resolve layout parameters on the inflated layout&apos;s root element)"
-        errorLine1="            .inflate(R.layout.search_engine_radio_button, null) as LinearLayout"
-        errorLine2="                                                          ~~~~">
-        <location
-            file="src/main/java/org/mozilla/fenix/settings/search/AddSearchEngineFragment.kt"
-            line="263"
-            column="59"/>
-    </issue>
-
-    <issue
-        id="InflateParams"
-        message="Avoid passing `null` as the view root (needed to resolve layout parameters on the inflated layout&apos;s root element)"
-        errorLine1="                .inflate(R.layout.pbm_shortcut_popup, null)"
-        errorLine2="                                                      ~~~~">
-        <location
-            file="src/main/java/org/mozilla/fenix/home/HomeFragment.kt"
-            line="842"
-            column="55"/>
-    </issue>
-
-    <issue
-        id="InflateParams"
-        message="Avoid passing `null` as the view root (needed to resolve layout parameters on the inflated layout&apos;s root element)"
-        errorLine1="        val dialogView = LayoutInflater.from(context).inflate(R.layout.mp_migration_dialog, null)"
-        errorLine2="                                                                                            ~~~~">
-        <location
-            file="src/main/java/org/mozilla/fenix/components/tips/providers/MasterPasswordTipProvider.kt"
-            line="75"
-            column="93"/>
-    </issue>
-
-    <issue
-        id="InflateParams"
-        message="Avoid passing `null` as the view root (needed to resolve layout parameters on the inflated layout&apos;s root element)"
-        errorLine1="            LayoutInflater.from(context).inflate(R.layout.mp_migration_done_dialog, null)"
-        errorLine2="                                                                                    ~~~~">
-        <location
-            file="src/main/java/org/mozilla/fenix/components/tips/providers/MasterPasswordTipProvider.kt"
-            line="164"
-            column="85"/>
-    </issue>
-
-    <issue
-        id="InflateParams"
-        message="Avoid passing `null` as the view root (needed to resolve layout parameters on the inflated layout&apos;s root element)"
-        errorLine1="            LayoutInflater.from(context).inflate(R.layout.mp_migration_done_dialog, null)"
-        errorLine2="                                                                                    ~~~~">
-        <location
-            file="src/main/java/org/mozilla/fenix/components/tips/providers/MasterPasswordTipProvider.kt"
-            line="221"
-            column="85"/>
-    </issue>
-
-    <issue
-        id="InflateParams"
-        message="Avoid passing `null` as the view root (needed to resolve layout parameters on the inflated layout&apos;s root element)"
-        errorLine1="                LayoutInflater.from(it).inflate(R.layout.top_sites_rename_dialog, null)"
-        errorLine2="                                                                                  ~~~~">
-        <location
-            file="src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt"
-            line="323"
-            column="83"/>
-    </issue>
-
-    <issue
-        id="InflateParams"
-        message="Avoid passing `null` as the view root (needed to resolve layout parameters on the inflated layout&apos;s root element)"
-        errorLine1="                val dialogView = LayoutInflater.from(context).inflate(R.layout.amo_collection_override_dialog, null)"
-        errorLine2="                                                                                                               ~~~~">
-        <location
-            file="src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt"
-            line="355"
-            column="112"/>
-    </issue>
-
-    <issue
-        id="InvalidLicenseFormat"
-        message="The license comment must be followed by a newline character"
-        errorLine1=" * file, You can obtain one at http://mozilla.org/MPL/2.0/. */"
-        errorLine2="                                                             ~">
-        <location
-            file="src/main/java/org/mozilla/fenix/components/FxaServer.kt"
-            line="3"
-            column="62"/>
-    </issue>
-
-    <issue
-        id="MissingLicense"
-        message="The file must start with a comment containing the license"
-        errorLine1="package org.mozilla.fenix.utils;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/org/mozilla/fenix/utils/OnWifiChanged.java"
-            line="1"
-            column="1"/>
-    </issue>
-
-    <issue
-        id="UseSwitchCompatOrMaterialCode"
-        message="Use `SwitchCompat` from AppCompat or `SwitchMaterial` from Material library"
-        errorLine1="    private var switchView: Switch? = null"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/org/mozilla/fenix/settings/DefaultBrowserPreference.kt"
-            line="20"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="UseSwitchCompatOrMaterialXml"
-        message="Use `SwitchCompat` from AppCompat or `SwitchMaterial` from Material library"
-        errorLine1="&lt;Switch xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
-        errorLine2="^">
-        <location
-            file="src/main/res/layout/preference_default_browser.xml"
-            line="6"
-            column="1"/>
-    </issue>
-
     <issue
         id="VectorRaster"
         message="Limit vector icons sizes to 200×200 to keep icon drawing fast; see https://developer.android.com/studio/write/vector-asset-studio#when for more"
@@ -862,7 +697,7 @@
         errorLine2="                                     ~~~~~~~~~~~~~">
         <location
             file="src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt"
-            line="99"
+            line="96"
             column="38"/>
     </issue>
 
@@ -873,7 +708,7 @@
         errorLine2="                                     ~~~~~~~~~~~~~">
         <location
             file="src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt"
-            line="121"
+            line="118"
             column="38"/>
     </issue>
 
@@ -884,7 +719,7 @@
         errorLine2="                    ~~~~~~~~~~~~~">
         <location
             file="src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt"
-            line="144"
+            line="141"
             column="21"/>
     </issue>
 
@@ -895,7 +730,7 @@
         errorLine2="                        ~~~~~~~~~~~~~">
         <location
             file="src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt"
-            line="158"
+            line="155"
             column="25"/>
     </issue>
 
@@ -906,7 +741,7 @@
         errorLine2="                           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt"
-            line="186"
+            line="183"
             column="28"/>
     </issue>
 
@@ -917,7 +752,7 @@
         errorLine2="        ~~~~~~~~~~~~~">
         <location
             file="src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt"
-            line="276"
+            line="273"
             column="9"/>
     </issue>
 
@@ -972,7 +807,7 @@
         errorLine2="                                               ^">
         <location
             file="src/main/res/values-tr/strings.xml"
-            line="737"
+            line="749"
             column="48"/>
     </issue>
 
@@ -983,7 +818,7 @@
         errorLine2="         ~~~~~~~~~~~~~~">
         <location
             file="src/main/AndroidManifest.xml"
-            line="44"
+            line="48"
             column="10"/>
     </issue>
 
@@ -994,7 +829,7 @@
         errorLine2="         ~~~~~~~~~~~~~~">
         <location
             file="src/main/AndroidManifest.xml"
-            line="68"
+            line="72"
             column="10"/>
     </issue>
 
@@ -1005,7 +840,7 @@
         errorLine2="         ~~~~~~~~">
         <location
             file="src/main/AndroidManifest.xml"
-            line="76"
+            line="80"
             column="10"/>
     </issue>
 
@@ -1016,7 +851,7 @@
         errorLine2="         ~~~~~~~">
         <location
             file="src/main/AndroidManifest.xml"
-            line="260"
+            line="273"
             column="10"/>
     </issue>
 
@@ -1027,7 +862,7 @@
         errorLine2="         ~~~~~~~~">
         <location
             file="src/main/AndroidManifest.xml"
-            line="286"
+            line="299"
             column="10"/>
     </issue>
 
@@ -1137,7 +972,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/org/mozilla/fenix/tabstray/TabsTrayFragment.kt"
-            line="383"
+            line="384"
             column="13"/>
     </issue>
 
@@ -1438,6 +1273,17 @@
             column="5"/>
     </issue>
 
+    <issue
+        id="Overdraw"
+        message="Possible overdraw: Root element paints background `?attr/scrimBackground` with a theme that also paints a background (inferred theme is `@style/NormalTheme`)"
+        errorLine1="    android:background=&quot;?attr/scrimBackground&quot;>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/res/layout/fragment_history_search_dialog.xml"
+            line="13"
+            column="5"/>
+    </issue>
+
     <issue
         id="Overdraw"
         message="Possible overdraw: Root element paints background `?homeBackground` with a theme that also paints a background (inferred theme is `@style/NormalTheme`)"
@@ -1577,7 +1423,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values/arrays.xml"
-            line="34"
+            line="36"
             column="13"/>
     </issue>
 
@@ -1588,7 +1434,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values/arrays.xml"
-            line="35"
+            line="37"
             column="13"/>
     </issue>
 
@@ -1599,7 +1445,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values/arrays.xml"
-            line="36"
+            line="38"
             column="13"/>
     </issue>
 
@@ -1610,7 +1456,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values/arrays.xml"
-            line="37"
+            line="39"
             column="19"/>
     </issue>
 
@@ -1660,7 +1506,7 @@
 
     <issue
         id="IconXmlAndPng"
-        message="The following images appear both as density independent `.xml` files and as bitmap files: /Users/oracle/Projects/fenix/app/src/main/res/drawable-hdpi/ic_logo_wordmark_normal.png, /Users/oracle/Projects/fenix/app/src/main/res/drawable-night/ic_logo_wordmark_normal.xml">
+        message="The following images appear both as density independent `.xml` files and as bitmap files: /Users/oracle/Projects/fenix/app/src/main/res/drawable-hdpi/ic_logo_wordmark_normal.png, /Users/rotbolt/AndroidStudioProjects/fenix/app/src/main/res/drawable-night/ic_logo_wordmark_normal.xml">
         <location
             file="src/main/res/drawable-xxxhdpi/ic_logo_wordmark_normal.png"/>
         <location
@@ -1686,7 +1532,7 @@
         id="ConvertToWebp"
         message="One or more images in this project can be converted to the WebP format which typically results in smaller file sizes, even for lossless conversion">
         <location
-            file="src/main/res/drawable-xxxhdpi/ic_logo_wordmark_private.png"/>
+            file="src/main/res/drawable-land-xxhdpi/sunrise.jpg"/>
     </issue>
 
     <issue
@@ -1724,37 +1570,23 @@
             file="src/main/res/drawable/ic_tc.png"/>
     </issue>
 
-    <issue
-        id="IconLocation"
-        message="Found bitmap drawable `res/drawable/wallpaper_1.png` in densityless folder">
-        <location
-            file="src/main/res/drawable/wallpaper_1.png"/>
-    </issue>
-
-    <issue
-        id="IconLocation"
-        message="Found bitmap drawable `res/drawable/wallpaper_2.png` in densityless folder">
-        <location
-            file="src/main/res/drawable/wallpaper_2.png"/>
-    </issue>
-
     <issue
         id="IconDensities"
-        message="Missing the following drawables in `drawable-mdpi`: fenix_search_widget.png (found in drawable-hdpi)">
+        message="Missing the following drawables in `drawable-mdpi`: amethyst.png, cerulean.png, fenix_search_widget.png, sunrise.jpg">
         <location
             file="src/main/res/drawable-mdpi"/>
     </issue>
 
     <issue
         id="IconDensities"
-        message="Missing the following drawables in `drawable-xhdpi`: fenix_search_widget.png (found in drawable-hdpi)">
+        message="Missing the following drawables in `drawable-xhdpi`: amethyst.png, cerulean.png, fenix_search_widget.png, sunrise.jpg">
         <location
             file="src/main/res/drawable-xhdpi"/>
     </issue>
 
     <issue
         id="IconDensities"
-        message="Missing the following drawables in `drawable-xxhdpi`: fenix_search_widget.png (found in drawable-hdpi)">
+        message="Missing the following drawables in `drawable-xxhdpi`: amethyst.png, cerulean.png, fenix_search_widget.png, sunrise.jpg">
         <location
             file="src/main/res/drawable-xxhdpi"/>
     </issue>
@@ -1880,6 +1712,17 @@
             column="6"/>
     </issue>
 
+    <issue
+        id="RtlSymmetry"
+        message="When you define `paddingStart` you should probably also define `paddingEnd` for right-to-left symmetry"
+        errorLine1="    android:paddingStart=&quot;@dimen/custom_checkbox_alignment_margin&quot;>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/res/layout/checkbox_left_sub_preference.xml"
+            line="15"
+            column="5"/>
+    </issue>
+
     <issue
         id="RtlSymmetry"
         message="When you define `paddingStart` you should probably also define `paddingEnd` for right-to-left symmetry"
diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml
index 2669e9ce92d5..fb50a0472b9e 100644
--- a/app/src/debug/AndroidManifest.xml
+++ b/app/src/debug/AndroidManifest.xml
@@ -9,7 +9,11 @@
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
 
     <!-- Allows for storing and retrieving screenshots -->
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="28"
+        tools:ignore="ScopedStorage"
+        />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
     <!-- Allows changing locales -->
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6d64e7c01df0..437e25cbd56f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,7 +6,11 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="28"
+        tools:ignore="ScopedStorage"
+        />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.CAMERA" />
diff --git a/app/src/main/java/org/mozilla/fenix/components/FxaServer.kt b/app/src/main/java/org/mozilla/fenix/components/FxaServer.kt
index b6f66cc7b47d..3347dc2a7e58 100644
--- a/app/src/main/java/org/mozilla/fenix/components/FxaServer.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/FxaServer.kt
@@ -1,6 +1,7 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 package org.mozilla.fenix.components
 
 import android.content.Context
diff --git a/app/src/main/java/org/mozilla/fenix/components/tips/providers/MasterPasswordTipProvider.kt b/app/src/main/java/org/mozilla/fenix/components/tips/providers/MasterPasswordTipProvider.kt
index cfa54b7af01c..f54a5f25353a 100644
--- a/app/src/main/java/org/mozilla/fenix/components/tips/providers/MasterPasswordTipProvider.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/tips/providers/MasterPasswordTipProvider.kt
@@ -4,6 +4,7 @@
 
 package org.mozilla.fenix.components.tips.providers
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.text.Editable
 import android.text.TextWatcher
@@ -71,6 +72,7 @@ class MasterPasswordTipProvider(
             titleDrawable = AppCompatResources.getDrawable(context, R.drawable.ic_login)
         )
 
+    @SuppressLint("InflateParams")
     private fun showMasterPasswordMigration() {
         val dialogView = LayoutInflater.from(context).inflate(R.layout.mp_migration_dialog, null)
 
@@ -159,6 +161,7 @@ class MasterPasswordTipProvider(
         }
     }
 
+    @SuppressLint("InflateParams")
     private fun showFailureDialog() {
         val dialogView =
             LayoutInflater.from(context).inflate(R.layout.mp_migration_done_dialog, null)
@@ -214,6 +217,7 @@ class MasterPasswordTipProvider(
         }
     }
 
+    @SuppressLint("InflateParams")
     private fun showSuccessDialog() {
         dismissMPTip()
 
diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
index 02fbcad883d9..eec52dfa4062 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@@ -868,6 +868,7 @@ class HomeFragment : Fragment() {
         requireComponents.useCases.sessionUseCases.updateLastAccess()
     }
 
+    @SuppressLint("InflateParams")
     private fun recommendPrivateBrowsingShortcut() {
         context?.let { context ->
             val layout = LayoutInflater.from(context)
diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt
index 74faa1a2d267..f17e18640d6b 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt
@@ -4,6 +4,7 @@
 
 package org.mozilla.fenix.home.sessioncontrol
 
+import android.annotation.SuppressLint
 import android.view.LayoutInflater
 import android.widget.EditText
 import androidx.annotation.VisibleForTesting
@@ -333,6 +334,7 @@ class DefaultSessionControlController(
         )
     }
 
+    @SuppressLint("InflateParams")
     override fun handleRenameTopSiteClicked(topSite: TopSite) {
         activity.let {
             val customLayout =
diff --git a/app/src/main/java/org/mozilla/fenix/settings/DefaultBrowserPreference.kt b/app/src/main/java/org/mozilla/fenix/settings/DefaultBrowserPreference.kt
index c2ef16ebb98f..9f54cd78c720 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/DefaultBrowserPreference.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/DefaultBrowserPreference.kt
@@ -6,9 +6,9 @@ package org.mozilla.fenix.settings
 
 import android.content.Context
 import android.util.AttributeSet
-import android.widget.Switch
 import androidx.preference.Preference
 import androidx.preference.PreferenceViewHolder
+import com.google.android.material.switchmaterial.SwitchMaterial
 import org.mozilla.fenix.R
 import org.mozilla.fenix.utils.BrowsersCache
 
@@ -17,7 +17,7 @@ class DefaultBrowserPreference @JvmOverloads constructor(
     attrs: AttributeSet? = null
 ) : Preference(context, attrs) {
 
-    private var switchView: Switch? = null
+    private var switchView: SwitchMaterial? = null
 
     init {
         widgetLayoutResource = R.layout.preference_default_browser
@@ -25,7 +25,7 @@ class DefaultBrowserPreference @JvmOverloads constructor(
 
     override fun onBindViewHolder(holder: PreferenceViewHolder) {
         super.onBindViewHolder(holder)
-        switchView = holder.findViewById(R.id.switch_widget) as Switch
+        switchView = holder.findViewById(R.id.switch_widget) as SwitchMaterial
 
         updateSwitch()
     }
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 3286e833c397..1571a1d93b29 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
@@ -227,6 +227,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
         updateMakeDefaultBrowserPreference()
     }
 
+    @SuppressLint("InflateParams")
     @Suppress("ComplexMethod", "LongMethod")
     override fun onPreferenceTreeClick(preference: Preference): Boolean {
         // Hide the scrollbar so the animation looks smoother
diff --git a/app/src/main/java/org/mozilla/fenix/settings/search/AddSearchEngineFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/search/AddSearchEngineFragment.kt
index b721d93af74a..d9bccdb010a8 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/search/AddSearchEngineFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/search/AddSearchEngineFragment.kt
@@ -4,6 +4,7 @@
 
 package org.mozilla.fenix.settings.search
 
+import android.annotation.SuppressLint
 import android.content.res.Resources
 import android.graphics.drawable.BitmapDrawable
 import android.os.Bundle
@@ -238,6 +239,7 @@ class AddSearchEngineFragment :
         toggleCustomForm(selectedIndex == -1)
     }
 
+    @SuppressLint("InflateParams")
     private fun makeCustomButton(layoutInflater: LayoutInflater): CustomSearchEngineRadioButtonBinding {
         val wrapper = layoutInflater
             .inflate(R.layout.custom_search_engine_radio_button, null) as ConstraintLayout
@@ -254,6 +256,7 @@ class AddSearchEngineFragment :
         customSearchEngine.customSearchEnginesLearnMore.isEnabled = isEnabled
     }
 
+    @SuppressLint("InflateParams")
     private fun makeButtonFromSearchEngine(
         engine: SearchEngine,
         layoutInflater: LayoutInflater,
diff --git a/app/src/main/java/org/mozilla/fenix/utils/OnWifiChanged.java b/app/src/main/java/org/mozilla/fenix/utils/OnWifiChanged.java
index 208b37f69f14..4c8a384f25f4 100644
--- a/app/src/main/java/org/mozilla/fenix/utils/OnWifiChanged.java
+++ b/app/src/main/java/org/mozilla/fenix/utils/OnWifiChanged.java
@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 package org.mozilla.fenix.utils;
 
 /**
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index b91ab497c980..94dcd5aba3e4 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -18,7 +18,8 @@
         android:layout_width="match_parent"
         android:layout_height="56dp" />
 
-    <fragment
+    <!--The navGraph is set dynamically in NavGraphProvider -->
+    <androidx.fragment.app.FragmentContainerView
         android:id="@+id/container"
         android:name="androidx.navigation.fragment.NavHostFragment"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/preference_default_browser.xml b/app/src/main/res/layout/preference_default_browser.xml
index 23d504dcdd4c..907e3685e5ff 100644
--- a/app/src/main/res/layout/preference_default_browser.xml
+++ b/app/src/main/res/layout/preference_default_browser.xml
@@ -3,7 +3,7 @@
    - 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/. -->
 
-<Switch xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.switchmaterial.SwitchMaterial xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/switch_widget"
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
diff --git a/app/src/test/java/org/mozilla/fenix/perf/PerformanceInflaterTest.kt b/app/src/test/java/org/mozilla/fenix/perf/PerformanceInflaterTest.kt
index caf5ada7fb34..562fc9ed537d 100644
--- a/app/src/test/java/org/mozilla/fenix/perf/PerformanceInflaterTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/perf/PerformanceInflaterTest.kt
@@ -30,7 +30,12 @@ class PerformanceInflaterTest {
     private val layoutsNotToTest = setOf(
         "fragment_browser",
         "fragment_add_on_internal_settings",
-        "activity_privacy_content_display"
+        "activity_privacy_content_display",
+        /**
+         *  activity_home.xml contains FragmentContainerView which needs to be
+         *  put inside FragmentActivity in order to get inflated
+         */
+        "activity_home"
     )
 
     @Before
diff --git a/buildSrc/src/main/java/AndroidComponents.kt b/buildSrc/src/main/java/AndroidComponents.kt
index 43fcf6418edf..d0484a2570e4 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 = "99.0.20220210143122"
+    const val VERSION = "99.0.20220210181319"
 }