diff --git a/app/src/main/java/org/mozilla/fenix/ext/View.kt b/app/src/main/java/org/mozilla/fenix/ext/View.kt
index f8891e35f..53ff50e74 100644
--- a/app/src/main/java/org/mozilla/fenix/ext/View.kt
+++ b/app/src/main/java/org/mozilla/fenix/ext/View.kt
@@ -43,11 +43,11 @@ fun View.removeTouchDelegate() {
 fun View.setNewAccessibilityParent(newParent: View) {
     this.accessibilityDelegate = object : View.AccessibilityDelegate() {
         override fun onInitializeAccessibilityNodeInfo(
-            host: View?,
-            info: AccessibilityNodeInfo?,
+            host: View,
+            info: AccessibilityNodeInfo,
         ) {
             super.onInitializeAccessibilityNodeInfo(host, info)
-            info?.setParent(newParent)
+            info.setParent(newParent)
         }
     }
 }
@@ -64,11 +64,11 @@ fun View.updateAccessibilityCollectionItemInfo(
 ) {
     this.accessibilityDelegate = object : View.AccessibilityDelegate() {
         override fun onInitializeAccessibilityNodeInfo(
-            host: View?,
-            info: AccessibilityNodeInfo?,
+            host: View,
+            info: AccessibilityNodeInfo,
         ) {
             super.onInitializeAccessibilityNodeInfo(host, info)
-            info?.collectionItemInfo =
+            info.collectionItemInfo =
                 AccessibilityNodeInfo.CollectionItemInfo.obtain(
                     rowIndex,
                     rowSpan,
@@ -90,11 +90,11 @@ fun View.updateAccessibilityCollectionInfo(
 ) {
     this.accessibilityDelegate = object : View.AccessibilityDelegate() {
         override fun onInitializeAccessibilityNodeInfo(
-            host: View?,
-            info: AccessibilityNodeInfo?,
+            host: View,
+            info: AccessibilityNodeInfo,
         ) {
             super.onInitializeAccessibilityNodeInfo(host, info)
-            info?.collectionInfo = AccessibilityNodeInfo.CollectionInfo.obtain(
+            info.collectionInfo = AccessibilityNodeInfo.CollectionInfo.obtain(
                 rowCount,
                 columnCount,
                 false,
diff --git a/app/src/main/java/org/mozilla/fenix/settings/TextPercentageSeekBarPreference.kt b/app/src/main/java/org/mozilla/fenix/settings/TextPercentageSeekBarPreference.kt
index 5beb96143..26aa94a7a 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/TextPercentageSeekBarPreference.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/TextPercentageSeekBarPreference.kt
@@ -363,12 +363,12 @@ class TextPercentageSeekBarPreference @JvmOverloads constructor(
             object :
                 View.AccessibilityDelegate() {
                 override fun onInitializeAccessibilityNodeInfo(
-                    host: View?,
-                    info: AccessibilityNodeInfo?,
+                    host: View,
+                    info: AccessibilityNodeInfo,
                 ) {
                     super.onInitializeAccessibilityNodeInfo(host, info)
-                    val initialInfo = info?.rangeInfo
-                    info?.rangeInfo = initialInfo?.let {
+                    val initialInfo = info.rangeInfo
+                    info.rangeInfo = initialInfo?.let {
                         AccessibilityNodeInfo.RangeInfo.obtain(
                             RANGE_TYPE_PERCENT,
                             MIN_VALUE.toFloat(),