diff --git a/profile/src/main/java/no/nordicsemi/android/toolbox/profile/view/channelSounding/ChannelSoundingScreen.kt b/profile/src/main/java/no/nordicsemi/android/toolbox/profile/view/channelSounding/ChannelSoundingScreen.kt
index 62500187..542c9029 100644
--- a/profile/src/main/java/no/nordicsemi/android/toolbox/profile/view/channelSounding/ChannelSoundingScreen.kt
+++ b/profile/src/main/java/no/nordicsemi/android/toolbox/profile/view/channelSounding/ChannelSoundingScreen.kt
@@ -53,8 +53,9 @@ import no.nordicsemi.android.ui.view.internal.LoadingView
 
 @Composable
 internal fun ChannelSoundingScreen(isNotificationPermissionGranted: Boolean?) {
-
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.BAKLAVA && isNotificationPermissionGranted != null) {
+    // Channel Sounding is available from Android 16 (API 36) onward, while better accuracy and
+    // performance are provided from Android 16 (API 36, minor version 1) and later.
+    if (Build.VERSION.SDK_INT_FULL >= Build.VERSION_CODES_FULL.BAKLAVA_1 && isNotificationPermissionGranted != null) {
         RequestRangingPermission {
             val channelSoundingViewModel = hiltViewModel<ChannelSoundingViewModel>()
             val channelSoundingState by channelSoundingViewModel.channelSoundingState.collectAsStateWithLifecycle()
diff --git a/profile/src/main/java/no/nordicsemi/android/toolbox/profile/view/uart/UARTConfigurationPicker.kt b/profile/src/main/java/no/nordicsemi/android/toolbox/profile/view/uart/UARTConfigurationPicker.kt
index dfc06952..890d4e7a 100644
--- a/profile/src/main/java/no/nordicsemi/android/toolbox/profile/view/uart/UARTConfigurationPicker.kt
+++ b/profile/src/main/java/no/nordicsemi/android/toolbox/profile/view/uart/UARTConfigurationPicker.kt
@@ -8,10 +8,10 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ArrowDropDown
 import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.ExposedDropdownMenuAnchorType.Companion.PrimaryNotEditable
 import androidx.compose.material3.ExposedDropdownMenuBox
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.MenuAnchorType.Companion.PrimaryNotEditable
 import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 5e81b0bf..5030b96c 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -50,7 +50,7 @@ dependencyResolutionManagement {
     }
     versionCatalogs {
         create("libs") {
-            from("no.nordicsemi.android.gradle:version-catalog:2.9-6")
+            from("no.nordicsemi.android.gradle:version-catalog:2.10")
         }
     }
 }