diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ContentBlockersInfoDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ContentBlockersInfoDialog.kt
index 145208ce165e..09e3d0fa6b55 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ContentBlockersInfoDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ContentBlockersInfoDialog.kt
@@ -2,6 +2,7 @@ package net.mullvad.mullvadvpn.compose.dialog
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
+import androidx.lifecycle.compose.dropUnlessResumed
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import com.ramcosta.composedestinations.spec.DestinationStyle
@@ -24,6 +25,6 @@ fun ContentBlockersInfoDialog(navigator: DestinationsNavigator) {
                     stringResource(id = R.string.settings_changes_effect_warning_content_blocker)
                 )
             },
-        onDismiss = navigator::navigateUp
+        onDismiss = dropUnlessResumed { navigator.navigateUp() }
     )
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/CustomDnsInfoDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/CustomDnsInfoDialog.kt
index f58768d0c6ab..c692b27305c9 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/CustomDnsInfoDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/CustomDnsInfoDialog.kt
@@ -3,6 +3,7 @@ package net.mullvad.mullvadvpn.compose.dialog
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.lifecycle.compose.dropUnlessResumed
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import com.ramcosta.composedestinations.navigation.EmptyDestinationsNavigator
@@ -20,6 +21,6 @@ private fun PreviewCustomDnsInfoDialog() {
 fun CustomDnsInfoDialog(navigator: DestinationsNavigator) {
     InfoDialog(
         message = stringResource(id = R.string.settings_changes_effect_warning_content_blocker),
-        onDismiss = navigator::navigateUp
+        onDismiss = dropUnlessResumed { navigator.navigateUp() }
     )
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DeviceNameInfoDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DeviceNameInfoDialog.kt
index 0e1c315959a4..258af7e44a78 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DeviceNameInfoDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DeviceNameInfoDialog.kt
@@ -2,6 +2,7 @@ package net.mullvad.mullvadvpn.compose.dialog
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
+import androidx.lifecycle.compose.dropUnlessResumed
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import com.ramcosta.composedestinations.spec.DestinationStyle
@@ -19,6 +20,6 @@ fun DeviceNameInfoDialog(navigator: DestinationsNavigator) {
                 appendLine()
                 append(stringResource(id = R.string.device_name_info_third_paragraph))
             },
-        onDismiss = navigator::navigateUp
+        onDismiss = dropUnlessResumed { navigator.navigateUp() }
     )
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DiscardChangesDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DiscardChangesDialog.kt
index 5ebb8c081101..adac4935bb31 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DiscardChangesDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DiscardChangesDialog.kt
@@ -24,7 +24,7 @@ fun DiscardChangesDialog(resultBackNavigator: ResultBackNavigator<Boolean>) {
         dismissButton = {
             PrimaryButton(
                 modifier = Modifier.focusRequester(FocusRequester()),
-                onClick = dropUnlessResumed {resultBackNavigator.navigateBack()},
+                onClick = dropUnlessResumed { resultBackNavigator.navigateBack() },
                 text = stringResource(id = R.string.cancel)
             )
         },
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DnsDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DnsDialog.kt
index 7deab3444ac0..be0a6eb38df9 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DnsDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DnsDialog.kt
@@ -76,7 +76,8 @@ fun DnsDialog(
         viewModel::onDnsInputChange,
         onSaveDnsClick = viewModel::onSaveDnsClick,
         onRemoveDnsClick = viewModel::onRemoveDnsClick,
-        onDismiss = dropUnlessResumed { resultNavigator.navigateBack(result = DnsDialogResult.Cancel) }
+        onDismiss =
+            dropUnlessResumed { resultNavigator.navigateBack(result = DnsDialogResult.Cancel) }
     )
 }
 
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/LocalNetworkSharingInfoDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/LocalNetworkSharingInfoDialog.kt
index ebe46b6050dd..e67796d37e3d 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/LocalNetworkSharingInfoDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/LocalNetworkSharingInfoDialog.kt
@@ -3,6 +3,7 @@ package net.mullvad.mullvadvpn.compose.dialog
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.lifecycle.compose.dropUnlessResumed
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import com.ramcosta.composedestinations.navigation.EmptyDestinationsNavigator
@@ -26,6 +27,6 @@ fun LocalNetworkSharingInfoDialog(navigator: DestinationsNavigator) {
                 appendLine(stringResource(id = R.string.local_network_sharing_additional_info))
                 appendLine(textResource(id = R.string.local_network_sharing_ip_ranges))
             },
-        onDismiss = navigator::navigateUp
+        onDismiss = dropUnlessResumed { navigator.navigateUp() }
     )
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/MalwareInfoDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/MalwareInfoDialog.kt
index 1f627be040fa..a00d75b53eaf 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/MalwareInfoDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/MalwareInfoDialog.kt
@@ -3,6 +3,7 @@ package net.mullvad.mullvadvpn.compose.dialog
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.lifecycle.compose.dropUnlessResumed
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import com.ramcosta.composedestinations.navigation.EmptyDestinationsNavigator
@@ -20,6 +21,6 @@ private fun PreviewMalwareInfoDialog() {
 fun MalwareInfoDialog(navigator: DestinationsNavigator) {
     InfoDialog(
         message = stringResource(id = R.string.malware_info),
-        onDismiss = navigator::navigateUp
+        onDismiss = dropUnlessResumed { navigator.navigateUp() }
     )
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ObfuscationInfoDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ObfuscationInfoDialog.kt
index cf4db26e2e9b..e6e3edd3ac34 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ObfuscationInfoDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ObfuscationInfoDialog.kt
@@ -3,6 +3,7 @@ package net.mullvad.mullvadvpn.compose.dialog
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.lifecycle.compose.dropUnlessResumed
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import com.ramcosta.composedestinations.navigation.EmptyDestinationsNavigator
@@ -20,6 +21,6 @@ private fun PreviewObfuscationInfoDialog() {
 fun ObfuscationInfoDialog(navigator: DestinationsNavigator) {
     InfoDialog(
         message = stringResource(id = R.string.obfuscation_info),
-        onDismiss = navigator::navigateUp
+        onDismiss = dropUnlessResumed { navigator.navigateUp() }
     )
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/QuantumResistanceInfoDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/QuantumResistanceInfoDialog.kt
index e7773ed0a382..47ea8badfc65 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/QuantumResistanceInfoDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/QuantumResistanceInfoDialog.kt
@@ -3,6 +3,7 @@ package net.mullvad.mullvadvpn.compose.dialog
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.lifecycle.compose.dropUnlessResumed
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import com.ramcosta.composedestinations.navigation.EmptyDestinationsNavigator
@@ -21,6 +22,6 @@ fun QuantumResistanceInfoDialog(navigator: DestinationsNavigator) {
     InfoDialog(
         message = stringResource(id = R.string.quantum_resistant_info_first_paragaph),
         additionalInfo = stringResource(id = R.string.quantum_resistant_info_second_paragaph),
-        onDismiss = navigator::navigateUp
+        onDismiss = dropUnlessResumed { navigator.navigateUp() }
     )
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ReportProblemNoEmailDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ReportProblemNoEmailDialog.kt
index d2e35f055244..b015d7c5b7e1 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ReportProblemNoEmailDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ReportProblemNoEmailDialog.kt
@@ -33,7 +33,7 @@ private fun PreviewReportProblemNoEmailDialog() {
 @Composable
 fun ReportProblemNoEmailDialog(resultBackNavigator: ResultBackNavigator<Boolean>) {
     AlertDialog(
-        onDismissRequest = dropUnlessResumed {resultBackNavigator.navigateBack() },
+        onDismissRequest = dropUnlessResumed { resultBackNavigator.navigateBack() },
         icon = {
             Icon(
                 painter = painterResource(id = R.drawable.icon_alert),
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ServerIpOverridesInfoDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ServerIpOverridesInfoDialog.kt
index 9b6054f1f0f8..a42e314991e8 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ServerIpOverridesInfoDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ServerIpOverridesInfoDialog.kt
@@ -3,6 +3,7 @@ package net.mullvad.mullvadvpn.compose.dialog
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.lifecycle.compose.dropUnlessResumed
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import com.ramcosta.composedestinations.navigation.EmptyDestinationsNavigator
@@ -27,6 +28,6 @@ fun ServerIpOverridesInfoDialog(navigator: DestinationsNavigator) {
                 appendLine()
                 append(stringResource(id = R.string.server_ip_overrides_info_third_paragraph))
             },
-        onDismiss = navigator::navigateUp
+        onDismiss = dropUnlessResumed { navigator.navigateUp() }
     )
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/UdpOverTcpPortInfoDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/UdpOverTcpPortInfoDialog.kt
index 1c5c4ccef636..22a93bb4bf0b 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/UdpOverTcpPortInfoDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/UdpOverTcpPortInfoDialog.kt
@@ -3,6 +3,7 @@ package net.mullvad.mullvadvpn.compose.dialog
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.lifecycle.compose.dropUnlessResumed
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import com.ramcosta.composedestinations.navigation.EmptyDestinationsNavigator
@@ -21,6 +22,6 @@ private fun PreviewUdpOverTcpPortInfoDialog() {
 fun UdpOverTcpPortInfoDialog(navigator: DestinationsNavigator) {
     InfoDialog(
         message = stringResource(id = R.string.udp_over_tcp_port_info),
-        onDismiss = navigator::navigateUp
+        onDismiss = dropUnlessResumed { navigator.navigateUp() }
     )
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/WireguardCustomPortDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/WireguardCustomPortDialog.kt
index 2e77ccd9b2b1..6640984a0f03 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/WireguardCustomPortDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/WireguardCustomPortDialog.kt
@@ -16,7 +16,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.lifecycle.compose.dropUnlessResumed
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.result.EmptyResultBackNavigator
 import com.ramcosta.composedestinations.result.ResultBackNavigator
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/WireguardPortInfoDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/WireguardPortInfoDialog.kt
index 7de2e97fbb09..6d497dd93ec4 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/WireguardPortInfoDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/WireguardPortInfoDialog.kt
@@ -4,6 +4,7 @@ import android.os.Parcelable
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.lifecycle.compose.dropUnlessResumed
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import com.ramcosta.composedestinations.navigation.EmptyDestinationsNavigator
@@ -40,6 +41,6 @@ fun WireguardPortInfoDialog(
                 id = R.string.wireguard_port_info_port_range,
                 argument.portRanges.asString()
             ),
-        onDismiss = navigator::navigateUp
+        onDismiss = dropUnlessResumed { navigator.navigateUp() }
     )
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/payment/VerificationPendingDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/payment/VerificationPendingDialog.kt
index 7d49a133f359..81a0b25b8702 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/payment/VerificationPendingDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/payment/VerificationPendingDialog.kt
@@ -7,6 +7,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.compositeOver
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.lifecycle.compose.dropUnlessResumed
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import com.ramcosta.composedestinations.spec.DestinationStyle
@@ -24,7 +25,7 @@ private fun PreviewVerificationPendingDialog() {
 @Destination(style = DestinationStyle.Dialog::class)
 @Composable
 fun VerificationPendingDialog(navigator: DestinationsNavigator) {
-    VerificationPendingDialog(onClose = navigator::navigateUp)
+    VerificationPendingDialog(onClose = dropUnlessResumed { navigator.navigateUp() })
 }
 
 @Composable
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AccountScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AccountScreen.kt
index d78592775b3a..d5c921240633 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AccountScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AccountScreen.kt
@@ -24,6 +24,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.lifecycle.compose.dropUnlessResumed
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import com.ramcosta.composedestinations.navigation.popUpTo
@@ -123,9 +124,7 @@ fun Account(
     AccountScreen(
         state = state,
         uiSideEffect = vm.uiSideEffect,
-        onRedeemVoucherClick = {
-            navigator.navigate(RedeemVoucherDestination) { launchSingleTop = true }
-        },
+        onRedeemVoucherClick = dropUnlessResumed { navigator.navigate(RedeemVoucherDestination) },
         onManageAccountClick = vm::onManageAccountClick,
         onLogoutClick = vm::onLogoutClick,
         navigateToLogin = {
@@ -135,16 +134,14 @@ fun Account(
             }
         },
         onCopyAccountNumber = vm::onCopyAccountNumber,
-        onBackClick = navigator::navigateUp,
-        navigateToDeviceInfo = {
-            navigator.navigate(DeviceNameInfoDialogDestination) { launchSingleTop = true }
-        },
+        onBackClick = dropUnlessResumed { navigator.navigateUp() },
+        navigateToDeviceInfo =
+            dropUnlessResumed { navigator.navigate(DeviceNameInfoDialogDestination) },
         onPurchaseBillingProductClick = { productId ->
-            navigator.navigate(PaymentDestination(productId)) { launchSingleTop = true }
+            navigator.navigate(PaymentDestination(productId), onlyIfResumed = true)
         },
-        navigateToVerificationPendingDialog = {
-            navigator.navigate(VerificationPendingDialogDestination) { launchSingleTop = true }
-        }
+        navigateToVerificationPendingDialog =
+            dropUnlessResumed { navigator.navigate(VerificationPendingDialogDestination) }
     )
 }
 
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AutoConnectAndLockdownModeScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AutoConnectAndLockdownModeScreen.kt
index 5a01e4c94164..95d5ca6dcf27 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AutoConnectAndLockdownModeScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AutoConnectAndLockdownModeScreen.kt
@@ -47,6 +47,7 @@ import androidx.constraintlayout.compose.ConstrainedLayoutReference
 import androidx.constraintlayout.compose.ConstraintLayout
 import androidx.constraintlayout.compose.ConstraintLayoutScope
 import androidx.core.text.HtmlCompat
+import androidx.lifecycle.compose.dropUnlessResumed
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import kotlinx.coroutines.launch
@@ -74,7 +75,7 @@ private fun PreviewAutoConnectAndLockdownModeScreen() {
 @Destination(style = SlideInFromRightTransition::class)
 @Composable
 fun AutoConnectAndLockdownMode(navigator: DestinationsNavigator) {
-    AutoConnectAndLockdownModeScreen(onBackClick = navigator::navigateUp)
+    AutoConnectAndLockdownModeScreen(onBackClick = dropUnlessResumed { navigator.navigateUp() })
 }
 
 @OptIn(ExperimentalFoundationApi::class)
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt
index 94b5ef3b5b85..a1debe63f6f1 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt
@@ -44,6 +44,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.lifecycle.compose.dropUnlessResumed
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import com.ramcosta.composedestinations.navigation.popUpTo
@@ -143,12 +144,12 @@ fun Connect(
                 openAccountPage(sideEffect.token)
             }
             is ConnectViewModel.UiSideEffect.OutOfTime ->
-                navigator.navigate(OutOfTimeDestination, true) {
+                navigator.navigate(OutOfTimeDestination) {
                     launchSingleTop = true
                     popUpTo(NavGraphs.root) { inclusive = true }
                 }
             ConnectViewModel.UiSideEffect.RevokedDevice ->
-                navigator.navigate(DeviceRevokedDestination, true) {
+                navigator.navigate(DeviceRevokedDestination) {
                     launchSingleTop = true
                     popUpTo(NavGraphs.root) { inclusive = true }
                 }
@@ -175,9 +176,7 @@ fun Connect(
         onReconnectClick = connectViewModel::onReconnectClick,
         onConnectClick = connectViewModel::onConnectClick,
         onCancelClick = connectViewModel::onCancelClick,
-        onSwitchLocationClick = {
-            navigator.navigate(SelectLocationDestination, true) { launchSingleTop = true }
-        },
+        onSwitchLocationClick = dropUnlessResumed { navigator.navigate(SelectLocationDestination) },
         onUpdateVersionClick = {
             val intent =
                 Intent(
@@ -192,12 +191,8 @@ fun Connect(
             context.startActivity(intent)
         },
         onManageAccountClick = connectViewModel::onManageAccountClick,
-        onSettingsClick = {
-            navigator.navigate(SettingsDestination, true) { launchSingleTop = true }
-        },
-        onAccountClick = {
-            navigator.navigate(AccountDestination, true) { launchSingleTop = true }
-        },
+        onSettingsClick = dropUnlessResumed { navigator.navigate(SettingsDestination) },
+        onAccountClick = dropUnlessResumed { navigator.navigate(AccountDestination) },
         onDismissNewDeviceClick = connectViewModel::dismissNewDeviceNotification,
     )
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/CustomListLocationsScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/CustomListLocationsScreen.kt
index fc5fc62c3d9b..bbde96b99fb7 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/CustomListLocationsScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/CustomListLocationsScreen.kt
@@ -26,6 +26,7 @@ import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.lifecycle.compose.dropUnlessResumed
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import com.ramcosta.composedestinations.result.NavResult
@@ -115,13 +116,14 @@ fun CustomListLocations(
         onSearchTermInput = customListsViewModel::onSearchTermInput,
         onSaveClick = customListsViewModel::save,
         onRelaySelectionClick = customListsViewModel::onRelaySelectionClick,
-        onBackClick = {
-            if (state.hasUnsavedChanges) {
-                navigator.navigate(DiscardChangesDialogDestination) { launchSingleTop = true }
-            } else {
-                backNavigator.navigateBack()
+        onBackClick =
+            dropUnlessResumed {
+                if (state.hasUnsavedChanges) {
+                    navigator.navigate(DiscardChangesDialogDestination)
+                } else {
+                    backNavigator.navigateBack()
+                }
             }
-        }
     )
 }
 
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/CustomListsScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/CustomListsScreen.kt
index b039f838a2bd..7611cfcf6bc7 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/CustomListsScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/CustomListsScreen.kt
@@ -23,6 +23,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.lifecycle.compose.dropUnlessResumed
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import com.ramcosta.composedestinations.result.NavResult
@@ -92,19 +93,19 @@ fun CustomLists(
     CustomListsScreen(
         state = state,
         snackbarHostState = snackbarHostState,
-        addCustomList = {
-            navigator.navigate(
-                CreateCustomListDestination(),
-            ) {
-                launchSingleTop = true
-            }
-        },
+        addCustomList =
+            dropUnlessResumed {
+                navigator.navigate(
+                    CreateCustomListDestination(),
+                )
+            },
         openCustomList = { customList ->
-            navigator.navigate(EditCustomListDestination(customListId = customList.id)) {
-                launchSingleTop = true
-            }
+            navigator.navigate(
+                EditCustomListDestination(customListId = customList.id),
+                onlyIfResumed = true
+            )
         },
-        onBackClick = navigator::navigateUp
+        onBackClick = dropUnlessResumed { navigator.navigateUp() }
     )
 }
 
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt
index 64414b38c064..c6d8a06d208c 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt
@@ -31,6 +31,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.lifecycle.compose.dropUnlessResumed
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import com.ramcosta.composedestinations.navigation.popUpTo
@@ -146,19 +147,18 @@ fun DeviceList(
     DeviceListScreen(
         state = state,
         snackbarHostState = snackbarHostState,
-        onBackClick = navigator::navigateUp,
-        onContinueWithLogin = {
-            navigator.navigate(LoginDestination(accountNumber)) {
-                launchSingleTop = true
-                popUpTo(LoginDestination) { inclusive = true }
-            }
-        },
-        onSettingsClicked = { navigator.navigate(SettingsDestination) { launchSingleTop = true } },
+        onBackClick = dropUnlessResumed { navigator.navigateUp() },
+        onContinueWithLogin =
+            dropUnlessResumed {
+                navigator.navigate(LoginDestination(accountNumber)) {
+                    launchSingleTop = true
+                    popUpTo(LoginDestination) { inclusive = true }
+                }
+            },
+        onSettingsClicked = dropUnlessResumed { navigator.navigate(SettingsDestination) },
         onTryAgainClicked = viewModel::fetchDevices,
         navigateToRemoveDeviceConfirmationDialog = {
-            navigator.navigate(RemoveDeviceConfirmationDialogDestination(it)) {
-                launchSingleTop = true
-            }
+            navigator.navigate(RemoveDeviceConfirmationDialogDestination(it), onlyIfResumed = true)
         }
     )
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceRevokedScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceRevokedScreen.kt
index f5167bad54f4..ac434243835b 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceRevokedScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceRevokedScreen.kt
@@ -21,6 +21,7 @@ import androidx.compose.ui.unit.sp
 import androidx.constraintlayout.compose.ConstraintLayout
 import androidx.constraintlayout.compose.Dimension
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.lifecycle.compose.dropUnlessResumed
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import com.ramcosta.composedestinations.navigation.popUpTo
@@ -63,7 +64,7 @@ fun DeviceRevoked(navigator: DestinationsNavigator) {
 
     DeviceRevokedScreen(
         state = state,
-        onSettingsClicked = { navigator.navigate(SettingsDestination) { launchSingleTop = true } },
+        onSettingsClicked = dropUnlessResumed { navigator.navigate(SettingsDestination) },
         onGoToLoginClicked = viewModel::onGoToLoginClicked
     )
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/EditCustomListScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/EditCustomListScreen.kt
index 29a1fa103773..151c49dd0e8e 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/EditCustomListScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/EditCustomListScreen.kt
@@ -101,24 +101,23 @@ fun EditCustomList(
         state = state,
         onDeleteList = { name ->
             navigator.navigate(
-                DeleteCustomListDestination(customListId = customListId, name = name)
-            ) {
-                launchSingleTop = true
-            }
+                DeleteCustomListDestination(customListId = customListId, name = name),
+                onlyIfResumed = true
+            )
         },
         onNameClicked = { id, name ->
             navigator.navigate(
-                EditCustomListNameDestination(customListId = id, initialName = name)
-            ) {
-                launchSingleTop = true
-            }
+                EditCustomListNameDestination(customListId = id, initialName = name),
+                onlyIfResumed = true
+            )
         },
         onLocationsClicked = {
-            navigator.navigate(CustomListLocationsDestination(customListId = it, newList = false)) {
-                launchSingleTop = true
-            }
+            navigator.navigate(
+                CustomListLocationsDestination(customListId = it, newList = false),
+                onlyIfResumed = true
+            )
         },
-        onBackClick = dropUnlessResumed { backNavigator.navigateBack()}
+        onBackClick = dropUnlessResumed { backNavigator.navigateBack() }
     )
 }
 
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/FilterScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/FilterScreen.kt
index f58b28eacaa8..4458f8b5887b 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/FilterScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/FilterScreen.kt
@@ -27,6 +27,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.lifecycle.compose.dropUnlessResumed
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import net.mullvad.mullvadvpn.R
@@ -79,7 +80,7 @@ fun FilterScreen(navigator: DestinationsNavigator) {
     }
     FilterScreen(
         state = state,
-        onBackClick = navigator::navigateUp,
+        onBackClick = dropUnlessResumed { navigator.navigateUp() },
         onApplyClick = viewModel::onApplyButtonClicked,
         onSelectedOwnership = viewModel::setSelectedOwnership,
         onAllProviderCheckChange = viewModel::setAllProviders,
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/LoginScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/LoginScreen.kt
index b004314f4fae..80c30f6400a7 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/LoginScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/LoginScreen.kt
@@ -47,6 +47,7 @@ import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.lifecycle.compose.dropUnlessResumed
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import com.ramcosta.composedestinations.navigation.popUpTo
@@ -156,7 +157,7 @@ fun Login(
         vm::createAccount,
         vm::clearAccountHistory,
         vm::onAccountNumberChange,
-        { navigator.navigate(SettingsDestination) }
+        dropUnlessResumed { navigator.navigate(SettingsDestination) }
     )
 }
 
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/NoDaemonScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/NoDaemonScreen.kt
index af47b37fc258..82ae16a20804 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/NoDaemonScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/NoDaemonScreen.kt
@@ -22,6 +22,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.core.app.ActivityCompat.finishAffinity
+import androidx.lifecycle.compose.dropUnlessResumed
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import net.mullvad.mullvadvpn.R
@@ -43,7 +44,7 @@ private fun PreviewNoDaemonScreen() {
 @Destination(style = DefaultTransition::class)
 @Composable
 fun NoDaemonScreen(navigator: DestinationsNavigator) {
-    NoDaemonScreen { navigator.navigate(SettingsDestination) }
+    NoDaemonScreen(dropUnlessResumed { navigator.navigate(SettingsDestination) })
 }
 
 @Composable
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/OutOfTimeScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/OutOfTimeScreen.kt
index d557558a6022..22ab725e7f52 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/OutOfTimeScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/OutOfTimeScreen.kt
@@ -23,6 +23,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.lifecycle.compose.dropUnlessResumed
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import com.ramcosta.composedestinations.navigation.popUpTo
@@ -151,17 +152,15 @@ fun OutOfTime(
     OutOfTimeScreen(
         state = state,
         onSitePaymentClick = vm::onSitePaymentClick,
-        onRedeemVoucherClick = {
-            navigator.navigate(RedeemVoucherDestination) { launchSingleTop = true }
-        },
-        onSettingsClick = { navigator.navigate(SettingsDestination) { launchSingleTop = true } },
-        onAccountClick = { navigator.navigate(AccountDestination) { launchSingleTop = true } },
+        onRedeemVoucherClick = dropUnlessResumed { navigator.navigate(RedeemVoucherDestination) },
+        onSettingsClick = dropUnlessResumed { navigator.navigate(SettingsDestination) },
+        onAccountClick = dropUnlessResumed { navigator.navigate(AccountDestination) },
         onDisconnectClick = vm::onDisconnectClick,
         onPurchaseBillingProductClick = { productId ->
-            navigator.navigate(PaymentDestination(productId)) { launchSingleTop = true }
+            navigator.navigate(PaymentDestination(productId), onlyIfResumed = true)
         },
         navigateToVerificationPendingDialog = {
-            navigator.navigate(VerificationPendingDialogDestination) { launchSingleTop = true }
+            navigator.navigate(VerificationPendingDialogDestination, onlyIfResumed = true)
         }
     )
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ReportProblemScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ReportProblemScreen.kt
index c46eb93894c1..a464a573f775 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ReportProblemScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ReportProblemScreen.kt
@@ -27,6 +27,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.lifecycle.compose.dropUnlessResumed
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import com.ramcosta.composedestinations.result.NavResult
@@ -120,12 +121,13 @@ fun ReportProblem(
         state,
         onSendReport = { vm.sendReport(state.email, state.description) },
         onClearSendResult = vm::clearSendResult,
-        onNavigateToViewLogs = {
-            navigator.navigate(ViewLogsDestination()) { launchSingleTop = true }
-        },
+        onNavigateToViewLogs =
+            dropUnlessResumed {
+                navigator.navigate(ViewLogsDestination()) { launchSingleTop = true }
+            },
         onEmailChanged = vm::updateEmail,
         onDescriptionChanged = vm::updateDescription,
-        onBackClick = navigator::navigateUp,
+        onBackClick = dropUnlessResumed { navigator.navigateUp() },
     )
 }
 
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt
index 735478aee0b9..fd7b89a48b71 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt
@@ -150,10 +150,9 @@ fun SelectLocation(
     val snackbarHostState = remember { SnackbarHostState() }
     val context = LocalContext.current
 
-    val navigateBack = dropUnlessResumed { backNavigator.navigateBack(result = true)}
     LaunchedEffectCollect(vm.uiSideEffect) {
         when (it) {
-            SelectLocationSideEffect.CloseScreen -> navigateBack()
+            SelectLocationSideEffect.CloseScreen -> backNavigator.navigateBack(result = true)
             is SelectLocationSideEffect.LocationAddedToCustomList ->
                 launch {
                     snackbarHostState.showResultSnackbar(
@@ -205,28 +204,37 @@ fun SelectLocation(
         onBackClick = dropUnlessResumed { backNavigator.navigateBack() },
         onFilterClick = dropUnlessResumed { navigator.navigate(FilterScreenDestination) },
         onCreateCustomList = { relayItem ->
-            navigator.navigate(CreateCustomListDestination(locationCode = relayItem?.id)) {
+            navigator.navigate(
+                CreateCustomListDestination(locationCode = relayItem?.id),
+                onlyIfResumed = true
+            ) {
                 launchSingleTop = true
             }
         },
-        onEditCustomLists = { navigator.navigate(CustomListsDestination()) },
+        onEditCustomLists = dropUnlessResumed { navigator.navigate(CustomListsDestination()) },
         removeOwnershipFilter = vm::removeOwnerFilter,
         removeProviderFilter = vm::removeProviderFilter,
         onAddLocationToList = vm::addLocationToList,
         onRemoveLocationFromList = vm::removeLocationFromList,
         onEditCustomListName = {
             navigator.navigate(
-                EditCustomListNameDestination(customListId = it.id, initialName = it.customListName)
+                EditCustomListNameDestination(
+                    customListId = it.id,
+                    initialName = it.customListName
+                ),
+                onlyIfResumed = true
             )
         },
         onEditLocationsCustomList = {
             navigator.navigate(
-                CustomListLocationsDestination(customListId = it.id, newList = false)
+                CustomListLocationsDestination(customListId = it.id, newList = false),
+                onlyIfResumed = true
             )
         },
         onDeleteCustomList = {
             navigator.navigate(
-                DeleteCustomListDestination(customListId = it.id, name = it.customListName)
+                DeleteCustomListDestination(customListId = it.id, name = it.customListName),
+                onlyIfResumed = true
             )
         }
     )
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ServerIpOverridesScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ServerIpOverridesScreen.kt
index 7f9542f22a8b..5a7c9be2a626 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ServerIpOverridesScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ServerIpOverridesScreen.kt
@@ -40,6 +40,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.lifecycle.compose.dropUnlessResumed
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import com.ramcosta.composedestinations.result.ResultRecipient
@@ -143,17 +144,13 @@ fun ServerIpOverrides(
 
     ServerIpOverridesScreen(
         state,
-        onBackClick = navigator::navigateUp,
-        onInfoClick = {
-            navigator.navigate(ServerIpOverridesInfoDialogDestination, onlyIfResumed = true)
-        },
-        onResetOverridesClick = {
-            navigator.navigate(ResetServerIpOverridesConfirmationDestination, onlyIfResumed = true)
-        },
-        onImportByFile = { openFileLauncher.launch("application/json") },
-        onImportByText = {
-            navigator.navigate(ImportOverridesByTextDestination, onlyIfResumed = true)
-        },
+        onBackClick = dropUnlessResumed { navigator.navigateUp() },
+        onInfoClick =
+            dropUnlessResumed { navigator.navigate(ServerIpOverridesInfoDialogDestination) },
+        onResetOverridesClick =
+            dropUnlessResumed { navigator.navigate(ResetServerIpOverridesConfirmationDestination) },
+        onImportByFile = dropUnlessResumed { openFileLauncher.launch("application/json") },
+        onImportByText = dropUnlessResumed { navigator.navigate(ImportOverridesByTextDestination) },
         snackbarHostState
     )
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreen.kt
index 611f2e29ae9a..63229ea2aa98 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreen.kt
@@ -19,6 +19,7 @@ import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.lifecycle.compose.dropUnlessResumed
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import net.mullvad.mullvadvpn.R
@@ -66,16 +67,12 @@ fun Settings(navigator: DestinationsNavigator) {
     val state by vm.uiState.collectAsStateWithLifecycle()
     SettingsScreen(
         state = state,
-        onVpnSettingCellClick = {
-            navigator.navigate(VpnSettingsDestination) { launchSingleTop = true }
-        },
-        onSplitTunnelingCellClick = {
-            navigator.navigate(SplitTunnelingDestination) { launchSingleTop = true }
-        },
-        onReportProblemCellClick = {
-            navigator.navigate(ReportProblemDestination) { launchSingleTop = true }
-        },
-        onBackClick = navigator::navigateUp
+        onVpnSettingCellClick = dropUnlessResumed { navigator.navigate(VpnSettingsDestination) },
+        onSplitTunnelingCellClick =
+            dropUnlessResumed { navigator.navigate(SplitTunnelingDestination) },
+        onReportProblemCellClick =
+            dropUnlessResumed { navigator.navigate(ReportProblemDestination) },
+        onBackClick = dropUnlessResumed { navigator.navigateUp() }
     )
 }
 
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreen.kt
index a9b7873a2f5e..280cef18022a 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreen.kt
@@ -22,6 +22,7 @@ import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.lifecycle.compose.dropUnlessResumed
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import net.mullvad.mullvadvpn.R
@@ -98,7 +99,7 @@ fun SplitTunneling(navigator: DestinationsNavigator) {
         onShowSystemAppsClick = viewModel::onShowSystemAppsClick,
         onExcludeAppClick = viewModel::onExcludeAppClick,
         onIncludeAppClick = viewModel::onIncludeAppClick,
-        onBackClick = navigator::navigateUp,
+        onBackClick = dropUnlessResumed { navigator.navigateUp() },
         onResolveIcon = { packageName ->
             packageManager.getApplicationIconBitmapOrNull(packageName)
         },
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ViewLogsScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ViewLogsScreen.kt
index 05eb72c14291..fbb0ea82ce5c 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ViewLogsScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ViewLogsScreen.kt
@@ -28,6 +28,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.lifecycle.compose.dropUnlessResumed
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import kotlinx.coroutines.launch
@@ -64,7 +65,7 @@ private fun PreviewViewLogsLoadingScreen() {
 fun ViewLogs(navigator: DestinationsNavigator) {
     val vm = koinViewModel<ViewLogsViewModel>()
     val state by vm.uiState.collectAsStateWithLifecycle()
-    ViewLogsScreen(state = state, onBackClick = navigator::navigateUp)
+    ViewLogsScreen(state = state, onBackClick = dropUnlessResumed { navigator.navigateUp() })
 }
 
 @OptIn(ExperimentalMaterial3Api::class)
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt
index bc0c0443dd8a..5c3bf9bb77fe 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt
@@ -31,6 +31,7 @@ import androidx.core.text.HtmlCompat
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.lifecycle.compose.dropUnlessResumed
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import com.ramcosta.composedestinations.result.ResultRecipient
@@ -199,40 +200,30 @@ fun VpnSettings(
     VpnSettingsScreen(
         state = state,
         snackbarHostState = snackbarHostState,
-        navigateToContentBlockersInfo = {
-            navigator.navigate(ContentBlockersInfoDialogDestination) { launchSingleTop = true }
-        },
-        navigateToAutoConnectScreen = {
-            navigator.navigate(AutoConnectAndLockdownModeDestination) { launchSingleTop = true }
-        },
-        navigateToCustomDnsInfo = {
-            navigator.navigate(CustomDnsInfoDialogDestination) { launchSingleTop = true }
-        },
-        navigateToMalwareInfo = {
-            navigator.navigate(MalwareInfoDialogDestination) { launchSingleTop = true }
-        },
-        navigateToObfuscationInfo = {
-            navigator.navigate(ObfuscationInfoDialogDestination) { launchSingleTop = true }
-        },
-        navigateToQuantumResistanceInfo = {
-            navigator.navigate(QuantumResistanceInfoDialogDestination) { launchSingleTop = true }
-        },
-        navigateUdp2TcpInfo = {
-            navigator.navigate(UdpOverTcpPortInfoDialogDestination) { launchSingleTop = true }
-        },
+        navigateToContentBlockersInfo =
+            dropUnlessResumed { navigator.navigate(ContentBlockersInfoDialogDestination) },
+        navigateToAutoConnectScreen =
+            dropUnlessResumed { navigator.navigate(AutoConnectAndLockdownModeDestination) },
+        navigateToCustomDnsInfo =
+            dropUnlessResumed { navigator.navigate(CustomDnsInfoDialogDestination) },
+        navigateToMalwareInfo =
+            dropUnlessResumed { navigator.navigate(MalwareInfoDialogDestination) },
+        navigateToObfuscationInfo =
+            dropUnlessResumed { navigator.navigate(ObfuscationInfoDialogDestination) },
+        navigateToQuantumResistanceInfo =
+            dropUnlessResumed { navigator.navigate(QuantumResistanceInfoDialogDestination) },
+        navigateUdp2TcpInfo =
+            dropUnlessResumed { navigator.navigate(UdpOverTcpPortInfoDialogDestination) },
         navigateToWireguardPortInfo = {
             navigator.navigate(
-                WireguardPortInfoDialogDestination(WireguardPortInfoDialogArgument(it))
-            ) {
-                launchSingleTop = true
-            }
-        },
-        navigateToLocalNetworkSharingInfo = {
-            navigator.navigate(LocalNetworkSharingInfoDialogDestination) { launchSingleTop = true }
-        },
-        navigateToServerIpOverrides = {
-            navigator.navigate(ServerIpOverridesDestination) { launchSingleTop = true }
+                WireguardPortInfoDialogDestination(WireguardPortInfoDialogArgument(it)),
+                onlyIfResumed = true
+            )
         },
+        navigateToLocalNetworkSharingInfo =
+            dropUnlessResumed { navigator.navigate(LocalNetworkSharingInfoDialogDestination) },
+        navigateToServerIpOverrides =
+            dropUnlessResumed { navigator.navigate(ServerIpOverridesDestination) },
         onToggleBlockTrackers = vm::onToggleBlockTrackers,
         onToggleBlockAds = vm::onToggleBlockAds,
         onToggleBlockMalware = vm::onToggleBlockMalware,
@@ -242,10 +233,10 @@ fun VpnSettings(
         onToggleBlockGambling = vm::onToggleBlockGambling,
         onToggleBlockSocialMedia = vm::onToggleBlockSocialMedia,
         navigateToMtuDialog = {
-            navigator.navigate(MtuDialogDestination(it)) { launchSingleTop = true }
+            navigator.navigate(MtuDialogDestination(it), onlyIfResumed = true)
         },
         navigateToDns = { index, address ->
-            navigator.navigate(DnsDialogDestination(index, address)) { launchSingleTop = true }
+            navigator.navigate(DnsDialogDestination(index, address), onlyIfResumed = true)
         },
         navigateToWireguardPortDialog = {
             val args =
@@ -253,12 +244,10 @@ fun VpnSettings(
                     state.customWireguardPort?.toPortOrNull(),
                     state.availablePortRanges
                 )
-            navigator.navigate(WireguardCustomPortDialogDestination(args)) {
-                launchSingleTop = true
-            }
+            navigator.navigate(WireguardCustomPortDialogDestination(args), onlyIfResumed = true)
         },
         onToggleDnsClick = vm::onToggleCustomDns,
-        onBackClick = navigator::navigateUp,
+        onBackClick = dropUnlessResumed { navigator.navigateUp() },
         onSelectObfuscationSetting = vm::onSelectObfuscationSetting,
         onSelectQuantumResistanceSetting = vm::onSelectQuantumResistanceSetting,
         onWireguardPortSelected = vm::onWireguardPortSelected,
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/WelcomeScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/WelcomeScreen.kt
index 342f11594365..71594527fd7a 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/WelcomeScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/WelcomeScreen.kt
@@ -27,6 +27,7 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.lifecycle.compose.dropUnlessResumed
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import com.ramcosta.composedestinations.navigation.popUpTo
@@ -142,21 +143,17 @@ fun Welcome(
 
     WelcomeScreen(
         state = state,
-        onSitePaymentClick = vm::onSitePaymentClick,
-        onRedeemVoucherClick = {
-            navigator.navigate(RedeemVoucherDestination) { launchSingleTop = true }
-        },
-        onSettingsClick = { navigator.navigate(SettingsDestination) { launchSingleTop = true } },
-        onAccountClick = { navigator.navigate(AccountDestination) { launchSingleTop = true } },
-        navigateToDeviceInfoDialog = {
-            navigator.navigate(DeviceNameInfoDialogDestination) { launchSingleTop = true }
-        },
+        onSitePaymentClick = dropUnlessResumed { vm.onSitePaymentClick() },
+        onRedeemVoucherClick = dropUnlessResumed { navigator.navigate(RedeemVoucherDestination) },
+        onSettingsClick = dropUnlessResumed { navigator.navigate(SettingsDestination) },
+        onAccountClick = dropUnlessResumed { navigator.navigate(AccountDestination) },
+        navigateToDeviceInfoDialog =
+            dropUnlessResumed { navigator.navigate(DeviceNameInfoDialogDestination) },
         onPurchaseBillingProductClick = { productId ->
-            navigator.navigate(PaymentDestination(productId)) { launchSingleTop = true }
+            navigator.navigate(PaymentDestination(productId), onlyIfResumed = true)
         },
-        navigateToVerificationPendingDialog = {
-            navigator.navigate(VerificationPendingDialogDestination) { launchSingleTop = true }
-        }
+        navigateToVerificationPendingDialog =
+            dropUnlessResumed { navigator.navigate(VerificationPendingDialogDestination) }
     )
 }
 
diff --git a/android/gradle/verification-metadata.xml b/android/gradle/verification-metadata.xml
index dee23f902770..2f16a1d3f5ca 100644
--- a/android/gradle/verification-metadata.xml
+++ b/android/gradle/verification-metadata.xml
@@ -1250,11 +1250,11 @@
             <sha256 value="0fa7f28f5cff8a406a4f7870b243cb0d6d7a7c20faa7a2becaff5907ae12f9cc" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.lifecycle" name="lifecycle-common" version="2.8.1">
-         <artifact name="lifecycle-common-2.8.1.module">
-            <sha256 value="4442d73add4e6862086c8f979be651c0fa24f3a61f3e30368daaa9ce99fc57d6" origin="Generated by Gradle"/>
+      <component group="androidx.lifecycle" name="lifecycle-common" version="2.8.2">
+         <artifact name="lifecycle-common-2.8.2.module">
+            <sha256 value="bbf1250f00552c82871e283dc2af380b1bc2a1b52a207f012f5d8c849544b621" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lifecycle-common-metadata-2.8.1.jar">
+         <artifact name="lifecycle-common-metadata-2.8.2.jar">
             <sha256 value="e26c6d7d04a490c6fdaa1415ac95797a7dcc7444be3f3ab3d9acad87dae4921c" origin="Generated by Gradle"/>
          </artifact>
       </component>
@@ -1274,20 +1274,20 @@
             <sha256 value="3d538207d68eb89aa0166edac09422b9374819506da39be62c01f0c0f6384f7e" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.lifecycle" name="lifecycle-common-java8" version="2.8.1">
-         <artifact name="lifecycle-common-java8-2.8.1.jar">
+      <component group="androidx.lifecycle" name="lifecycle-common-java8" version="2.8.2">
+         <artifact name="lifecycle-common-java8-2.8.2.jar">
             <sha256 value="c6deada2fac53b8ea6523dbda77597b128006674616f140f04df23264c6d1aa3" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lifecycle-common-java8-2.8.1.module">
-            <sha256 value="805ef2c1224fc13d426e586d37673b26c23e7b15593109d214306ea246aa86b0" origin="Generated by Gradle"/>
+         <artifact name="lifecycle-common-java8-2.8.2.module">
+            <sha256 value="391ec077deaa358a4955d6e63c6171d4bd514c46705d9b1972b9bd33f1d2e4dc" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.lifecycle" name="lifecycle-common-jvm" version="2.8.1">
-         <artifact name="lifecycle-common-jvm-2.8.1.jar">
+      <component group="androidx.lifecycle" name="lifecycle-common-jvm" version="2.8.2">
+         <artifact name="lifecycle-common-jvm-2.8.2.jar">
             <sha256 value="61c873a7327c946ec033c310bb98f3f92eeabcede0e1a5200ab8a1896483c7bf" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lifecycle-common-jvm-2.8.1.module">
-            <sha256 value="f9d3ee151ba951be2df50a9a45f237d8394bff2968edcc11e1014b8894583cbb" origin="Generated by Gradle"/>
+         <artifact name="lifecycle-common-jvm-2.8.2.module">
+            <sha256 value="46b20ea622920f2c083a1f96efb983a4a16823676daed7478aa6fce5e88c3a52" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="androidx.lifecycle" name="lifecycle-livedata" version="2.0.0">
@@ -1314,12 +1314,12 @@
             <sha256 value="19a287b46d1b1ffe297bee0df7dee5183aeba95600ec0de8742adeb5b67c8bab" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.lifecycle" name="lifecycle-livedata" version="2.8.1">
-         <artifact name="lifecycle-livedata-2.8.1.aar">
-            <sha256 value="1a280b5d6351515907aaa19d3179ec8076095985e979e323a5972bdc5d6b7945" origin="Generated by Gradle"/>
+      <component group="androidx.lifecycle" name="lifecycle-livedata" version="2.8.2">
+         <artifact name="lifecycle-livedata-2.8.2.aar">
+            <sha256 value="5b01d448a59caf922c5e9d9e9d1067f25a2b015fd5130e9baac9c86ed2464354" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lifecycle-livedata-2.8.1.module">
-            <sha256 value="5e7fb36c1c4ce810bfaa3d41cd3ff44b86439c04e6c27cbbb209996cb6573e40" origin="Generated by Gradle"/>
+         <artifact name="lifecycle-livedata-2.8.2.module">
+            <sha256 value="f36fd960cae98fce668cf98ea57a33af120cdee0cfb275e94fca74663a4918f6" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="androidx.lifecycle" name="lifecycle-livedata-core" version="2.3.0">
@@ -1359,12 +1359,12 @@
             <sha256 value="527d0e1ac467d1f47cc20ed7c30db170217299fabb868154cf5d1765e4e4dad9" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.lifecycle" name="lifecycle-livedata-core" version="2.8.1">
-         <artifact name="lifecycle-livedata-core-2.8.1.aar">
-            <sha256 value="ed204afc11b8db2b154bee54a2b1af28d46acc54dc05dce463b4fc61e3ee3995" origin="Generated by Gradle"/>
+      <component group="androidx.lifecycle" name="lifecycle-livedata-core" version="2.8.2">
+         <artifact name="lifecycle-livedata-core-2.8.2.aar">
+            <sha256 value="906199de52b28505def4ad5e5a250286e239cd858ef8007843b80754754bf4e2" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lifecycle-livedata-core-2.8.1.module">
-            <sha256 value="5e22f4a4769c06bb86da098a6d38fda8e625b2d656f1d0cd7144a90f8f018f4c" origin="Generated by Gradle"/>
+         <artifact name="lifecycle-livedata-core-2.8.2.module">
+            <sha256 value="f386a0f6bee8f0379c646989a45f93bf5cd1bfa4743690a6c62654a37f2f020a" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="androidx.lifecycle" name="lifecycle-livedata-core-ktx" version="2.6.1">
@@ -1383,12 +1383,12 @@
             <sha256 value="1d6ef93736ae001c226bf2cb4b180bcb0718199a1d3868ee8846f4cc8318b779" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.lifecycle" name="lifecycle-livedata-core-ktx" version="2.8.1">
-         <artifact name="lifecycle-livedata-core-ktx-2.8.1.aar">
-            <sha256 value="875f86c77f83fc7581cb6e402da4ae3ab00a4daca7ba5ad5c64d46dd74016909" origin="Generated by Gradle"/>
+      <component group="androidx.lifecycle" name="lifecycle-livedata-core-ktx" version="2.8.2">
+         <artifact name="lifecycle-livedata-core-ktx-2.8.2.aar">
+            <sha256 value="31617dc7d89886b3ac6e93e4a781fe3c1f9b0b29050d4fc87c89ffd5d6cc821e" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lifecycle-livedata-core-ktx-2.8.1.module">
-            <sha256 value="e82b57a29ad49639557e59ae14833a046b664b6cd4c176f16aa7a7ff2180e027" origin="Generated by Gradle"/>
+         <artifact name="lifecycle-livedata-core-ktx-2.8.2.module">
+            <sha256 value="58a4bc3ca72ec82edb7f41e3dff70bfde2ac8fe6404a4af5849f848b724a4522" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="androidx.lifecycle" name="lifecycle-process" version="2.4.1">
@@ -1407,12 +1407,12 @@
             <sha256 value="58c9e27371ccf7a22a233f44926d348c9d07e78c41a56588a4265ff6ae76645a" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.lifecycle" name="lifecycle-process" version="2.8.1">
-         <artifact name="lifecycle-process-2.8.1.aar">
-            <sha256 value="fa6325d0742b929c6c10dd5558c02ba07cf47d8f922c70169cc86c7e1a353977" origin="Generated by Gradle"/>
+      <component group="androidx.lifecycle" name="lifecycle-process" version="2.8.2">
+         <artifact name="lifecycle-process-2.8.2.aar">
+            <sha256 value="613688bfb3eaac259cf429d804b674325bab5245b9562576e4511a765fec3b04" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lifecycle-process-2.8.1.module">
-            <sha256 value="06d9fff7202f3bdcd1d85165238d35a1b8c538848f1cbd41b118ce4b3b8ddabe" origin="Generated by Gradle"/>
+         <artifact name="lifecycle-process-2.8.2.module">
+            <sha256 value="7e76faf10ecb3fe8213b4c242f8fa9b80da7942c070b4758b7a7a4217c9a9453" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="androidx.lifecycle" name="lifecycle-runtime" version="2.3.0">
@@ -1452,52 +1452,52 @@
             <sha256 value="ea0131846abe1fe9dea59ac6dfe1f0fb9d8b6d600c9eff9a1fd4ad5ee5e7cbc7" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.lifecycle" name="lifecycle-runtime" version="2.8.1">
-         <artifact name="lifecycle-runtime-2.8.1.module">
-            <sha256 value="d0701961c5fdae079428dedd343b2ffd48ae68da5513b9977b35c5428657620b" origin="Generated by Gradle"/>
+      <component group="androidx.lifecycle" name="lifecycle-runtime" version="2.8.2">
+         <artifact name="lifecycle-runtime-2.8.2.module">
+            <sha256 value="a4b8fc08f65e12449421766b83a15d41a4325f412348078d755c175e7102abc4" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lifecycle-runtime-metadata-2.8.1.jar">
+         <artifact name="lifecycle-runtime-metadata-2.8.2.jar">
             <sha256 value="4ee784530e550754230395d4f4f56817c9fcbc08db4d645e77441f3dd82c56b5" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.lifecycle" name="lifecycle-runtime-android" version="2.8.1">
-         <artifact name="lifecycle-runtime-android-2.8.1.module">
-            <sha256 value="bdb365a1573a5d4633b015448be6d6808d643f42d4b55fc54d8d035b34079f22" origin="Generated by Gradle"/>
+      <component group="androidx.lifecycle" name="lifecycle-runtime-android" version="2.8.2">
+         <artifact name="lifecycle-runtime-android-2.8.2.module">
+            <sha256 value="ca87b1aa11ada45b66f7d8c345a5df89fd0a678412db9a1720d02b2a5ea1c77e" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="lifecycle-runtime-release.aar">
-            <sha256 value="386b722ee6198ac7c1f3c6cb080839cc979436ca07c4be78259aff21e912b979" origin="Generated by Gradle"/>
+            <sha256 value="158f313c1a177a66b31c696997ea3c16ff1673a8ac95b844fa227ad742d204d5" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.lifecycle" name="lifecycle-runtime-compose" version="2.8.1">
-         <artifact name="lifecycle-runtime-compose-2.8.1.module">
-            <sha256 value="92c72ee85ce98e7199821db974aea591d2e0f3dc18b3ab8673ef6dbb5ab96b13" origin="Generated by Gradle"/>
+      <component group="androidx.lifecycle" name="lifecycle-runtime-compose" version="2.8.2">
+         <artifact name="lifecycle-runtime-compose-2.8.2.module">
+            <sha256 value="74096c3f4eb2002dc125c7fd440cc8db36cfcf345f7f23674bf3d85020bfd1f4" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lifecycle-runtime-compose-metadata-2.8.1.jar">
+         <artifact name="lifecycle-runtime-compose-metadata-2.8.2.jar">
             <sha256 value="1ace38c9470c78e8971ebcdf8d0390be64010fc869a7fd3c6e5eaf10370ec1ba" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.lifecycle" name="lifecycle-runtime-compose-android" version="2.8.1">
-         <artifact name="lifecycle-runtime-compose-android-2.8.1.module">
-            <sha256 value="6f81deec1cd12090640aec770a029452e22f3a5210990feaf9a801adf058c616" origin="Generated by Gradle"/>
+      <component group="androidx.lifecycle" name="lifecycle-runtime-compose-android" version="2.8.2">
+         <artifact name="lifecycle-runtime-compose-android-2.8.2.module">
+            <sha256 value="4bb504e7894e53fd00f18ee9e7515119d6e0c34c58343410e026b64ddd445a82" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="lifecycle-runtime-compose-release.aar">
-            <sha256 value="98c6e0694a333bbb00b14c75e5c36edfda8ed1d96b44155085e7c74cb65c6a8a" origin="Generated by Gradle"/>
+            <sha256 value="389023fbf1ae0f5a23e168063f92472ccfa753290d43469a3e4c2154cc47b542" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.lifecycle" name="lifecycle-runtime-compose-desktop" version="2.8.1">
-         <artifact name="lifecycle-runtime-compose-desktop-2.8.1.jar">
-            <sha256 value="bbe6ea336f9e822ffdf9356caa9939f07791decb4d17eaf44e3a155888de6048" origin="Generated by Gradle"/>
+      <component group="androidx.lifecycle" name="lifecycle-runtime-compose-desktop" version="2.8.2">
+         <artifact name="lifecycle-runtime-compose-desktop-2.8.2.jar">
+            <sha256 value="f377a65d8248148bd494bfe988376eb0d5738870bd684fdea311c3ad75013076" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lifecycle-runtime-compose-desktop-2.8.1.module">
-            <sha256 value="b66d0e87a31a8108f34443639b355180e6258fcd5e7e457ae6ac12f3b05aa5d6" origin="Generated by Gradle"/>
+         <artifact name="lifecycle-runtime-compose-desktop-2.8.2.module">
+            <sha256 value="fd5b8ef0a0732cdb75157fdf0137adea372f8aa9ad2f00d7d1e839820e285632" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.lifecycle" name="lifecycle-runtime-desktop" version="2.8.1">
-         <artifact name="lifecycle-runtime-desktop-2.8.1.jar">
+      <component group="androidx.lifecycle" name="lifecycle-runtime-desktop" version="2.8.2">
+         <artifact name="lifecycle-runtime-desktop-2.8.2.jar">
             <sha256 value="10bfe53bb2752f967751a5102cdb785eeea54e1d4df6bde88fb0f50b0a49156c" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lifecycle-runtime-desktop-2.8.1.module">
-            <sha256 value="cc08ed61614f92914191fb835edc873474aef1f40e42b9f731417fc63bf20c1d" origin="Generated by Gradle"/>
+         <artifact name="lifecycle-runtime-desktop-2.8.2.module">
+            <sha256 value="cc1e0192679467ed695987646a4e645d5060803f2913a687de71c5bc1186971c" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="androidx.lifecycle" name="lifecycle-runtime-ktx" version="2.5.1">
@@ -1521,28 +1521,28 @@
             <sha256 value="3c9af03a3a543394e67ab599b727ba331e6f330a55829f6d52f63a8772f4cbdc" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.lifecycle" name="lifecycle-runtime-ktx" version="2.8.1">
-         <artifact name="lifecycle-runtime-ktx-2.8.1.module">
-            <sha256 value="ba3c03415162e1e470165b1d1254852fb286cf232e68fec54c57c410ab0810f3" origin="Generated by Gradle"/>
+      <component group="androidx.lifecycle" name="lifecycle-runtime-ktx" version="2.8.2">
+         <artifact name="lifecycle-runtime-ktx-2.8.2.module">
+            <sha256 value="3c7f723b662d1433797c659f48ddcdb53f3b2073b9dc9fd748941b67038d8969" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lifecycle-runtime-ktx-metadata-2.8.1.jar">
+         <artifact name="lifecycle-runtime-ktx-metadata-2.8.2.jar">
             <sha256 value="92e90c3bd6cc2f66a15e9597cc015cd3a2f8767a9bd29d7feadaea4d44b2fccf" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.lifecycle" name="lifecycle-runtime-ktx-android" version="2.8.1">
-         <artifact name="lifecycle-runtime-ktx-android-2.8.1.module">
-            <sha256 value="68b84f501ecca9c4bb4641a54674a90be85a6643aad9cd9ad56a0ac87909e00c" origin="Generated by Gradle"/>
+      <component group="androidx.lifecycle" name="lifecycle-runtime-ktx-android" version="2.8.2">
+         <artifact name="lifecycle-runtime-ktx-android-2.8.2.module">
+            <sha256 value="a8878864db938c7ffe778d9296e7a7b5066954c2321a93ce33de37974098e120" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="lifecycle-runtime-ktx-release.aar">
-            <sha256 value="6dabd1976b787a472cd8a5c0ebc8d7702cc9b9599137392111d2b42d4c58924b" origin="Generated by Gradle"/>
+            <sha256 value="cfcfaeba10fce09a5d8a1451f8d894edc60ac00552ea956ad7f561d5848ba868" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.lifecycle" name="lifecycle-service" version="2.8.1">
-         <artifact name="lifecycle-service-2.8.1.aar">
-            <sha256 value="94e1e1ffa817ffac23bb857b51981c92fbb97f8cc2c09f795b30f5e042308417" origin="Generated by Gradle"/>
+      <component group="androidx.lifecycle" name="lifecycle-service" version="2.8.2">
+         <artifact name="lifecycle-service-2.8.2.aar">
+            <sha256 value="aa83b5973b845ee5350c0f4358ffb137be25b71fa9f5c2cc51198fb9eb0e5201" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lifecycle-service-2.8.1.module">
-            <sha256 value="c2ea282d707bf148949ba505c607e285f136b730047b5cb852a998eb4317861a" origin="Generated by Gradle"/>
+         <artifact name="lifecycle-service-2.8.2.module">
+            <sha256 value="e7d7985bcef0c6738de2f2ba6968c06d8ebdfc06e0298fc1e2c5b3df3a0bd7c2" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="androidx.lifecycle" name="lifecycle-viewmodel" version="2.3.0">
@@ -1582,55 +1582,55 @@
             <sha256 value="74e9a9ea46842a25642c91de2190ac24dcc1ea017395aae0eb250057d32699c6" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.lifecycle" name="lifecycle-viewmodel" version="2.8.1">
-         <artifact name="lifecycle-viewmodel-2.8.1.aar">
+      <component group="androidx.lifecycle" name="lifecycle-viewmodel" version="2.8.2">
+         <artifact name="lifecycle-viewmodel-2.8.2.aar">
             <sha256 value="43d28a6c6da9c1cb72bfb5cc1b511a7937b2db8b79d52f37d0b7f14c79b090dd" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lifecycle-viewmodel-2.8.1.module">
-            <sha256 value="41bc1fd7d4f6884105fa96a5b372007c002e042c39f167e3903d3520f39a0c31" origin="Generated by Gradle"/>
+         <artifact name="lifecycle-viewmodel-2.8.2.module">
+            <sha256 value="72985daed5ac9f371b7328787d853bac6a95792461c5fae6243fa61e3d3f5608" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lifecycle-viewmodel-metadata-2.8.1.jar">
-            <sha256 value="dd82d174a6da88070ebbe6fc842808e797424dd8605ff1d87f8d95b5bb992c08" origin="Generated by Gradle"/>
+         <artifact name="lifecycle-viewmodel-metadata-2.8.2.jar">
+            <sha256 value="539281344ce8a81d33570be300d86bb872c7b719a6dd2ce494eacba438fb53ce" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.lifecycle" name="lifecycle-viewmodel-android" version="2.8.1">
-         <artifact name="lifecycle-viewmodel-android-2.8.1.module">
-            <sha256 value="6731dc9056a3a533c10e42560e72e8748f2fca7a93092aeb0a11b4254e93c5ee" origin="Generated by Gradle"/>
+      <component group="androidx.lifecycle" name="lifecycle-viewmodel-android" version="2.8.2">
+         <artifact name="lifecycle-viewmodel-android-2.8.2.module">
+            <sha256 value="6ba5e376f07ef5328e884814c98a979bf3870b0aac4b39de7d981599abfdd0b9" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="lifecycle-viewmodel-release.aar">
-            <sha256 value="c312cc454cd006e69b8f80a990c871fef60098a748bf0dcfadf079aa7d526d4f" origin="Generated by Gradle"/>
+            <sha256 value="e2f55a6e22af3f44a65469ef459e855fec7a77a454a1334315a1935b18ecda64" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.lifecycle" name="lifecycle-viewmodel-compose" version="2.8.1">
-         <artifact name="lifecycle-viewmodel-compose-2.8.1.module">
-            <sha256 value="8e67ea5d5903c347a2631885738abf7883f128dc8be816f45c1762c1668c4745" origin="Generated by Gradle"/>
+      <component group="androidx.lifecycle" name="lifecycle-viewmodel-compose" version="2.8.2">
+         <artifact name="lifecycle-viewmodel-compose-2.8.2.module">
+            <sha256 value="93d79b051e42af5b2cf1f86d14b9cc7b10fe27869b9cc3d52449d88e1918294b" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lifecycle-viewmodel-compose-metadata-2.8.1.jar">
+         <artifact name="lifecycle-viewmodel-compose-metadata-2.8.2.jar">
             <sha256 value="68457770ac6b3e12b5f688d54e8227253cbebf1b3c137fbd00833ed4c45bd4bd" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.lifecycle" name="lifecycle-viewmodel-compose-android" version="2.8.1">
-         <artifact name="lifecycle-viewmodel-compose-android-2.8.1.module">
-            <sha256 value="7a33fd9537af52b1f96bc4f64c7a8cc02a691da0ffad8224877a8e21d6436249" origin="Generated by Gradle"/>
+      <component group="androidx.lifecycle" name="lifecycle-viewmodel-compose-android" version="2.8.2">
+         <artifact name="lifecycle-viewmodel-compose-android-2.8.2.module">
+            <sha256 value="c0d74c579b5792697968517356c566723726850de9cf1c37443bc97760946b62" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="lifecycle-viewmodel-compose-release.aar">
-            <sha256 value="d0edc01814238919bfe70145e166ef01f93af23b537be5d598327e18f33ee41a" origin="Generated by Gradle"/>
+            <sha256 value="14247d8fb157362a577f3ce992c5a1fed08a6c172f43d2a781083e598a4871f0" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.lifecycle" name="lifecycle-viewmodel-compose-desktop" version="2.8.1">
-         <artifact name="lifecycle-viewmodel-compose-desktop-2.8.1.jar">
+      <component group="androidx.lifecycle" name="lifecycle-viewmodel-compose-desktop" version="2.8.2">
+         <artifact name="lifecycle-viewmodel-compose-desktop-2.8.2.jar">
             <sha256 value="2e0d6ac771c572bc3d637188a07fc6366ee9143f8d2bc28d7aeec73938ee8717" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lifecycle-viewmodel-compose-desktop-2.8.1.module">
-            <sha256 value="49b87f179525ee68c365e50da25ee75c442778d6e4f5965e3ca06ee691e909f9" origin="Generated by Gradle"/>
+         <artifact name="lifecycle-viewmodel-compose-desktop-2.8.2.module">
+            <sha256 value="5130a9dd485967c3fa538048f4c812ea270221abc9e6c90f9a32ecf2bc0d3c9d" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.lifecycle" name="lifecycle-viewmodel-desktop" version="2.8.1">
-         <artifact name="lifecycle-viewmodel-desktop-2.8.1.jar">
-            <sha256 value="5c28f3ba9732f2180685038dbe674059fd9b7843c721cd0f6c73f3dbfcb2683c" origin="Generated by Gradle"/>
+      <component group="androidx.lifecycle" name="lifecycle-viewmodel-desktop" version="2.8.2">
+         <artifact name="lifecycle-viewmodel-desktop-2.8.2.jar">
+            <sha256 value="1ae614e1535b0a975746b4152ef6900651434095870fe2e7d084ec62eb48edca" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lifecycle-viewmodel-desktop-2.8.1.module">
-            <sha256 value="3a5568017c8170526a08874202081b00b7919194d534acb48f1630d1e900b14f" origin="Generated by Gradle"/>
+         <artifact name="lifecycle-viewmodel-desktop-2.8.2.module">
+            <sha256 value="67c8b7e0d90e19aa11309667f38a1aec57fb87c8d0291b7d4772b4f01ff6e6e3" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="androidx.lifecycle" name="lifecycle-viewmodel-ktx" version="2.6.1">
@@ -1649,12 +1649,12 @@
             <sha256 value="16d314c6ec774cf83216c46e6e7fa96c615e1d2611995d368389154b57741861" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.lifecycle" name="lifecycle-viewmodel-ktx" version="2.8.1">
-         <artifact name="lifecycle-viewmodel-ktx-2.8.1.aar">
-            <sha256 value="601d1e15c772a72d82aa35bf2654e44472851204d844f42856d6ff8c07c4e608" origin="Generated by Gradle"/>
+      <component group="androidx.lifecycle" name="lifecycle-viewmodel-ktx" version="2.8.2">
+         <artifact name="lifecycle-viewmodel-ktx-2.8.2.aar">
+            <sha256 value="b29dbe88d03faef613125339e8767e4e851b60789ddfd2fd141190d0b815a324" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lifecycle-viewmodel-ktx-2.8.1.module">
-            <sha256 value="48efc6de5e504a183abc41011fade076b0b21812fcb315cbb2fa4874634ab3a4" origin="Generated by Gradle"/>
+         <artifact name="lifecycle-viewmodel-ktx-2.8.2.module">
+            <sha256 value="3831834bb6851170557081e4a26a01591d3035af52a9b948ab14763584a0cc7a" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="androidx.lifecycle" name="lifecycle-viewmodel-savedstate" version="2.3.0">
@@ -1694,12 +1694,12 @@
             <sha256 value="79f9d92880c2fb7827ac6739eb747264245ae456f4c21f77cf39fdb6a50a76ae" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.lifecycle" name="lifecycle-viewmodel-savedstate" version="2.8.1">
-         <artifact name="lifecycle-viewmodel-savedstate-2.8.1.aar">
-            <sha256 value="9dd54a05fabc8029fbfbbc4a6b74f946d70523e84ee246f7098669423e426708" origin="Generated by Gradle"/>
+      <component group="androidx.lifecycle" name="lifecycle-viewmodel-savedstate" version="2.8.2">
+         <artifact name="lifecycle-viewmodel-savedstate-2.8.2.aar">
+            <sha256 value="2dc62627f265fa750d440c0d8589443faf04f77dce8a7efce3b390c52b0fe8dc" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lifecycle-viewmodel-savedstate-2.8.1.module">
-            <sha256 value="4aebd9a7241c65dbe62e8fb0af2b25057e2f1352b188d2dc4bf76707eb291a9f" origin="Generated by Gradle"/>
+         <artifact name="lifecycle-viewmodel-savedstate-2.8.2.module">
+            <sha256 value="d8ea7b73e8c300339417d1fff1e9af396c819f8bd24ad189d455158e0ce78783" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="androidx.loader" name="loader" version="1.0.0">
@@ -2620,6 +2620,11 @@
             <sha256 value="fd491f78857424106d2e3d605bcd799b53d31a565cdc868463ca7e875db45a50" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.fasterxml.jackson" name="jackson-base" version="2.16.0">
+         <artifact name="jackson-base-2.16.0.pom">
+            <sha256 value="f9b7476ec3798a125f14c9da546fa7af861ead93a1999b2c0d363b9592c2336e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.fasterxml.jackson" name="jackson-bom" version="2.16.0">
          <artifact name="jackson-bom-2.16.0.pom">
             <sha256 value="5aaa28874405bf04fba8e2c57159227824461ba6f7d552abdb8e8d3a0ba6f8bf" origin="Generated by Gradle"/>
@@ -2662,6 +2667,11 @@
             <sha256 value="4cb06067bcc0da3c7f9e4cc6876ab5e0676a45e4896fb4bacd0ab21a5eb28a89" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.fasterxml.jackson.dataformat" name="jackson-dataformats-text" version="2.16.0">
+         <artifact name="jackson-dataformats-text-2.16.0.pom">
+            <sha256 value="554153301caf4b214d0f6d56fc0645d73976b07910e33aec76cbf6dc3c5e8b6d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.fasterxml.jackson.datatype" name="jackson-datatype-jsr310" version="2.16.0">
          <artifact name="jackson-datatype-jsr310-2.16.0.jar">
             <sha256 value="1b506acea4863f423b6796ab6f209bab3cc3c9e23aab4edb662a317846650287" origin="Generated by Gradle"/>
@@ -2686,6 +2696,16 @@
             <sha256 value="4fbf7dcfe49a9b1d6583d6a76bd018e7e9409319f5c92e80f1c5aa7baa475474" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.fasterxml.jackson.module" name="jackson-modules-base" version="2.16.0">
+         <artifact name="jackson-modules-base-2.16.0.pom">
+            <sha256 value="000dc5e57f7b49757418fcd17054eb46d74e1592a9cc8172066912ca2b5be527" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson.module" name="jackson-modules-java8" version="2.16.0">
+         <artifact name="jackson-modules-java8-2.16.0.pom">
+            <sha256 value="9fe4ca79c79402ac1cc54a48dbb65e27fb986a79cbf7d0af0bc0dbc7d67418b7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.github.ben-manes" name="gradle-versions-plugin" version="0.51.0">
          <artifact name="gradle-versions-plugin-0.51.0.jar">
             <sha256 value="843149e32b9176621ccf7f1db4438408c5a9f9b58cd57210537d9b738054021e" origin="Generated by Gradle"/>
@@ -3188,6 +3208,16 @@
             <sha256 value="43ed0e36b353f41e5eb75cd756667c9e2df97cef06eb16066967158a1d034d2a" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.guava" name="guava-parent" version="32.1.3-android">
+         <artifact name="guava-parent-32.1.3-android.pom">
+            <sha256 value="41fc26464fba8ab0b55b402676b45369e0aaa9ba8e0a5a5dec80452908ac97e1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.guava" name="guava-parent" version="32.1.3-jre">
+         <artifact name="guava-parent-32.1.3-jre.pom">
+            <sha256 value="f283c1f04897a9a88a3fa4ff46804e65e82114809a09cd04094bf7de01b1857b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.guava" name="listenablefuture" version="1.0">
          <artifact name="listenablefuture-1.0.jar">
             <sha256 value="e4ad7607e5c0477c6f890ef26a49cb8d1bb4dffb650bab4502afee64644e3069" origin="Generated by Gradle"/>
@@ -6771,6 +6801,9 @@
          </artifact>
       </component>
       <component group="org.junit" name="junit-bom" version="5.10.1">
+         <artifact name="junit-bom-5.10.1.module">
+            <sha256 value="21b0afcfffe2ecb3770f5eb00ae7a19feaee94e771fa3918173850dae78067b7" origin="Generated by Gradle"/>
+         </artifact>
          <artifact name="junit-bom-5.10.1.pom">
             <sha256 value="21c4b0286f4b20069577ff4b20978a85c100ac8a46b6f1c8672fbaab337bc3f2" origin="Generated by Gradle"/>
          </artifact>
@@ -6779,23 +6812,46 @@
          <artifact name="junit-bom-5.10.2.module">
             <sha256 value="de23b114b3e4119a8fe6eb17bed5a3852816698bace67071579d6d927ebb080a" origin="Generated by Gradle"/>
          </artifact>
+         <artifact name="junit-bom-5.10.2.pom">
+            <sha256 value="169dd904a4b0f6520cffe658cc62292bfe9f3c14a989fa92120724cde43a9968" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit" name="junit-bom" version="5.8.0">
+         <artifact name="junit-bom-5.8.0.module">
+            <sha256 value="2b1e09d9c309fce558a52972f37e833cf5a22a3e19899ab20c08c872c01983f6" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-bom-5.8.0.pom">
+            <sha256 value="ad34ae93e3bc532625c16d7384b4209a3e1807ae5f56a4656bc52b8449fb76c1" origin="Generated by Gradle"/>
+         </artifact>
       </component>
       <component group="org.junit" name="junit-bom" version="5.8.2">
+         <artifact name="junit-bom-5.8.2.module">
+            <sha256 value="40cfad993fa70ecdf2af74d0c56da1484ee220964be8f932cfe632be9a2733fa" origin="Generated by Gradle"/>
+         </artifact>
          <artifact name="junit-bom-5.8.2.pom">
             <sha256 value="836069ca9e8ee3c56e48376222da291263f137bd3fd16d84fdd47efcc3f286e2" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.junit" name="junit-bom" version="5.9.1">
+         <artifact name="junit-bom-5.9.1.module">
+            <sha256 value="9026c1656690fa145ad75ece83674211aa12ad8930a91b107c2f5cdece2f1b1c" origin="Generated by Gradle"/>
+         </artifact>
          <artifact name="junit-bom-5.9.1.pom">
             <sha256 value="b163c1cfc8fc1fd58b457a00d586c04c46e986d75904e9ca54c03a97d65b496c" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.junit" name="junit-bom" version="5.9.2">
+         <artifact name="junit-bom-5.9.2.module">
+            <sha256 value="ab137ba5a8e32c9b066bf9126a1c76dd5614b724ba5c0b02549772b5e9f4cf1f" origin="Generated by Gradle"/>
+         </artifact>
          <artifact name="junit-bom-5.9.2.pom">
             <sha256 value="2ed07d65845131f5336a86476c9a4056b59d0b58b9815ab3679bb0f36f35f705" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.junit" name="junit-bom" version="5.9.3">
+         <artifact name="junit-bom-5.9.3.module">
+            <sha256 value="b401fd25901e582a524aa5343c4b39e28bc56e24961c1069bf2b4bbfcee46b93" origin="Generated by Gradle"/>
+         </artifact>
          <artifact name="junit-bom-5.9.3.pom">
             <sha256 value="4d0329cd9e72f2420e5ca15724cbfe6ffa6e5fd2888361516271190fdc342ed7" origin="Generated by Gradle"/>
          </artifact>