diff --git a/build.gradle b/build.gradle
index 120f69c3f..ff5094adc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,8 +8,8 @@ buildscript {
 
         // Android SDK Versions
         minSdkVersion = 21
-        compileSdkVersion = 35
-        targetSdkVersion = 35
+        compileSdkVersion = 34
+        targetSdkVersion = 34
 
         // Looking for dependency versions?
         // See: ./gradle/libs.versions.toml
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e85d1402a..170351d7a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -83,7 +83,7 @@ google-truth = '1.1.3'
 junit = '4.13.2'
 mockito = '4.6.1'
 mockito-kotlin = '4.0.0'
-robolectric = '4.14-beta-1'
+robolectric = '4.11.1'
 turbine = '0.10.0'
 mockk = '1.13.5'
 
@@ -144,6 +144,7 @@ androidx-fragment-testing = { module = "androidx.fragment:fragment-testing", ver
 androidx-lifecycle-common-java8 = { module = "androidx.lifecycle:lifecycle-common-java8", version.ref="androidx-lifecycle" }
 androidx-lifecycle-livedataktx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref="androidx-lifecycle" }
 androidx-lifecycle-runtimektx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref="androidx-lifecycle" }
+androidx-lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref="androidx-lifecycle" }
 androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel", version.ref="androidx-lifecycle" }
 androidx-lifecycle-viewmodelktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref="androidx-lifecycle" }
 androidx-navigation-fragment = { module = "androidx.navigation:navigation-fragment", version.ref = "androidx-navigation" }
diff --git a/sample/src/main/res/values/styles.xml b/sample/src/main/res/values/styles.xml
index cd25a6518..0829beb1c 100644
--- a/sample/src/main/res/values/styles.xml
+++ b/sample/src/main/res/values/styles.xml
@@ -14,7 +14,6 @@
         <item name="colorOnSecondary">#000000</item>
         <item name="messageCenterStyle">@style/AppTheme.MessageCenter</item>
         <item name="android:statusBarColor" tools:ignore="NewApi">@color/airshipBlue</item>
-        <item name="android:windowOptOutEdgeToEdgeEnforcement" tools:ignore="NewApi">true</item>
     </style>
 
     <style name="AppTheme.NoActionBar">
@@ -35,6 +34,4 @@
     <!-- Custom message date text style -->
     <style name="AppTheme.MessageCenter.DateTextAppearance" parent="TextAppearance.MaterialComponents.Body2" />
 
-
-
 </resources>
diff --git a/urbanairship-automation-compose/build.gradle b/urbanairship-automation-compose/build.gradle
index 120335886..b2ab13919 100644
--- a/urbanairship-automation-compose/build.gradle
+++ b/urbanairship-automation-compose/build.gradle
@@ -36,7 +36,6 @@ dependencies {
     implementation(libs.compose.foundation)
     implementation(libs.compose.runtime)
     implementation(libs.compose.ui)
-    implementation(libs.compose.ui.graphics)
     implementation(libs.compose.animation)
 
     // Compose Preview Support
@@ -46,8 +45,7 @@ dependencies {
     // AndroidX
     implementation(libs.androidx.corektx)
     implementation(libs.androidx.activity.compose)
-    implementation(libs.androidx.lifecycle.runtimektx)
-    implementation(libs.androidx.lifecycle.viewmodelktx)
+    implementation(libs.androidx.lifecycle.runtime.compose)
 
     // Instrumentation Tests
     androidTestImplementation(platform(libs.compose.bom))
diff --git a/urbanairship-automation-compose/src/main/java/com/urbanairship/automation/compose/AirshipEmbeddedView.kt b/urbanairship-automation-compose/src/main/java/com/urbanairship/automation/compose/AirshipEmbeddedView.kt
index 652b16954..01daeb773 100644
--- a/urbanairship-automation-compose/src/main/java/com/urbanairship/automation/compose/AirshipEmbeddedView.kt
+++ b/urbanairship-automation-compose/src/main/java/com/urbanairship/automation/compose/AirshipEmbeddedView.kt
@@ -17,7 +17,6 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.foundation.text.BasicText
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -163,7 +162,7 @@ private fun EmbeddedViewContent(
             ){ layout ->
                 EmbeddedViewWrapper(
                     embeddedId = state.embeddedId,
-                    layout = layout,
+                    embeddedLayout = layout,
                     embeddedSize = state.placementSize
                         ?.toEmbeddedSize(parentWidthProvider, parentHeightProvider),
                     placeholder = placeholder,
@@ -174,64 +173,71 @@ private fun EmbeddedViewContent(
     }
 }
 
-/** Shows the embedded view if content is available, otherwise shows the placeholder. */
+/** Shows the [embeddedLayout] if not null, otherwise shows the [placeholder]. */
 @Composable
-private fun EmbeddedViewWrapper(
+internal fun EmbeddedViewWrapper(
     embeddedId: String,
-    layout: EmbeddedLayout?,
+    embeddedLayout: EmbeddedLayout?,
     modifier: Modifier = Modifier,
     embeddedSize: EmbeddedSize?,
     placeholder: (@Composable () -> Unit)?
 ) {
-    if (layout != null) {
-        // Only nullable because we're safe-casting the placement type farther down.
-        // Placement should never be null here, in practice.
-        val (width, height) = embeddedSize ?: return
-
-        // Remember the view, updating it if the layout instance ID changes.
-        val view = remember(layout.viewInstanceId) {
-            mutableStateOf(
-                layout.makeView(width.fill, height.fill)?.apply {
-                    layoutParams = LayoutParams(width.spec, height.spec).apply {
+    val layout = embeddedLayout ?: run {
+        // Show the placeholder if we have one
+        placeholder?.invoke()
+
+        // Bail out if we don't have a layout
+        return
+    }
+
+    // Only nullable because we're safe-casting the placement type farther down.
+    // Placement should never be null here, in practice.
+    val (width, height) = embeddedSize ?: run {
+        UALog.w("Embedded size is null for embedded ID \"$embeddedId\"!")
+        return
+    }
+
+    // Remember the view, updating it if the layout instance ID changes.
+    val view = remember(embeddedId, layout.viewInstanceId) {
+        embeddedLayout.makeView(width.fill, height.fill)!!.apply {
+            layoutParams = LayoutParams(width.spec, height.spec).apply {
+                gravity = Gravity.CENTER
+            }
+        }
+    }
+
+    AndroidView(
+        factory = { viewContext ->
+            FrameLayout(viewContext).apply {
+                layoutParams = LayoutParams(width.spec, height.spec)
+            }.also {
+                UALog.v { "Create embedded layout for id: \"$embeddedId\", instance: \"${embeddedLayout.viewInstanceId}\"" }
+            }
+        },
+        update = { frame ->
+            view.apply {
+                // Update the layout params to pass along size changes to the
+                // child embedded view.
+                updateLayoutParams {
+                    LayoutParams(width.spec, height.spec).apply {
                         gravity = Gravity.CENTER
                     }
                 }
-            )
-        }
 
-        AndroidView(
-            factory = { viewContext ->
-                FrameLayout(viewContext).apply {
-                    layoutParams = LayoutParams(width.spec, height.spec)
-                }.also {
-                    UALog.v { "Create embedded layout for id: \"$embeddedId\"" }
+                // If the frame has children, remove them before adding the new view.
+                if (frame.childCount > 0) {
+                    frame.removeAllViews()
                 }
-            },
-            update = { frame ->
-                view.value?.apply {
-                    // Update the layout params to pass along size changes to the
-                    // child embedded view.
-                    updateLayoutParams {
-                        LayoutParams(width.spec, height.spec).apply {
-                            gravity = Gravity.CENTER
-                        }
-                    }
-                    // If the frame is empty, add the view.
-                    // The frame will be empty on the first update after the view is
-                    // created, and when the frame is reset and then updated again.
-                    if (frame.childCount == 0) {
-                        frame.addView(this)
-                    }
-                    UALog.v { "Update embedded layout for id: \"$embeddedId\"" }
-                }
-             },
-            onReset = { frame ->
-                frame.removeAllViews()
-                UALog.v { "Reset embedded layout for id: \"$embeddedId\"" }
-            },
-            modifier = modifier
-        )
-    } else if (placeholder != null) {
-        placeholder()
-    }
+
+                frame.addView(this)
+
+                UALog.v { "Update embedded layout for id: \"$embeddedId\", instance: \"${embeddedLayout.viewInstanceId}\"}" }
+            }
+         },
+        onReset = { frame ->
+            frame.removeAllViews()
+            UALog.v { "Reset embedded layout for id: \"$embeddedId\", instance: \"${embeddedLayout.viewInstanceId}\"" }
+        },
+        modifier = modifier
+    )
 }
diff --git a/urbanairship-automation-compose/src/main/java/com/urbanairship/automation/compose/AirshipEmbeddedViewGroup.kt b/urbanairship-automation-compose/src/main/java/com/urbanairship/automation/compose/AirshipEmbeddedViewGroup.kt
new file mode 100644
index 000000000..7be5bbfd8
--- /dev/null
+++ b/urbanairship-automation-compose/src/main/java/com/urbanairship/automation/compose/AirshipEmbeddedViewGroup.kt
@@ -0,0 +1,105 @@
+/* Copyright Airship and Contributors */
+
+package com.urbanairship.automation.compose
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxScope
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.State
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.structuralEqualityPolicy
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.urbanairship.android.layout.EmbeddedDisplayRequest
+import com.urbanairship.android.layout.ui.EmbeddedLayout
+import com.urbanairship.embedded.AirshipEmbeddedInfo
+import com.urbanairship.embedded.EmbeddedViewManager
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.map
+
+/**
+ * A container that allows all embedded content for the given [embeddedId]
+ * to be displayed using the provided [content] composable.
+ *
+ * @param embeddedId The embedded ID.
+ * @param modifier The modifier to be applied to the layout.
+ * @param comparator Optional [Comparator] used to sort available embedded view content.
+ * @param content The `Composable` that will display the list of embedded view content.
+ */
+@Composable
+public fun AirshipEmbeddedViewGroup(
+    embeddedId: String,
+    modifier: Modifier = Modifier,
+    comparator: Comparator<AirshipEmbeddedInfo>? = null,
+    content: @Composable BoxScope.(embeddedViews: List<EmbeddedViewItem>) -> Unit
+) {
+    val scope = rememberCoroutineScope()
+
+    val displayRequests = EmbeddedViewManager.displayRequests(embeddedId, comparator, scope)
+        .map { it.list }
+        .distinctUntilChanged()
+        .collectAsStateWithLifecycle(emptyList())
+
+    val items: State<List<EmbeddedViewItem>> = derivedStateOf(policy = structuralEqualityPolicy()) {
+        displayRequests.value.map { request -> EmbeddedViewItem(request = request) }
+    }
+
+    Box(modifier) {
+        content(items.value)
+    }
+}
+
+/**
+ * An embedded view item, containing the [AirshipEmbeddedInfo] and the content to display.
+ */
+@Immutable
+public data class EmbeddedViewItem internal constructor(
+    private val request: EmbeddedDisplayRequest
+) {
+    /** The [AirshipEmbeddedInfo] for this embedded content. */
+    public val info: AirshipEmbeddedInfo = AirshipEmbeddedInfo(
+        embeddedId = request.embeddedViewId,
+        instanceId = request.viewInstanceId,
+        priority = request.priority,
+        extras = request.extras,
+    )
+
+    /** The content to display for this embedded view item. */
+    @Composable
+    public fun content() {
+        val layout = EmbeddedLayout(
+            context = LocalContext.current,
+            embeddedViewId = request.embeddedViewId,
+            viewInstanceId = request.viewInstanceId,
+            args = request.displayArgsProvider.invoke(),
+            embeddedViewManager = EmbeddedViewManager
+        )
+
+        EmbeddedViewWrapper(
+            embeddedId = request.embeddedViewId,
+            embeddedLayout = layout,
+            embeddedSize = layout.getPlacement()?.size?.toEmbeddedSize(),
+            // Consumers provide their own placeholder, if desired.
+            placeholder = null,
+            modifier = Modifier.fillMaxWidth()
+        )
+    }
+}
+
+@Preview
+@Composable
+private fun AirshipEmbeddedViewPagerPreview() {
+    AirshipEmbeddedViewGroup(
+        embeddedId = "embeddedId",
+        modifier = Modifier.fillMaxSize()
+    ) { views ->
+        views.first().content()
+    }
+}
diff --git a/urbanairship-automation-compose/src/main/java/com/urbanairship/automation/compose/AirshipEmbeddedViewState.kt b/urbanairship-automation-compose/src/main/java/com/urbanairship/automation/compose/AirshipEmbeddedViewState.kt
index e72bcf9c7..d51aa0a2f 100644
--- a/urbanairship-automation-compose/src/main/java/com/urbanairship/automation/compose/AirshipEmbeddedViewState.kt
+++ b/urbanairship-automation-compose/src/main/java/com/urbanairship/automation/compose/AirshipEmbeddedViewState.kt
@@ -68,9 +68,7 @@ public class AirshipEmbeddedViewState(
 
     /** Dismiss all pending embedded content for the current embedded view ID. */
     public suspend fun dismissAll(): Unit = coroutineScope {
-        currentLayout?.let { layout ->
-            EmbeddedViewManager.dismissAll(layout.embeddedViewId)
-        }
+        EmbeddedViewManager.dismissAll(embeddedId)
     }
 
     internal val placementSize: ConstrainedSize? by derivedStateOf {
@@ -109,20 +107,21 @@ internal fun rememberAirshipEmbeddedViewState(
     val state = remember { AirshipEmbeddedViewState(embeddedId) }
     val scope = rememberCoroutineScope()
 
-    LaunchedEffect(key1 = embeddedId) {
+    LaunchedEffect(embeddedId, comparator) {
         // Collect display requests and update the current layout state.
         withContext(Dispatchers.Default) {
             embeddedViewManager.displayRequests(embeddedId, comparator, scope)
                 .map { request ->
-                    if (request == null) {
+                    val next = request.next
+                    if (next == null) {
                         // Nothing to display.
                         UALog.v { "No display request available for id: \"$embeddedId\"" }
                         null
                     } else {
                         // Inflate the embedded layout.
                         UALog.v { "Display request available for id: \"$embeddedId\"" }
-                        val displayArgs = request.displayArgsProvider.invoke()
-                        EmbeddedLayout(context, embeddedId, request.viewInstanceId, displayArgs, embeddedViewManager)
+                        val displayArgs = next.displayArgsProvider.invoke()
+                        EmbeddedLayout(context, embeddedId, next.viewInstanceId, displayArgs, embeddedViewManager)
                     }
                 }
                 .collect { state.currentLayout = it }
@@ -137,8 +136,8 @@ internal fun rememberAirshipEmbeddedViewState(
 //
 
 internal fun ConstrainedSize.toEmbeddedSize(
-    parentWidthProvider: (() -> Int)?,
-    parentHeightProvider: (() -> Int)?
+    parentWidthProvider: (() -> Int)? = null,
+    parentHeightProvider: (() -> Int)? = null
 ): EmbeddedSize =
     EmbeddedSize(
         width = width.toEmbeddedDimension(parentWidthProvider),
diff --git a/urbanairship-automation/src/main/java/com/urbanairship/embedded/AirshipEmbeddedView.kt b/urbanairship-automation/src/main/java/com/urbanairship/embedded/AirshipEmbeddedView.kt
index 2f9ef629c..741c89f96 100644
--- a/urbanairship-automation/src/main/java/com/urbanairship/embedded/AirshipEmbeddedView.kt
+++ b/urbanairship-automation/src/main/java/com/urbanairship/embedded/AirshipEmbeddedView.kt
@@ -28,6 +28,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancelChildren
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 
 /**
@@ -219,6 +220,7 @@ public class AirshipEmbeddedView private constructor(
         displayRequestsJob = viewScope.launch {
             try {
                 manager.displayRequests(embeddedViewId = id, comparator = comparator, scope = viewScope)
+                    .map { it.next }
                     .collect(::onUpdate)
             } catch (e: CancellationException) {
                 UALog.v { "Stopped collecting display requests for $logTag" }
diff --git a/urbanairship-automation/src/main/java/com/urbanairship/embedded/EmbeddedViewManager.kt b/urbanairship-automation/src/main/java/com/urbanairship/embedded/EmbeddedViewManager.kt
index 05aba2b69..feb2c89f1 100644
--- a/urbanairship-automation/src/main/java/com/urbanairship/embedded/EmbeddedViewManager.kt
+++ b/urbanairship-automation/src/main/java/com/urbanairship/embedded/EmbeddedViewManager.kt
@@ -6,6 +6,7 @@ import androidx.annotation.RestrictTo
 import com.urbanairship.UALog
 import com.urbanairship.android.layout.AirshipEmbeddedViewManager
 import com.urbanairship.android.layout.EmbeddedDisplayRequest
+import com.urbanairship.android.layout.EmbeddedDisplayRequestResult
 import com.urbanairship.android.layout.display.DisplayArgs
 import com.urbanairship.android.layout.info.LayoutInfo
 import com.urbanairship.json.JsonMap
@@ -20,7 +21,6 @@ import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.flatMapConcat
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.shareIn
 
 /** @hide */
@@ -28,8 +28,8 @@ import kotlinx.coroutines.flow.shareIn
 public object EmbeddedViewManager : AirshipEmbeddedViewManager {
 
     private val pending: MutableMap<String, List<EmbeddedDisplayRequest>> = mutableMapOf()
-
     private val viewsFlow = MutableStateFlow<Map<String, List<EmbeddedDisplayRequest>>>(emptyMap())
+
     private val lastViewed: MutableMap<String, String> = mutableMapOf()
     private val lastViewedLock =  ReentrantLock()
 
@@ -95,7 +95,7 @@ public object EmbeddedViewManager : AirshipEmbeddedViewManager {
         embeddedViewId: String,
         comparator: Comparator<AirshipEmbeddedInfo>?,
         scope: CoroutineScope,
-    ): Flow<EmbeddedDisplayRequest?> {
+    ): Flow<EmbeddedDisplayRequestResult> {
 
         // This assumes displayRequests will be subscribed only when its actually
         // visible/attached to window. The first thing that subscribes will cause any
@@ -119,22 +119,23 @@ public object EmbeddedViewManager : AirshipEmbeddedViewManager {
                        // Map the list back to just the request, with the sort order applied
                        ?.map { it.second }
                 } else {
-                    list[embeddedViewId]?.sortedBy { it.priority }
+                    list[embeddedViewId]
                 }
 
                 sorted.orEmpty()
             }
             .map { list ->
                 if (comparator != null) {
-                    list.firstOrNull()
+                    EmbeddedDisplayRequestResult(next = list.firstOrNull(), list = list)
                 } else {
-                    lastViewedLock.withLock {
+                    val current = lastViewedLock.withLock {
                         lastViewed[embeddedViewId]?.let { lastId ->
                             list.find { it.viewInstanceId == lastId }
-                        } ?: list.firstOrNull()?.also {
+                        } ?: list.minByOrNull { it.priority }?.also {
                             lastViewed[embeddedViewId] = it.viewInstanceId
                         }
                     }
+                    EmbeddedDisplayRequestResult(next = current, list =  list)
                 }
             }
             .distinctUntilChanged()
diff --git a/urbanairship-automation/src/test/java/com/urbanairship/embedded/EmbeddedViewManagerTest.kt b/urbanairship-automation/src/test/java/com/urbanairship/embedded/EmbeddedViewManagerTest.kt
index 6ddf5531a..27dc04c02 100644
--- a/urbanairship-automation/src/test/java/com/urbanairship/embedded/EmbeddedViewManagerTest.kt
+++ b/urbanairship-automation/src/test/java/com/urbanairship/embedded/EmbeddedViewManagerTest.kt
@@ -31,16 +31,16 @@ public class EmbeddedViewManagerTest {
         val job = Job()
         EmbeddedViewManager.displayRequests(testEmbeddedId, scope = this + job).test {
             addPending("low priority", 100)
-            assertEquals("low priority", awaitItem()?.viewInstanceId);
+            assertEquals("low priority", awaitItem().next?.viewInstanceId);
             addPending("medium priority", 0)
             addPending("high priority", -100)
             cancelAndIgnoreRemainingEvents()
         }
 
         EmbeddedViewManager.displayRequests(testEmbeddedId, scope = this + job).test {
-            assertEquals("low priority", awaitItem()?.viewInstanceId);
+            assertEquals("low priority", awaitItem().next?.viewInstanceId);
             EmbeddedViewManager.dismiss(testEmbeddedId, "low priority")
-            assertEquals("high priority", awaitItem()?.viewInstanceId);
+            assertEquals("high priority", awaitItem().next?.viewInstanceId);
             cancelAndIgnoreRemainingEvents()
         }
         job.cancel()
@@ -55,10 +55,10 @@ public class EmbeddedViewManagerTest {
 
         val job = Job()
         EmbeddedViewManager.displayRequests(testEmbeddedId, scope = this + job).test {
-            assertEquals("high priority", awaitItem()?.viewInstanceId);
+            assertEquals("high priority", awaitItem().next?.viewInstanceId);
             EmbeddedViewManager.dismiss(testEmbeddedId, "high priority")
 
-            assertEquals("medium priority", awaitItem()?.viewInstanceId);
+            assertEquals("medium priority", awaitItem().next?.viewInstanceId);
             EmbeddedViewManager.dismiss(testEmbeddedId, "medium priority")
 
             addPending("low priority", 0)
@@ -81,18 +81,18 @@ public class EmbeddedViewManagerTest {
             comparator = compareByDescending { it.priority },
             scope = this + job
         ).test {
-            assertEquals("low priority", awaitItem()?.viewInstanceId);
+            assertEquals("low priority", awaitItem().next?.viewInstanceId);
             cancelAndIgnoreRemainingEvents()
         }
 
         // Make sure standard sort still works
         EmbeddedViewManager.displayRequests(testEmbeddedId, scope = this + job).test {
-            assertEquals("medium priority", awaitItem()?.viewInstanceId);
+            assertEquals("medium priority", awaitItem().next?.viewInstanceId);
             cancelAndIgnoreRemainingEvents()
         }
         addPending("high priority", -100)
         EmbeddedViewManager.displayRequests(testEmbeddedId, scope = this + job).test {
-            assertEquals("medium priority", awaitItem()?.viewInstanceId);
+            assertEquals("medium priority", awaitItem().next?.viewInstanceId);
             cancelAndIgnoreRemainingEvents()
         }
 
diff --git a/urbanairship-debug/src/main/res/values/style.xml b/urbanairship-debug/src/main/res/values/style.xml
index 8c0673d11..0453088f0 100644
--- a/urbanairship-debug/src/main/res/values/style.xml
+++ b/urbanairship-debug/src/main/res/values/style.xml
@@ -10,7 +10,6 @@
         <item name="colorOnPrimary">#ffffff</item>
         <item name="colorOnSecondary">#000000</item>
         <item name="android:statusBarColor" tools:targetApi="lollipop">#0023ca</item>
-        <item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>
     </style>
 
     <style name="Widget.AirshipDebug.TextInputLayout" parent="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox" />
diff --git a/urbanairship-layout/src/main/java/com/urbanairship/android/layout/AirshipEmbeddedViewManager.kt b/urbanairship-layout/src/main/java/com/urbanairship/android/layout/AirshipEmbeddedViewManager.kt
index 3a0cb52ae..2a194fcff 100644
--- a/urbanairship-layout/src/main/java/com/urbanairship/android/layout/AirshipEmbeddedViewManager.kt
+++ b/urbanairship-layout/src/main/java/com/urbanairship/android/layout/AirshipEmbeddedViewManager.kt
@@ -72,5 +72,9 @@ public interface AirshipEmbeddedViewManager {
         embeddedViewId: String,
         comparator: Comparator<AirshipEmbeddedInfo>? = null,
         scope: CoroutineScope
-    ): Flow<EmbeddedDisplayRequest?>
+    ): Flow<EmbeddedDisplayRequestResult>
 }
+
+/** @hide */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+public data class EmbeddedDisplayRequestResult(public val next: EmbeddedDisplayRequest?, public val list: List<EmbeddedDisplayRequest>)
diff --git a/urbanairship-layout/src/main/java/com/urbanairship/android/layout/environment/LayoutState.kt b/urbanairship-layout/src/main/java/com/urbanairship/android/layout/environment/LayoutState.kt
index 641dce7d6..0743a7ba3 100644
--- a/urbanairship-layout/src/main/java/com/urbanairship/android/layout/environment/LayoutState.kt
+++ b/urbanairship-layout/src/main/java/com/urbanairship/android/layout/environment/LayoutState.kt
@@ -18,24 +18,6 @@ internal class LayoutState(
     val radio: SharedState<State.Radio>?,
     val layout: SharedState<State.Layout>?,
 ) {
-    fun override(
-        pagerState: SharedState<State.Pager>?,
-        formState: SharedState<State.Form>?,
-        parentForm: SharedState<State.Form>?,
-        checkboxState: SharedState<State.Checkbox>?,
-        radioState: SharedState<State.Radio>?,
-        layoutState: SharedState<State.Layout>?,
-    ): LayoutState {
-        return LayoutState(
-            pager = pagerState ?: this.pager,
-            form = formState ?: this.form,
-            parentForm = parentForm ?: this.parentForm,
-            checkbox = checkboxState ?: this.checkbox,
-            radio = radioState ?: this.radio,
-            layout = layoutState ?: this.layout,
-        )
-    }
-
     fun reportingContext(
         formContext: FormInfo? = null,
         pagerContext: PagerData? = null,
diff --git a/urbanairship-layout/src/main/java/com/urbanairship/android/layout/ui/EmbeddedLayout.kt b/urbanairship-layout/src/main/java/com/urbanairship/android/layout/ui/EmbeddedLayout.kt
index 084820985..124c27d60 100644
--- a/urbanairship-layout/src/main/java/com/urbanairship/android/layout/ui/EmbeddedLayout.kt
+++ b/urbanairship-layout/src/main/java/com/urbanairship/android/layout/ui/EmbeddedLayout.kt
@@ -127,6 +127,7 @@ public class EmbeddedLayout(
             override fun onDestroy(owner: LifecycleOwner) {
                 // Clean up the view model store when the activity is destroyed.
                 onDisplayFinished()
+                activity.lifecycle.removeObserver(this)
             }
         })
 
@@ -224,15 +225,13 @@ public class EmbeddedLayout(
 
     @MainThread
     private fun onDisplayFinished() {
-        UALog.v("Embedded content finished displaying! $embeddedViewId")
+        UALog.v("Embedded content finished displaying! $embeddedViewId, $viewInstanceId")
         layoutScope.cancel()
         EmbeddedViewModelStore.clear()
     }
 
     private fun observeLayoutEvents(events: Flow<LayoutEvent>) = layoutScope.launch {
-        events
-            .filterIsInstance<LayoutEvent.Finish>()
-            .take(1)
+        events.filterIsInstance<LayoutEvent.Finish>()
             .collect { dismiss() }
     }
 
diff --git a/urbanairship-layout/src/main/res/values/style_airship_layout.xml b/urbanairship-layout/src/main/res/values/style_airship_layout.xml
index 24a14621b..d5b91e70e 100644
--- a/urbanairship-layout/src/main/res/values/style_airship_layout.xml
+++ b/urbanairship-layout/src/main/res/values/style_airship_layout.xml
@@ -3,7 +3,6 @@
 
     <style name="UrbanAirship.Layout" parent="Theme.MaterialComponents.DayNight.NoActionBar"/>
 
-
     <style name="UrbanAirship.Layout.ModalActivityBase">
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:colorBackgroundCacheHint">@null</item>
@@ -12,7 +11,6 @@
         <item name="android:windowActionBar">false</item>
         <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>
     </style>
 
     <style name="UrbanAirship.Layout.ModalActivity" parent="UrbanAirship.Layout.ModalActivityBase" />
diff --git a/urbanairship-message-center/src/main/AndroidManifest.xml b/urbanairship-message-center/src/main/AndroidManifest.xml
index 8cfa9a9d2..c14aa335b 100644
--- a/urbanairship-message-center/src/main/AndroidManifest.xml
+++ b/urbanairship-message-center/src/main/AndroidManifest.xml
@@ -6,12 +6,12 @@
 
         <activity
             android:name="com.urbanairship.messagecenter.MessageActivity"
-            android:theme="@style/UrbanAirship.MessageCenter.NoEdgeToEdge"
+            android:theme="@style/UrbanAirship.MessageCenter.Activity"
             android:exported="false" />
 
         <activity
             android:name="com.urbanairship.messagecenter.MessageCenterActivity"
-            android:theme="@style/UrbanAirship.MessageCenter.NoEdgeToEdge"
+            android:theme="@style/UrbanAirship.MessageCenter.Activity"
             android:exported="false"
             android:label="@string/ua_message_center_title" />
 
diff --git a/urbanairship-message-center/src/main/res/values/style_message_center.xml b/urbanairship-message-center/src/main/res/values/style_message_center.xml
index 0969db2a9..9e08dc7a8 100644
--- a/urbanairship-message-center/src/main/res/values/style_message_center.xml
+++ b/urbanairship-message-center/src/main/res/values/style_message_center.xml
@@ -2,8 +2,8 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!--- MESSAGE CENTER -->
 
-    <style name="UrbanAirship.MessageCenter.NoEdgeToEdge" parent="Theme.AppCompat.DayNight">
-        <item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>
+    <!-- Base style for Message Center and Message Activities -->
+    <style name="UrbanAirship.MessageCenter.Activity" parent="Theme.AppCompat.DayNight">
     </style>
 
     <!-- Item Container -->
diff --git a/urbanairship-preference-center/src/main/res/values/style_preference_center.xml b/urbanairship-preference-center/src/main/res/values/style_preference_center.xml
index 1e053d7ed..6abd20197 100644
--- a/urbanairship-preference-center/src/main/res/values/style_preference_center.xml
+++ b/urbanairship-preference-center/src/main/res/values/style_preference_center.xml
@@ -24,7 +24,6 @@
 
     <!-- Default Activity -->
     <style name="UrbanAirship.PreferenceCenter.Activity" parent="@style/UrbanAirship.PreferenceCenter.Base">
-        <item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>
     </style>
 
     <!-- Default Fragment -->