From e3832a84e2c59f734ce969da380cdba830c2e7aa Mon Sep 17 00:00:00 2001
From: Kenneth Ford <kennethford@google.com>
Date: Thu, 6 Jul 2023 21:44:41 +0000
Subject: [PATCH 01/12] Update rear display mode API's

Removes session-based API for rear display mode
to better reflect that the entire device
is moving to the rear facing display, as well
as how it is sticky even if the app that requests
the move is backgrounded or killed.

This CL also updates the presentContentOnWindowArea method
to take a WindowAreaToken object instead of a Binder token

Moves the `WindowAreaInfo#getActiveSession` API to be
more correctly on the `WindowAreaController`.

This is a breaking CL in the attempt to stabilize and remove
the experimental tag on the Window Area API's.

Relnote: "Renamed transferActivityToWindowArea to transferToWindowArea
 to be clearer about the behavior when triggering the feature. This also
 removes the session based behavior for this method as it's an operation
 that outlives the process that requests it."
Bug: 271644150
Fixes: 273807246
Fixes: 272064992
Fixes: 473870239
Test: WindowAreaControllerImplTest
Change-Id: Ie7d6fa7258d323363748e25fade8d658c1f0f510
---
 .../area/RearDisplayActivityConfigChanges.kt  | 166 ++++------
 .../area/RearDisplayPresentationActivity.kt   |  85 +++--
 .../main/res/layout/activity_rear_display.xml |  11 -
 window/window-java/api/current.txt            |  15 +-
 window/window-java/api/restricted_current.txt |  15 +-
 .../WindowAreaControllerCallbackAdapter.kt    |  62 ++--
 window/window-testing/api/current.txt         |  13 +
 .../window-testing/api/restricted_current.txt |  13 +
 .../window/testing/area/WindowAreaTesting.kt  |  44 +++
 window/window/api/current.txt                 |  84 +++--
 window/window/api/restricted_current.txt      |  84 +++--
 .../area/WindowAreaControllerImplTest.kt      | 309 ++++++++----------
 .../window/area/WindowAreaControllerTest.kt   |  34 +-
 .../area/EmptyWindowAreaControllerImpl.kt     |  33 +-
 .../window/area/RearDisplaySessionImpl.kt     |  29 --
 .../java/androidx/window/area/WindowArea.kt   | 101 ++++++
 .../window/area/WindowAreaCapability.kt       |  77 +++--
 .../window/area/WindowAreaController.kt       | 136 ++++----
 .../window/area/WindowAreaControllerImpl.kt   | 286 +++++++++-------
 .../androidx/window/area/WindowAreaInfo.kt    | 133 --------
 .../androidx/window/area/WindowAreaSession.kt |  31 --
 .../window/area/WindowAreaSessionCallback.kt  |  43 ---
 .../window/area/WindowAreaSessionPresenter.kt |   5 +-
 .../androidx/window/area/WindowAreaToken.kt   |  45 +++
 .../window/area/adapter/WindowAreaAdapter.kt  |   2 -
 .../area/adapter/WindowAreaAdapterApi3.kt     |   2 -
 .../area/adapter/WindowAreaAdapterApi4.kt     |   2 -
 27 files changed, 925 insertions(+), 935 deletions(-)
 create mode 100644 window/window-testing/src/main/java/androidx/window/testing/area/WindowAreaTesting.kt
 delete mode 100644 window/window/src/main/java/androidx/window/area/RearDisplaySessionImpl.kt
 create mode 100644 window/window/src/main/java/androidx/window/area/WindowArea.kt
 delete mode 100644 window/window/src/main/java/androidx/window/area/WindowAreaInfo.kt
 delete mode 100644 window/window/src/main/java/androidx/window/area/WindowAreaSession.kt
 delete mode 100644 window/window/src/main/java/androidx/window/area/WindowAreaSessionCallback.kt
 create mode 100644 window/window/src/main/java/androidx/window/area/WindowAreaToken.kt

diff --git a/window/window-demos/demo/src/main/java/androidx/window/demo/area/RearDisplayActivityConfigChanges.kt b/window/window-demos/demo/src/main/java/androidx/window/demo/area/RearDisplayActivityConfigChanges.kt
index 8bfc49d7a804e..7b3bf88aa875a 100644
--- a/window/window-demos/demo/src/main/java/androidx/window/demo/area/RearDisplayActivityConfigChanges.kt
+++ b/window/window-demos/demo/src/main/java/androidx/window/demo/area/RearDisplayActivityConfigChanges.kt
@@ -18,17 +18,10 @@ package androidx.window.demo.area
 
 import android.os.Bundle
 import androidx.core.content.ContextCompat
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
-import androidx.window.area.WindowAreaCapability.Operation.Companion.OPERATION_TRANSFER_ACTIVITY_TO_AREA
-import androidx.window.area.WindowAreaCapability.Status.Companion.WINDOW_AREA_STATUS_AVAILABLE
-import androidx.window.area.WindowAreaCapability.Status.Companion.WINDOW_AREA_STATUS_UNAVAILABLE
-import androidx.window.area.WindowAreaCapability.Status.Companion.WINDOW_AREA_STATUS_UNSUPPORTED
+import androidx.core.util.Consumer
+import androidx.window.area.WindowArea
+import androidx.window.area.WindowAreaCapability
 import androidx.window.area.WindowAreaController
-import androidx.window.area.WindowAreaInfo
-import androidx.window.area.WindowAreaSession
-import androidx.window.area.WindowAreaSessionCallback
 import androidx.window.core.ExperimentalWindowApi
 import androidx.window.demo.common.EdgeToEdgeActivity
 import androidx.window.demo.common.infolog.InfoLogAdapter
@@ -37,24 +30,36 @@ import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
 import java.util.concurrent.Executor
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 
 /**
  * Demo Activity that showcases listening for RearDisplay Status as well as enabling/disabling
- * RearDisplay mode. This Activity implements [WindowAreaSessionCallback] for simplicity.
- *
- * This Activity overrides configuration changes for simplicity.
+ * RearDisplay mode.
  */
 @OptIn(ExperimentalWindowApi::class)
-class RearDisplayActivityConfigChanges : EdgeToEdgeActivity(), WindowAreaSessionCallback {
+class RearDisplayActivityConfigChanges : EdgeToEdgeActivity() {
 
     private lateinit var windowAreaController: WindowAreaController
-    private var rearDisplaySession: WindowAreaSession? = null
+    private var rearDisplayWindowArea: WindowArea? = null
+    private var rearDisplayStatus: WindowAreaCapability.Status =
+        WindowAreaCapability.Status.WINDOW_AREA_STATUS_UNSUPPORTED
     private val infoLogAdapter = InfoLogAdapter()
     private lateinit var binding: ActivityRearDisplayBinding
     private lateinit var executor: Executor
-    private var currentWindowAreaInfo: WindowAreaInfo? = null
+
+    private val windowAreaListener =
+        Consumer<List<WindowArea>> { windowAreas ->
+            for (windowArea in windowAreas) {
+                if (windowArea.type == WindowArea.Type.TYPE_REAR_FACING) {
+                    rearDisplayWindowArea = windowArea
+                    break
+                }
+            }
+            val status = getRearDisplayStatus(rearDisplayWindowArea)
+            infoLogAdapter.append(getCurrentTimeString(), status.toString())
+            infoLogAdapter.notifyDataSetChanged()
+            rearDisplayStatus = status
+            updateRearDisplayButton()
+        }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -66,104 +71,49 @@ class RearDisplayActivityConfigChanges : EdgeToEdgeActivity(), WindowAreaSession
 
         binding.rearStatusRecyclerView.adapter = infoLogAdapter
 
-        lifecycleScope.launch(Dispatchers.Main) {
-            // The block passed to repeatOnLifecycle is executed when the lifecycle
-            // is at least STARTED and is cancelled when the lifecycle is STOPPED.
-            // It automatically restarts the block when the lifecycle is STARTED again.
-            lifecycle.repeatOnLifecycle(Lifecycle.State.STARTED) {
-                // Safely collect from windowInfoRepo when the lifecycle is STARTED
-                // and stops collection when the lifecycle is STOPPED
-                windowAreaController.windowAreaInfos.collect { windowAreaInfos ->
-                    infoLogAdapter.appendAndNotify(
-                        getCurrentTimeString(),
-                        "number of areas: " + windowAreaInfos.size,
-                    )
-                    windowAreaInfos.forEach { windowAreaInfo ->
-                        if (windowAreaInfo.type == WindowAreaInfo.Type.TYPE_REAR_FACING) {
-                            currentWindowAreaInfo = windowAreaInfo
-                            val transferCapability =
-                                windowAreaInfo.getCapability(OPERATION_TRANSFER_ACTIVITY_TO_AREA)
-                            infoLogAdapter.append(
-                                getCurrentTimeString(),
-                                transferCapability.status.toString() +
-                                    " : " +
-                                    windowAreaInfo.metrics.toString(),
-                            )
-                            updateRearDisplayButton()
-                        }
-                    }
-                    infoLogAdapter.notifyDataSetChanged()
-                }
-            }
-        }
-
         binding.rearDisplayButton.setOnClickListener {
-            if (rearDisplaySession != null) {
-                rearDisplaySession?.close()
-            } else {
-                currentWindowAreaInfo?.let {
-                    windowAreaController.transferActivityToWindowArea(
-                        it.token,
-                        this,
-                        executor,
-                        this,
+            if (rearDisplayStatus == WindowAreaCapability.Status.WINDOW_AREA_STATUS_ACTIVE) {
+                WindowAreaController.getOrCreate()
+                    .transferToWindowArea(
+                        windowAreaToken = null,
+                        activity = this@RearDisplayActivityConfigChanges,
                     )
-                }
-            }
-        }
-
-        binding.rearDisplaySessionButton.setOnClickListener {
-            if (rearDisplaySession == null) {
-                try {
-                    rearDisplaySession =
-                        currentWindowAreaInfo?.getActiveSession(OPERATION_TRANSFER_ACTIVITY_TO_AREA)
-                    updateRearDisplayButton()
-                } catch (e: IllegalStateException) {
-                    infoLogAdapter.appendAndNotify(getCurrentTimeString(), e.toString())
+            } else {
+                rearDisplayWindowArea?.let { windowArea ->
+                    WindowAreaController.getOrCreate()
+                        .transferToWindowArea(windowAreaToken = windowArea.token, activity = this)
                 }
             }
         }
     }
 
-    override fun onSessionStarted(session: WindowAreaSession) {
-        rearDisplaySession = session
-        infoLogAdapter.appendAndNotify(
-            getCurrentTimeString(),
-            "RearDisplay Session has been started",
-        )
-        updateRearDisplayButton()
+    override fun onStart() {
+        super.onStart()
+        windowAreaController.addWindowAreasListener(executor, windowAreaListener)
     }
 
-    override fun onSessionEnded(t: Throwable?) {
-        rearDisplaySession = null
-        infoLogAdapter.appendAndNotify(getCurrentTimeString(), "RearDisplay Session has ended")
-        updateRearDisplayButton()
+    override fun onStop() {
+        super.onStop()
+        windowAreaController.removeWindowAreasListener(windowAreaListener)
     }
 
     private fun updateRearDisplayButton() {
-        if (rearDisplaySession != null) {
-            binding.rearDisplayButton.isEnabled = true
-            binding.rearDisplayButton.text = "Disable RearDisplay Mode"
-            return
-        }
-        currentWindowAreaInfo?.let { windowAreaInfo ->
-            when (windowAreaInfo.getCapability(OPERATION_TRANSFER_ACTIVITY_TO_AREA).status) {
-                WINDOW_AREA_STATUS_UNSUPPORTED -> {
-                    binding.rearDisplayButton.isEnabled = false
-                    binding.rearDisplayButton.text = "RearDisplay is not supported on this device"
-                }
-                WINDOW_AREA_STATUS_UNAVAILABLE -> {
-                    binding.rearDisplayButton.isEnabled = false
-                    binding.rearDisplayButton.text = "RearDisplay is not currently available"
-                }
-                WINDOW_AREA_STATUS_AVAILABLE -> {
-                    binding.rearDisplayButton.isEnabled = true
-                    binding.rearDisplayButton.text = "Enable RearDisplay Mode"
-                }
-                else -> {
-                    binding.rearDisplayButton.isEnabled = false
-                    binding.rearDisplayButton.text = "RearDisplay is not supported on this device"
-                }
+        when (rearDisplayStatus) {
+            WindowAreaCapability.Status.WINDOW_AREA_STATUS_UNSUPPORTED -> {
+                binding.rearDisplayButton.isEnabled = false
+                binding.rearDisplayButton.text = "RearDisplay is not supported on this device"
+            }
+            WindowAreaCapability.Status.WINDOW_AREA_STATUS_UNAVAILABLE -> {
+                binding.rearDisplayButton.isEnabled = false
+                binding.rearDisplayButton.text = "RearDisplay is not currently available"
+            }
+            WindowAreaCapability.Status.WINDOW_AREA_STATUS_AVAILABLE -> {
+                binding.rearDisplayButton.isEnabled = true
+                binding.rearDisplayButton.text = "Enable RearDisplay Mode"
+            }
+            WindowAreaCapability.Status.WINDOW_AREA_STATUS_ACTIVE -> {
+                binding.rearDisplayButton.isEnabled = true
+                binding.rearDisplayButton.text = "Disable RearDisplay Mode"
             }
         }
     }
@@ -174,6 +124,14 @@ class RearDisplayActivityConfigChanges : EdgeToEdgeActivity(), WindowAreaSession
         return currentDate.toString()
     }
 
+    private fun getRearDisplayStatus(windowArea: WindowArea?): WindowAreaCapability.Status {
+        val status =
+            windowArea
+                ?.getCapability(WindowAreaCapability.Operation.OPERATION_TRANSFER_TO_AREA)
+                ?.status
+        return status ?: WindowAreaCapability.Status.WINDOW_AREA_STATUS_UNSUPPORTED
+    }
+
     private companion object {
         private val TAG = RearDisplayActivityConfigChanges::class.java.simpleName
     }
diff --git a/window/window-demos/demo/src/main/java/androidx/window/demo/area/RearDisplayPresentationActivity.kt b/window/window-demos/demo/src/main/java/androidx/window/demo/area/RearDisplayPresentationActivity.kt
index d59f57e09dd4a..f20166c28f558 100644
--- a/window/window-demos/demo/src/main/java/androidx/window/demo/area/RearDisplayPresentationActivity.kt
+++ b/window/window-demos/demo/src/main/java/androidx/window/demo/area/RearDisplayPresentationActivity.kt
@@ -19,14 +19,12 @@ package androidx.window.demo.area
 import android.content.Context
 import android.os.Bundle
 import android.view.LayoutInflater
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
+import androidx.core.util.Consumer
+import androidx.window.area.WindowArea
+import androidx.window.area.WindowArea.Type.Companion.TYPE_REAR_FACING
 import androidx.window.area.WindowAreaCapability
 import androidx.window.area.WindowAreaCapability.Operation.Companion.OPERATION_PRESENT_ON_AREA
 import androidx.window.area.WindowAreaController
-import androidx.window.area.WindowAreaInfo
-import androidx.window.area.WindowAreaInfo.Type.Companion.TYPE_REAR_FACING
 import androidx.window.area.WindowAreaPresentationSessionCallback
 import androidx.window.area.WindowAreaSessionPresenter
 import androidx.window.core.ExperimentalWindowApi
@@ -37,12 +35,11 @@ import androidx.window.demo.databinding.ActivityRearDisplayPresentationBinding
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
+import kotlin.toString
 
 /**
  * Demo Activity that showcases listening for the status of the [OPERATION_PRESENT_ON_AREA]
- * operation on a [WindowAreaInfo] of type [TYPE_REAR_FACING] as well as enabling/disabling a
+ * operation on a [WindowArea] of type [TYPE_REAR_FACING] as well as enabling/disabling a
  * presentation session on that window area. This Activity implements
  * [WindowAreaPresentationSessionCallback] for simplicity.
  *
@@ -53,12 +50,35 @@ class RearDisplayPresentationActivity :
     EdgeToEdgeActivity(), WindowAreaPresentationSessionCallback {
 
     private var activePresentation: WindowAreaSessionPresenter? = null
-    private var currentWindowAreaInfo: WindowAreaInfo? = null
+    private var currentWindowArea: WindowArea? = null
     private lateinit var windowAreaController: WindowAreaController
     private val infoLogAdapter = InfoLogAdapter()
 
     private lateinit var binding: ActivityRearDisplayPresentationBinding
 
+    private val windowAreaListener =
+        Consumer<List<WindowArea>> { windowAreas ->
+            infoLogAdapter.appendAndNotify(
+                getCurrentTimeString(),
+                "number of areas: " + windowAreas.size,
+            )
+
+            for (windowArea in windowAreas) {
+                if (windowArea.type == TYPE_REAR_FACING) {
+                    currentWindowArea = windowArea
+                    val presentCapability = windowArea.getCapability(OPERATION_PRESENT_ON_AREA)
+                    infoLogAdapter.append(
+                        getCurrentTimeString(),
+                        presentCapability.status.toString() +
+                            " : " +
+                            windowArea.windowMetrics.toString(),
+                    )
+                    updateRearDisplayPresentationButton()
+                }
+            }
+            infoLogAdapter.notifyDataSetChanged()
+        }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -68,44 +88,13 @@ class RearDisplayPresentationActivity :
         setContentView(binding.root)
         binding.rearStatusRecyclerView.adapter = infoLogAdapter
 
-        lifecycleScope.launch(Dispatchers.Main) {
-            // The block passed to repeatOnLifecycle is executed when the lifecycle
-            // is at least STARTED and is cancelled when the lifecycle is STOPPED.
-            // It automatically restarts the block when the lifecycle is STARTED again.
-            lifecycle.repeatOnLifecycle(Lifecycle.State.STARTED) {
-                // Safely collect from windowInfoRepo when the lifecycle is STARTED
-                // and stops collection when the lifecycle is STOPPED
-                windowAreaController.windowAreaInfos.collect { windowAreaInfos ->
-                    infoLogAdapter.appendAndNotify(
-                        getCurrentTimeString(),
-                        "number of areas: " + windowAreaInfos.size,
-                    )
-                    windowAreaInfos.forEach { windowAreaInfo ->
-                        if (windowAreaInfo.type == TYPE_REAR_FACING) {
-                            currentWindowAreaInfo = windowAreaInfo
-                            val presentCapability =
-                                windowAreaInfo.getCapability(OPERATION_PRESENT_ON_AREA)
-                            infoLogAdapter.append(
-                                getCurrentTimeString(),
-                                presentCapability.status.toString() +
-                                    " : " +
-                                    windowAreaInfo.metrics.toString(),
-                            )
-                            updateRearDisplayPresentationButton()
-                        }
-                    }
-                    infoLogAdapter.notifyDataSetChanged()
-                }
-            }
-        }
-
         binding.rearDisplayPresentationButton.setOnClickListener {
             if (activePresentation != null) {
                 activePresentation?.close()
             } else {
-                currentWindowAreaInfo?.let {
+                currentWindowArea?.let { windowArea ->
                     windowAreaController.presentContentOnWindowArea(
-                        it.token,
+                        windowArea.token,
                         this@RearDisplayPresentationActivity,
                         { obj: Runnable -> obj.run() },
                         this@RearDisplayPresentationActivity,
@@ -115,6 +104,16 @@ class RearDisplayPresentationActivity :
         }
     }
 
+    override fun onStart() {
+        super.onStart()
+        windowAreaController.addWindowAreasListener(Runnable::run, windowAreaListener)
+    }
+
+    override fun onStop() {
+        super.onStop()
+        windowAreaController.removeWindowAreasListener(windowAreaListener)
+    }
+
     override fun onSessionStarted(session: WindowAreaSessionPresenter) {
         infoLogAdapter.appendAndNotify(
             getCurrentTimeString(),
@@ -151,7 +150,7 @@ class RearDisplayPresentationActivity :
             binding.rearDisplayPresentationButton.text = "Disable rear display presentation"
             return
         }
-        when (currentWindowAreaInfo?.getCapability(OPERATION_PRESENT_ON_AREA)?.status) {
+        when (currentWindowArea?.getCapability(OPERATION_PRESENT_ON_AREA)?.status) {
             WindowAreaCapability.Status.WINDOW_AREA_STATUS_UNSUPPORTED -> {
                 binding.rearDisplayPresentationButton.isEnabled = false
                 binding.rearDisplayPresentationButton.text =
diff --git a/window/window-demos/demo/src/main/res/layout/activity_rear_display.xml b/window/window-demos/demo/src/main/res/layout/activity_rear_display.xml
index 9d0c9c34b7140..43bea60147c6a 100644
--- a/window/window-demos/demo/src/main/res/layout/activity_rear_display.xml
+++ b/window/window-demos/demo/src/main/res/layout/activity_rear_display.xml
@@ -37,17 +37,6 @@
         android:layout_marginBottom="32dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/rear_display_session_button" />
-
-    <Button
-        android:id="@+id/rear_display_session_button"
-        android:text="Get active session if available"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAlignment="center"
-        android:layout_marginBottom="32dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toBottomOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/window/window-java/api/current.txt b/window/window-java/api/current.txt
index ba58325519a4a..7da5604b0fe00 100644
--- a/window/window-java/api/current.txt
+++ b/window/window-java/api/current.txt
@@ -1,14 +1,13 @@
 // Signature format: 4.0
-package @SuppressCompatibility androidx.window.java.area {
+package androidx.window.java.area {
 
-  @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public final class WindowAreaControllerCallbackAdapter extends androidx.window.area.WindowAreaController {
+  public final class WindowAreaControllerCallbackAdapter {
     ctor public WindowAreaControllerCallbackAdapter(androidx.window.area.WindowAreaController controller);
-    method public void addWindowAreaInfoListListener(java.util.concurrent.Executor executor, androidx.core.util.Consumer<java.util.List<androidx.window.area.WindowAreaInfo>> listener);
-    method @InaccessibleFromKotlin public kotlinx.coroutines.flow.Flow<java.util.List<androidx.window.area.WindowAreaInfo>> getWindowAreaInfos();
-    method public void presentContentOnWindowArea(android.os.Binder token, android.app.Activity activity, java.util.concurrent.Executor executor, androidx.window.area.WindowAreaPresentationSessionCallback windowAreaPresentationSessionCallback);
-    method public void removeWindowAreaInfoListListener(androidx.core.util.Consumer<java.util.List<androidx.window.area.WindowAreaInfo>> listener);
-    method public void transferActivityToWindowArea(android.os.Binder token, android.app.Activity activity, java.util.concurrent.Executor executor, androidx.window.area.WindowAreaSessionCallback windowAreaSessionCallback);
-    property public kotlinx.coroutines.flow.Flow<java.util.List<androidx.window.area.WindowAreaInfo>> windowAreaInfos;
+    method public void addWindowAreasListener(java.util.concurrent.Executor executor, androidx.core.util.Consumer<java.util.List<androidx.window.area.WindowArea>> listener);
+    method @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public androidx.window.area.WindowAreaSessionPresenter getActivePresentationSession(androidx.window.area.WindowAreaToken windowAreaToken);
+    method @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public void presentContentOnWindowArea(androidx.window.area.WindowAreaToken windowAreaToken, android.app.Activity activity, java.util.concurrent.Executor executor, androidx.window.area.WindowAreaPresentationSessionCallback windowAreaPresentationSessionCallback);
+    method public void removeWindowAreasListener(androidx.core.util.Consumer<java.util.List<androidx.window.area.WindowArea>> listener);
+    method public void transferToWindowArea(androidx.window.area.WindowAreaToken? windowAreaToken, android.app.Activity activity);
   }
 
 }
diff --git a/window/window-java/api/restricted_current.txt b/window/window-java/api/restricted_current.txt
index ba58325519a4a..7da5604b0fe00 100644
--- a/window/window-java/api/restricted_current.txt
+++ b/window/window-java/api/restricted_current.txt
@@ -1,14 +1,13 @@
 // Signature format: 4.0
-package @SuppressCompatibility androidx.window.java.area {
+package androidx.window.java.area {
 
-  @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public final class WindowAreaControllerCallbackAdapter extends androidx.window.area.WindowAreaController {
+  public final class WindowAreaControllerCallbackAdapter {
     ctor public WindowAreaControllerCallbackAdapter(androidx.window.area.WindowAreaController controller);
-    method public void addWindowAreaInfoListListener(java.util.concurrent.Executor executor, androidx.core.util.Consumer<java.util.List<androidx.window.area.WindowAreaInfo>> listener);
-    method @InaccessibleFromKotlin public kotlinx.coroutines.flow.Flow<java.util.List<androidx.window.area.WindowAreaInfo>> getWindowAreaInfos();
-    method public void presentContentOnWindowArea(android.os.Binder token, android.app.Activity activity, java.util.concurrent.Executor executor, androidx.window.area.WindowAreaPresentationSessionCallback windowAreaPresentationSessionCallback);
-    method public void removeWindowAreaInfoListListener(androidx.core.util.Consumer<java.util.List<androidx.window.area.WindowAreaInfo>> listener);
-    method public void transferActivityToWindowArea(android.os.Binder token, android.app.Activity activity, java.util.concurrent.Executor executor, androidx.window.area.WindowAreaSessionCallback windowAreaSessionCallback);
-    property public kotlinx.coroutines.flow.Flow<java.util.List<androidx.window.area.WindowAreaInfo>> windowAreaInfos;
+    method public void addWindowAreasListener(java.util.concurrent.Executor executor, androidx.core.util.Consumer<java.util.List<androidx.window.area.WindowArea>> listener);
+    method @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public androidx.window.area.WindowAreaSessionPresenter getActivePresentationSession(androidx.window.area.WindowAreaToken windowAreaToken);
+    method @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public void presentContentOnWindowArea(androidx.window.area.WindowAreaToken windowAreaToken, android.app.Activity activity, java.util.concurrent.Executor executor, androidx.window.area.WindowAreaPresentationSessionCallback windowAreaPresentationSessionCallback);
+    method public void removeWindowAreasListener(androidx.core.util.Consumer<java.util.List<androidx.window.area.WindowArea>> listener);
+    method public void transferToWindowArea(androidx.window.area.WindowAreaToken? windowAreaToken, android.app.Activity activity);
   }
 
 }
diff --git a/window/window-java/src/main/java/androidx/window/java/area/WindowAreaControllerCallbackAdapter.kt b/window/window-java/src/main/java/androidx/window/java/area/WindowAreaControllerCallbackAdapter.kt
index 97bb04cd65895..e287ce76f526e 100644
--- a/window/window-java/src/main/java/androidx/window/java/area/WindowAreaControllerCallbackAdapter.kt
+++ b/window/window-java/src/main/java/androidx/window/java/area/WindowAreaControllerCallbackAdapter.kt
@@ -17,84 +17,72 @@
 package androidx.window.java.area
 
 import android.app.Activity
-import android.os.Binder
 import androidx.core.util.Consumer
+import androidx.window.area.WindowArea
 import androidx.window.area.WindowAreaController
-import androidx.window.area.WindowAreaInfo
 import androidx.window.area.WindowAreaPresentationSessionCallback
-import androidx.window.area.WindowAreaSessionCallback
+import androidx.window.area.WindowAreaSessionPresenter
+import androidx.window.area.WindowAreaToken
 import androidx.window.core.ExperimentalWindowApi
 import androidx.window.java.core.CallbackToFlowAdapter
 import java.util.concurrent.Executor
-import kotlinx.coroutines.flow.Flow
 
 /** An adapter for [WindowAreaController] to provide callback APIs. */
-@ExperimentalWindowApi
 public class WindowAreaControllerCallbackAdapter
 private constructor(
     private val controller: WindowAreaController,
     private val callbackToFlowAdapter: CallbackToFlowAdapter,
-) : WindowAreaController() {
+) {
 
     public constructor(controller: WindowAreaController) : this(controller, CallbackToFlowAdapter())
 
     /**
-     * Registers a listener that is interested in the current list of [WindowAreaInfo] available to
-     * be interacted with.
+     * Registers a listener that is interested in the current list of [WindowArea] available to be
+     * interacted with.
      *
      * The [listener] will receive an initial value on registration, as soon as it becomes
      * available.
      *
      * @param executor to handle sending listener updates.
-     * @param listener to receive updates to the list of [WindowAreaInfo].
-     * @see WindowAreaController.transferActivityToWindowArea
+     * @param listener to receive updates to the list of [WindowArea].
+     * @see WindowAreaController.transferToWindowArea
      * @see WindowAreaController.presentContentOnWindowArea
      */
-    public fun addWindowAreaInfoListListener(
-        executor: Executor,
-        listener: Consumer<List<WindowAreaInfo>>,
-    ) {
-        callbackToFlowAdapter.connect(executor, listener, controller.windowAreaInfos)
+    public fun addWindowAreasListener(executor: Executor, listener: Consumer<List<WindowArea>>) {
+        controller.addWindowAreasListener(executor, listener)
     }
 
     /**
-     * Removes a listener of available [WindowAreaInfo] records. If the listener is not present then
+     * Removes a listener of available [WindowArea] records. If the listener is not present then
      * this method is a no-op.
      *
      * @param listener to remove from receiving status updates.
-     * @see WindowAreaController.transferActivityToWindowArea
+     * @see WindowAreaController.transferToWindowArea
      * @see WindowAreaController.presentContentOnWindowArea
      */
-    public fun removeWindowAreaInfoListListener(listener: Consumer<List<WindowAreaInfo>>) {
-        callbackToFlowAdapter.disconnect(listener)
+    public fun removeWindowAreasListener(listener: Consumer<List<WindowArea>>) {
+        controller.removeWindowAreasListener(listener)
     }
 
-    override val windowAreaInfos: Flow<List<WindowAreaInfo>>
-        get() = controller.windowAreaInfos
+    public fun transferToWindowArea(windowAreaToken: WindowAreaToken?, activity: Activity): Unit =
+        controller.transferToWindowArea(windowAreaToken, activity)
 
-    override fun transferActivityToWindowArea(
-        token: Binder,
-        activity: Activity,
-        executor: Executor,
-        windowAreaSessionCallback: WindowAreaSessionCallback,
-    ): Unit =
-        controller.transferActivityToWindowArea(
-            token,
-            activity,
-            executor,
-            windowAreaSessionCallback,
-        )
-
-    override fun presentContentOnWindowArea(
-        token: Binder,
+    @ExperimentalWindowApi
+    public fun presentContentOnWindowArea(
+        windowAreaToken: WindowAreaToken,
         activity: Activity,
         executor: Executor,
         windowAreaPresentationSessionCallback: WindowAreaPresentationSessionCallback,
     ): Unit =
         controller.presentContentOnWindowArea(
-            token,
+            windowAreaToken,
             activity,
             executor,
             windowAreaPresentationSessionCallback,
         )
+
+    @ExperimentalWindowApi
+    public fun getActivePresentationSession(
+        windowAreaToken: WindowAreaToken
+    ): WindowAreaSessionPresenter = controller.getActivePresentationSession(windowAreaToken)
 }
diff --git a/window/window-testing/api/current.txt b/window/window-testing/api/current.txt
index 9faf2687a770f..bf8e356e71b6c 100644
--- a/window/window-testing/api/current.txt
+++ b/window/window-testing/api/current.txt
@@ -9,6 +9,19 @@ package androidx.window.testing {
 
 }
 
+package androidx.window.testing.area {
+
+  public final class TestWindowArea {
+    method @KotlinOnly public static androidx.window.area.WindowArea TestWindowArea(optional androidx.window.layout.WindowMetrics metrics, optional androidx.window.area.WindowArea.Type type, optional android.os.IBinder token);
+    method @InaccessibleFromKotlin public static androidx.window.area.WindowArea createTestWindowArea();
+    method @InaccessibleFromKotlin public static androidx.window.area.WindowArea createTestWindowArea(optional androidx.window.layout.WindowMetrics metrics);
+    method @InaccessibleFromKotlin public static androidx.window.area.WindowArea createTestWindowArea(optional androidx.window.layout.WindowMetrics metrics, optional androidx.window.area.WindowArea.Type type);
+    method @InaccessibleFromKotlin public static androidx.window.area.WindowArea createTestWindowArea(optional androidx.window.layout.WindowMetrics metrics, optional androidx.window.area.WindowArea.Type type, optional android.os.IBinder token);
+    method @BytecodeOnly public static androidx.window.area.WindowArea! createTestWindowArea$default(androidx.window.layout.WindowMetrics!, androidx.window.area.WindowArea.Type!, android.os.IBinder!, int, Object!);
+  }
+
+}
+
 package androidx.window.testing.embedding {
 
   public final class ActivityEmbeddingRule implements org.junit.rules.TestRule {
diff --git a/window/window-testing/api/restricted_current.txt b/window/window-testing/api/restricted_current.txt
index 9faf2687a770f..bf8e356e71b6c 100644
--- a/window/window-testing/api/restricted_current.txt
+++ b/window/window-testing/api/restricted_current.txt
@@ -9,6 +9,19 @@ package androidx.window.testing {
 
 }
 
+package androidx.window.testing.area {
+
+  public final class TestWindowArea {
+    method @KotlinOnly public static androidx.window.area.WindowArea TestWindowArea(optional androidx.window.layout.WindowMetrics metrics, optional androidx.window.area.WindowArea.Type type, optional android.os.IBinder token);
+    method @InaccessibleFromKotlin public static androidx.window.area.WindowArea createTestWindowArea();
+    method @InaccessibleFromKotlin public static androidx.window.area.WindowArea createTestWindowArea(optional androidx.window.layout.WindowMetrics metrics);
+    method @InaccessibleFromKotlin public static androidx.window.area.WindowArea createTestWindowArea(optional androidx.window.layout.WindowMetrics metrics, optional androidx.window.area.WindowArea.Type type);
+    method @InaccessibleFromKotlin public static androidx.window.area.WindowArea createTestWindowArea(optional androidx.window.layout.WindowMetrics metrics, optional androidx.window.area.WindowArea.Type type, optional android.os.IBinder token);
+    method @BytecodeOnly public static androidx.window.area.WindowArea! createTestWindowArea$default(androidx.window.layout.WindowMetrics!, androidx.window.area.WindowArea.Type!, android.os.IBinder!, int, Object!);
+  }
+
+}
+
 package androidx.window.testing.embedding {
 
   public final class ActivityEmbeddingRule implements org.junit.rules.TestRule {
diff --git a/window/window-testing/src/main/java/androidx/window/testing/area/WindowAreaTesting.kt b/window/window-testing/src/main/java/androidx/window/testing/area/WindowAreaTesting.kt
new file mode 100644
index 0000000000000..b365a87fddc07
--- /dev/null
+++ b/window/window-testing/src/main/java/androidx/window/testing/area/WindowAreaTesting.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2025 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@file:JvmName("TestWindowArea")
+
+package androidx.window.testing.area
+
+import android.graphics.Rect
+import android.os.Binder
+import android.os.IBinder
+import androidx.window.area.WindowArea
+import androidx.window.area.WindowAreaToken
+import androidx.window.layout.WindowMetrics
+import androidx.window.testing.layout.TestWindowMetrics
+
+/**
+ * Creates an [WindowArea] instance for testing. The default values are a default [WindowMetrics]
+ * object, a type of [WindowArea.Type.TYPE_REAR_FACING] and a default [IBinder] token.
+ *
+ * @param metrics The [WindowMetrics] the [WindowArea] should represent.
+ * @param type Indicates what type this `WindowAreaInfo` is.
+ * @param token Identifying token for this ``WindowAreaInfo`
+ * @return A [WindowArea] instance for testing.
+ */
+@Suppress("FunctionName")
+@JvmName("createTestWindowArea")
+@JvmOverloads
+public fun TestWindowArea(
+    metrics: WindowMetrics = TestWindowMetrics(bounds = Rect()),
+    type: WindowArea.Type = WindowArea.Type.TYPE_REAR_FACING,
+    token: IBinder = Binder(),
+): WindowArea = WindowArea(metrics, type, WindowAreaToken.fromBinder(token), HashMap())
diff --git a/window/window/api/current.txt b/window/window/api/current.txt
index 7e39ec77b419f..c6257de8dccbf 100644
--- a/window/window/api/current.txt
+++ b/window/window/api/current.txt
@@ -40,25 +40,44 @@ package androidx.window {
 
 package androidx.window.area {
 
-  @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public final class WindowAreaCapability {
+  public final class WindowArea {
+    method public androidx.window.area.WindowAreaCapability getCapability(androidx.window.area.WindowAreaCapability.Operation operation);
+    method @InaccessibleFromKotlin public androidx.window.area.WindowAreaToken getToken();
+    method @InaccessibleFromKotlin public androidx.window.area.WindowArea.Type getType();
+    method @InaccessibleFromKotlin public androidx.window.layout.WindowMetrics getWindowMetrics();
+    property public androidx.window.area.WindowAreaToken token;
+    property public androidx.window.area.WindowArea.Type type;
+    property public androidx.window.layout.WindowMetrics windowMetrics;
+  }
+
+  public static final class WindowArea.Type {
+    field public static final androidx.window.area.WindowArea.Type.Companion Companion;
+    field public static final androidx.window.area.WindowArea.Type TYPE_REAR_FACING;
+  }
+
+  public static final class WindowArea.Type.Companion {
+    property public androidx.window.area.WindowArea.Type TYPE_REAR_FACING;
+  }
+
+  public final class WindowAreaCapability {
     method @InaccessibleFromKotlin public androidx.window.area.WindowAreaCapability.Operation getOperation();
     method @InaccessibleFromKotlin public androidx.window.area.WindowAreaCapability.Status getStatus();
     property public androidx.window.area.WindowAreaCapability.Operation operation;
     property public androidx.window.area.WindowAreaCapability.Status status;
   }
 
-  @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public static final class WindowAreaCapability.Operation {
+  public static final class WindowAreaCapability.Operation {
     field public static final androidx.window.area.WindowAreaCapability.Operation.Companion Companion;
     field public static final androidx.window.area.WindowAreaCapability.Operation OPERATION_PRESENT_ON_AREA;
-    field public static final androidx.window.area.WindowAreaCapability.Operation OPERATION_TRANSFER_ACTIVITY_TO_AREA;
+    field public static final androidx.window.area.WindowAreaCapability.Operation OPERATION_TRANSFER_TO_AREA;
   }
 
-  @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public static final class WindowAreaCapability.Operation.Companion {
+  public static final class WindowAreaCapability.Operation.Companion {
     property public androidx.window.area.WindowAreaCapability.Operation OPERATION_PRESENT_ON_AREA;
-    property public androidx.window.area.WindowAreaCapability.Operation OPERATION_TRANSFER_ACTIVITY_TO_AREA;
+    property public androidx.window.area.WindowAreaCapability.Operation OPERATION_TRANSFER_TO_AREA;
   }
 
-  @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public static final class WindowAreaCapability.Status {
+  public static final class WindowAreaCapability.Status {
     field public static final androidx.window.area.WindowAreaCapability.Status.Companion Companion;
     field public static final androidx.window.area.WindowAreaCapability.Status WINDOW_AREA_STATUS_ACTIVE;
     field public static final androidx.window.area.WindowAreaCapability.Status WINDOW_AREA_STATUS_AVAILABLE;
@@ -66,63 +85,35 @@ package androidx.window.area {
     field public static final androidx.window.area.WindowAreaCapability.Status WINDOW_AREA_STATUS_UNSUPPORTED;
   }
 
-  @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public static final class WindowAreaCapability.Status.Companion {
+  public static final class WindowAreaCapability.Status.Companion {
     property public androidx.window.area.WindowAreaCapability.Status WINDOW_AREA_STATUS_ACTIVE;
     property public androidx.window.area.WindowAreaCapability.Status WINDOW_AREA_STATUS_AVAILABLE;
     property public androidx.window.area.WindowAreaCapability.Status WINDOW_AREA_STATUS_UNAVAILABLE;
     property public androidx.window.area.WindowAreaCapability.Status WINDOW_AREA_STATUS_UNSUPPORTED;
   }
 
-  @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public abstract class WindowAreaController {
+  public abstract class WindowAreaController {
+    method public abstract void addWindowAreasListener(java.util.concurrent.Executor executor, androidx.core.util.Consumer<java.util.List<androidx.window.area.WindowArea>> listener);
+    method @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public abstract androidx.window.area.WindowAreaSessionPresenter getActivePresentationSession(androidx.window.area.WindowAreaToken windowAreaToken);
     method @InaccessibleFromKotlin public static final androidx.window.area.WindowAreaController getOrCreate();
-    method @InaccessibleFromKotlin public abstract kotlinx.coroutines.flow.Flow<java.util.List<androidx.window.area.WindowAreaInfo>> getWindowAreaInfos();
-    method public abstract void presentContentOnWindowArea(android.os.Binder token, android.app.Activity activity, java.util.concurrent.Executor executor, androidx.window.area.WindowAreaPresentationSessionCallback windowAreaPresentationSessionCallback);
-    method public abstract void transferActivityToWindowArea(android.os.Binder token, android.app.Activity activity, java.util.concurrent.Executor executor, androidx.window.area.WindowAreaSessionCallback windowAreaSessionCallback);
-    property public abstract kotlinx.coroutines.flow.Flow<java.util.List<androidx.window.area.WindowAreaInfo>> windowAreaInfos;
+    method @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public abstract void presentContentOnWindowArea(androidx.window.area.WindowAreaToken windowAreaToken, android.app.Activity activity, java.util.concurrent.Executor executor, androidx.window.area.WindowAreaPresentationSessionCallback windowAreaPresentationSessionCallback);
+    method public abstract void removeWindowAreasListener(androidx.core.util.Consumer<java.util.List<androidx.window.area.WindowArea>> listener);
+    method public abstract void transferToWindowArea(androidx.window.area.WindowAreaToken? windowAreaToken, android.app.Activity activity);
     field public static final androidx.window.area.WindowAreaController.Companion Companion;
   }
 
-  @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public static final class WindowAreaController.Companion {
+  public static final class WindowAreaController.Companion {
     method public androidx.window.area.WindowAreaController getOrCreate();
   }
 
-  @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public final class WindowAreaInfo {
-    method public androidx.window.area.WindowAreaSession? getActiveSession(androidx.window.area.WindowAreaCapability.Operation operation);
-    method public androidx.window.area.WindowAreaCapability getCapability(androidx.window.area.WindowAreaCapability.Operation operation);
-    method @InaccessibleFromKotlin public androidx.window.layout.WindowMetrics getMetrics();
-    method @InaccessibleFromKotlin public android.os.Binder getToken();
-    method @InaccessibleFromKotlin public androidx.window.area.WindowAreaInfo.Type getType();
-    method @InaccessibleFromKotlin public void setMetrics(androidx.window.layout.WindowMetrics);
-    property public androidx.window.layout.WindowMetrics metrics;
-    property public android.os.Binder token;
-    property public androidx.window.area.WindowAreaInfo.Type type;
-  }
-
-  @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public static final class WindowAreaInfo.Type {
-    field public static final androidx.window.area.WindowAreaInfo.Type.Companion Companion;
-    field public static final androidx.window.area.WindowAreaInfo.Type TYPE_REAR_FACING;
-  }
-
-  @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public static final class WindowAreaInfo.Type.Companion {
-    property public androidx.window.area.WindowAreaInfo.Type TYPE_REAR_FACING;
-  }
-
   @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public interface WindowAreaPresentationSessionCallback {
     method public void onContainerVisibilityChanged(boolean isVisible);
     method public void onSessionEnded(Throwable? t);
     method public void onSessionStarted(androidx.window.area.WindowAreaSessionPresenter session);
   }
 
-  @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public interface WindowAreaSession {
+  @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public interface WindowAreaSessionPresenter extends java.lang.AutoCloseable {
     method public void close();
-  }
-
-  @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public interface WindowAreaSessionCallback {
-    method public void onSessionEnded(Throwable? t);
-    method public void onSessionStarted(androidx.window.area.WindowAreaSession session);
-  }
-
-  @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public interface WindowAreaSessionPresenter extends androidx.window.area.WindowAreaSession {
     method @InaccessibleFromKotlin public android.content.Context getContext();
     method @InaccessibleFromKotlin public android.view.Window? getWindow();
     method public void setContentView(android.view.View view);
@@ -130,6 +121,13 @@ package androidx.window.area {
     property public abstract android.view.Window? window;
   }
 
+  public final class WindowAreaToken {
+    field public static final androidx.window.area.WindowAreaToken.Companion Companion;
+  }
+
+  public static final class WindowAreaToken.Companion {
+  }
+
 }
 
 package @SuppressCompatibility androidx.window.core {
diff --git a/window/window/api/restricted_current.txt b/window/window/api/restricted_current.txt
index 1636fdf538c08..a589757294ec2 100644
--- a/window/window/api/restricted_current.txt
+++ b/window/window/api/restricted_current.txt
@@ -40,25 +40,44 @@ package androidx.window {
 
 package androidx.window.area {
 
-  @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public final class WindowAreaCapability {
+  public final class WindowArea {
+    method public androidx.window.area.WindowAreaCapability getCapability(androidx.window.area.WindowAreaCapability.Operation operation);
+    method @InaccessibleFromKotlin public androidx.window.area.WindowAreaToken getToken();
+    method @InaccessibleFromKotlin public androidx.window.area.WindowArea.Type getType();
+    method @InaccessibleFromKotlin public androidx.window.layout.WindowMetrics getWindowMetrics();
+    property public androidx.window.area.WindowAreaToken token;
+    property public androidx.window.area.WindowArea.Type type;
+    property public androidx.window.layout.WindowMetrics windowMetrics;
+  }
+
+  public static final class WindowArea.Type {
+    field public static final androidx.window.area.WindowArea.Type.Companion Companion;
+    field public static final androidx.window.area.WindowArea.Type TYPE_REAR_FACING;
+  }
+
+  public static final class WindowArea.Type.Companion {
+    property public androidx.window.area.WindowArea.Type TYPE_REAR_FACING;
+  }
+
+  public final class WindowAreaCapability {
     method @InaccessibleFromKotlin public androidx.window.area.WindowAreaCapability.Operation getOperation();
     method @InaccessibleFromKotlin public androidx.window.area.WindowAreaCapability.Status getStatus();
     property public androidx.window.area.WindowAreaCapability.Operation operation;
     property public androidx.window.area.WindowAreaCapability.Status status;
   }
 
-  @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public static final class WindowAreaCapability.Operation {
+  public static final class WindowAreaCapability.Operation {
     field public static final androidx.window.area.WindowAreaCapability.Operation.Companion Companion;
     field public static final androidx.window.area.WindowAreaCapability.Operation OPERATION_PRESENT_ON_AREA;
-    field public static final androidx.window.area.WindowAreaCapability.Operation OPERATION_TRANSFER_ACTIVITY_TO_AREA;
+    field public static final androidx.window.area.WindowAreaCapability.Operation OPERATION_TRANSFER_TO_AREA;
   }
 
-  @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public static final class WindowAreaCapability.Operation.Companion {
+  public static final class WindowAreaCapability.Operation.Companion {
     property public androidx.window.area.WindowAreaCapability.Operation OPERATION_PRESENT_ON_AREA;
-    property public androidx.window.area.WindowAreaCapability.Operation OPERATION_TRANSFER_ACTIVITY_TO_AREA;
+    property public androidx.window.area.WindowAreaCapability.Operation OPERATION_TRANSFER_TO_AREA;
   }
 
-  @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public static final class WindowAreaCapability.Status {
+  public static final class WindowAreaCapability.Status {
     field public static final androidx.window.area.WindowAreaCapability.Status.Companion Companion;
     field public static final androidx.window.area.WindowAreaCapability.Status WINDOW_AREA_STATUS_ACTIVE;
     field public static final androidx.window.area.WindowAreaCapability.Status WINDOW_AREA_STATUS_AVAILABLE;
@@ -66,63 +85,35 @@ package androidx.window.area {
     field public static final androidx.window.area.WindowAreaCapability.Status WINDOW_AREA_STATUS_UNSUPPORTED;
   }
 
-  @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public static final class WindowAreaCapability.Status.Companion {
+  public static final class WindowAreaCapability.Status.Companion {
     property public androidx.window.area.WindowAreaCapability.Status WINDOW_AREA_STATUS_ACTIVE;
     property public androidx.window.area.WindowAreaCapability.Status WINDOW_AREA_STATUS_AVAILABLE;
     property public androidx.window.area.WindowAreaCapability.Status WINDOW_AREA_STATUS_UNAVAILABLE;
     property public androidx.window.area.WindowAreaCapability.Status WINDOW_AREA_STATUS_UNSUPPORTED;
   }
 
-  @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public abstract class WindowAreaController {
+  public abstract class WindowAreaController {
+    method public abstract void addWindowAreasListener(java.util.concurrent.Executor executor, androidx.core.util.Consumer<java.util.List<androidx.window.area.WindowArea>> listener);
+    method @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public abstract androidx.window.area.WindowAreaSessionPresenter getActivePresentationSession(androidx.window.area.WindowAreaToken windowAreaToken);
     method @InaccessibleFromKotlin public static final androidx.window.area.WindowAreaController getOrCreate();
-    method @InaccessibleFromKotlin public abstract kotlinx.coroutines.flow.Flow<java.util.List<androidx.window.area.WindowAreaInfo>> getWindowAreaInfos();
-    method public abstract void presentContentOnWindowArea(android.os.Binder token, android.app.Activity activity, java.util.concurrent.Executor executor, androidx.window.area.WindowAreaPresentationSessionCallback windowAreaPresentationSessionCallback);
-    method public abstract void transferActivityToWindowArea(android.os.Binder token, android.app.Activity activity, java.util.concurrent.Executor executor, androidx.window.area.WindowAreaSessionCallback windowAreaSessionCallback);
-    property public abstract kotlinx.coroutines.flow.Flow<java.util.List<androidx.window.area.WindowAreaInfo>> windowAreaInfos;
+    method @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public abstract void presentContentOnWindowArea(androidx.window.area.WindowAreaToken windowAreaToken, android.app.Activity activity, java.util.concurrent.Executor executor, androidx.window.area.WindowAreaPresentationSessionCallback windowAreaPresentationSessionCallback);
+    method public abstract void removeWindowAreasListener(androidx.core.util.Consumer<java.util.List<androidx.window.area.WindowArea>> listener);
+    method public abstract void transferToWindowArea(androidx.window.area.WindowAreaToken? windowAreaToken, android.app.Activity activity);
     field public static final androidx.window.area.WindowAreaController.Companion Companion;
   }
 
-  @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public static final class WindowAreaController.Companion {
+  public static final class WindowAreaController.Companion {
     method public androidx.window.area.WindowAreaController getOrCreate();
   }
 
-  @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public final class WindowAreaInfo {
-    method public androidx.window.area.WindowAreaSession? getActiveSession(androidx.window.area.WindowAreaCapability.Operation operation);
-    method public androidx.window.area.WindowAreaCapability getCapability(androidx.window.area.WindowAreaCapability.Operation operation);
-    method @InaccessibleFromKotlin public androidx.window.layout.WindowMetrics getMetrics();
-    method @InaccessibleFromKotlin public android.os.Binder getToken();
-    method @InaccessibleFromKotlin public androidx.window.area.WindowAreaInfo.Type getType();
-    method @InaccessibleFromKotlin public void setMetrics(androidx.window.layout.WindowMetrics);
-    property public androidx.window.layout.WindowMetrics metrics;
-    property public android.os.Binder token;
-    property public androidx.window.area.WindowAreaInfo.Type type;
-  }
-
-  @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public static final class WindowAreaInfo.Type {
-    field public static final androidx.window.area.WindowAreaInfo.Type.Companion Companion;
-    field public static final androidx.window.area.WindowAreaInfo.Type TYPE_REAR_FACING;
-  }
-
-  @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public static final class WindowAreaInfo.Type.Companion {
-    property public androidx.window.area.WindowAreaInfo.Type TYPE_REAR_FACING;
-  }
-
   @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public interface WindowAreaPresentationSessionCallback {
     method public void onContainerVisibilityChanged(boolean isVisible);
     method public void onSessionEnded(Throwable? t);
     method public void onSessionStarted(androidx.window.area.WindowAreaSessionPresenter session);
   }
 
-  @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public interface WindowAreaSession {
+  @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public interface WindowAreaSessionPresenter extends java.lang.AutoCloseable {
     method public void close();
-  }
-
-  @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public interface WindowAreaSessionCallback {
-    method public void onSessionEnded(Throwable? t);
-    method public void onSessionStarted(androidx.window.area.WindowAreaSession session);
-  }
-
-  @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public interface WindowAreaSessionPresenter extends androidx.window.area.WindowAreaSession {
     method @InaccessibleFromKotlin public android.content.Context getContext();
     method @InaccessibleFromKotlin public android.view.Window? getWindow();
     method public void setContentView(android.view.View view);
@@ -130,6 +121,13 @@ package androidx.window.area {
     property public abstract android.view.Window? window;
   }
 
+  public final class WindowAreaToken {
+    field public static final androidx.window.area.WindowAreaToken.Companion Companion;
+  }
+
+  public static final class WindowAreaToken.Companion {
+  }
+
 }
 
 package @SuppressCompatibility androidx.window.core {
diff --git a/window/window/src/androidTest/java/androidx/window/area/WindowAreaControllerImplTest.kt b/window/window/src/androidTest/java/androidx/window/area/WindowAreaControllerImplTest.kt
index ca4d444ada147..20534699e96ba 100644
--- a/window/window/src/androidTest/java/androidx/window/area/WindowAreaControllerImplTest.kt
+++ b/window/window/src/androidTest/java/androidx/window/area/WindowAreaControllerImplTest.kt
@@ -19,21 +19,23 @@ package androidx.window.area
 import android.app.Activity
 import android.content.Context
 import android.content.pm.ActivityInfo
-import android.os.Binder
 import android.os.Build
 import android.util.DisplayMetrics
 import android.view.View
 import android.view.Window
 import android.widget.TextView
 import androidx.annotation.RequiresApi
+import androidx.core.util.Consumer as AndroidXConsumer
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.filters.SdkSuppress
 import androidx.window.TestActivity
 import androidx.window.WindowTestUtils.Companion.assumeAtLeastWindowExtensionVersion
 import androidx.window.area.WindowAreaCapability.Operation.Companion.OPERATION_PRESENT_ON_AREA
-import androidx.window.area.WindowAreaCapability.Operation.Companion.OPERATION_TRANSFER_ACTIVITY_TO_AREA
+import androidx.window.area.WindowAreaCapability.Operation.Companion.OPERATION_TRANSFER_TO_AREA
+import androidx.window.area.WindowAreaCapability.Status.Companion.WINDOW_AREA_STATUS_ACTIVE
 import androidx.window.area.WindowAreaCapability.Status.Companion.WINDOW_AREA_STATUS_AVAILABLE
 import androidx.window.area.WindowAreaCapability.Status.Companion.WINDOW_AREA_STATUS_UNAVAILABLE
+import androidx.window.area.WindowAreaControllerImpl.Companion.REAR_DISPLAY_WINDOW_AREA_TOKEN
 import androidx.window.area.adapter.WindowAreaAdapter
 import androidx.window.core.ExperimentalWindowApi
 import androidx.window.extensions.area.ExtensionWindowAreaPresentation
@@ -47,15 +49,12 @@ import androidx.window.extensions.area.WindowAreaComponent.STATUS_UNAVAILABLE
 import androidx.window.extensions.area.WindowAreaComponent.STATUS_UNSUPPORTED
 import androidx.window.extensions.core.util.function.Consumer
 import androidx.window.layout.WindowMetricsCalculator
+import java.lang.IllegalArgumentException
 import kotlin.test.assertEquals
+import kotlin.test.assertFailsWith
 import kotlin.test.assertNotNull
-import kotlin.test.assertNull
 import kotlin.test.assertTrue
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.async
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.UnconfinedTestDispatcher
 import kotlinx.coroutines.test.runTest
@@ -74,13 +73,13 @@ class WindowAreaControllerImplTest {
     private val minVendorApiLevel = 3
 
     /**
-     * Tests that we can get a list of [WindowAreaInfo] objects with a type of
-     * [WindowAreaInfo.Type.TYPE_REAR_FACING]. Verifies that updating the status of features on
-     * device returns an updated [WindowAreaInfo] list.
+     * Tests that we can get a list of [WindowArea] objects with a type of
+     * [WindowArea.Type.TYPE_REAR_FACING]. Verifies that updating the status of features on device
+     * returns an updated [WindowArea] list.
      */
     @SdkSuppress(minSdkVersion = Build.VERSION_CODES.Q)
     @Test
-    fun testRearFacingWindowAreaInfoList(): Unit =
+    fun testRearFacingWindowAreaList(): Unit =
         testScope.runTest {
             assumeTrue(Build.VERSION.SDK_INT > Build.VERSION_CODES.Q)
             assumeAtLeastWindowExtensionVersion(minVendorApiLevel)
@@ -89,42 +88,46 @@ class WindowAreaControllerImplTest {
                 val controller = WindowAreaControllerImpl(windowAreaComponent = extensionComponent)
                 extensionComponent.currentRearDisplayStatus = STATUS_UNAVAILABLE
                 extensionComponent.currentRearDisplayPresentationStatus = STATUS_UNAVAILABLE
-                val collector = TestWindowAreaInfoListConsumer()
-                testScope.launch(Job()) { controller.windowAreaInfos.collect(collector::accept) }
+                val collector = TestWindowAreaListConsumer()
+                controller.addWindowAreasListener(Runnable::run, collector)
 
-                val expectedAreaInfo =
-                    WindowAreaInfo(
-                        metrics =
+                val capabilityMap = HashMap<WindowAreaCapability.Operation, WindowAreaCapability>()
+                val rearDisplayCapability =
+                    WindowAreaCapability(OPERATION_TRANSFER_TO_AREA, WINDOW_AREA_STATUS_UNAVAILABLE)
+                val rearDisplayPresentationCapability =
+                    WindowAreaCapability(OPERATION_PRESENT_ON_AREA, WINDOW_AREA_STATUS_UNAVAILABLE)
+                capabilityMap[OPERATION_TRANSFER_TO_AREA] = rearDisplayCapability
+                capabilityMap[OPERATION_PRESENT_ON_AREA] = rearDisplayPresentationCapability
+
+                var expectedAreaInfo =
+                    WindowArea(
+                        windowMetrics =
                             WindowMetricsCalculator.fromDisplayMetrics(
                                 extensionComponent.rearDisplayMetrics
                             ),
-                        type = WindowAreaInfo.Type.TYPE_REAR_FACING,
-                        token = Binder(REAR_FACING_BINDER_DESCRIPTION),
-                        windowAreaComponent = extensionComponent,
+                        type = WindowArea.Type.TYPE_REAR_FACING,
+                        token = REAR_DISPLAY_WINDOW_AREA_TOKEN,
+                        capabilityMap = capabilityMap,
                     )
-                val rearDisplayCapability =
-                    WindowAreaCapability(
-                        OPERATION_TRANSFER_ACTIVITY_TO_AREA,
-                        WINDOW_AREA_STATUS_UNAVAILABLE,
-                    )
-                val rearDisplayPresentationCapability =
-                    WindowAreaCapability(OPERATION_PRESENT_ON_AREA, WINDOW_AREA_STATUS_UNAVAILABLE)
-                expectedAreaInfo.capabilityMap[OPERATION_TRANSFER_ACTIVITY_TO_AREA] =
-                    rearDisplayCapability
-                expectedAreaInfo.capabilityMap[OPERATION_PRESENT_ON_AREA] =
-                    rearDisplayPresentationCapability
 
                 assertEquals(listOf(expectedAreaInfo), collector.values[collector.values.size - 1])
 
                 extensionComponent.updateRearDisplayStatusListeners(STATUS_AVAILABLE)
 
                 val updatedRearDisplayCapability =
-                    WindowAreaCapability(
-                        OPERATION_TRANSFER_ACTIVITY_TO_AREA,
-                        WINDOW_AREA_STATUS_AVAILABLE,
+                    WindowAreaCapability(OPERATION_TRANSFER_TO_AREA, WINDOW_AREA_STATUS_AVAILABLE)
+                capabilityMap[OPERATION_TRANSFER_TO_AREA] = updatedRearDisplayCapability
+
+                expectedAreaInfo =
+                    WindowArea(
+                        windowMetrics =
+                            WindowMetricsCalculator.fromDisplayMetrics(
+                                extensionComponent.rearDisplayMetrics
+                            ),
+                        type = WindowArea.Type.TYPE_REAR_FACING,
+                        token = REAR_DISPLAY_WINDOW_AREA_TOKEN,
+                        capabilityMap = capabilityMap,
                     )
-                expectedAreaInfo.capabilityMap[OPERATION_TRANSFER_ACTIVITY_TO_AREA] =
-                    updatedRearDisplayCapability
 
                 assertEquals(listOf(expectedAreaInfo), collector.values[collector.values.size - 1])
 
@@ -134,31 +137,41 @@ class WindowAreaControllerImplTest {
 
                 val updatedRearDisplayPresentationCapability =
                     WindowAreaCapability(OPERATION_PRESENT_ON_AREA, WINDOW_AREA_STATUS_AVAILABLE)
-                expectedAreaInfo.capabilityMap[OPERATION_PRESENT_ON_AREA] =
-                    updatedRearDisplayPresentationCapability
+                capabilityMap[OPERATION_PRESENT_ON_AREA] = updatedRearDisplayPresentationCapability
+
+                expectedAreaInfo =
+                    WindowArea(
+                        windowMetrics =
+                            WindowMetricsCalculator.fromDisplayMetrics(
+                                extensionComponent.rearDisplayMetrics
+                            ),
+                        type = WindowArea.Type.TYPE_REAR_FACING,
+                        token = REAR_DISPLAY_WINDOW_AREA_TOKEN,
+                        capabilityMap = capabilityMap,
+                    )
 
                 assertEquals(listOf(expectedAreaInfo), collector.values[collector.values.size - 1])
             }
         }
 
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.N)
     @Test
-    fun testWindowAreaInfoListNullComponent(): Unit =
+    fun testWindowAreaListNullComponent(): Unit =
         testScope.runTest {
             activityScenario.scenario.onActivity {
                 val controller = EmptyWindowAreaControllerImpl()
-                val collector = TestWindowAreaInfoListConsumer()
-                testScope.launch(Job()) { controller.windowAreaInfos.collect(collector::accept) }
-                assertTrue(collector.values.size == 1)
+                val collector = TestWindowAreaListConsumer()
+                controller.addWindowAreasListener(Runnable::run, collector)
+                assertEquals(collector.values.size, 1)
                 assertEquals(listOf(), collector.values[0])
             }
         }
 
     /**
-     * Tests the transfer to rear facing window area flow. Tests the flow through
+     * Tests the [WindowAreaController.transferToWindowArea] flow. Tests the flow through
      * WindowAreaControllerImpl with a fake extension. This fake extension changes the orientation
-     * of the activity to landscape to simulate a configuration change that would occur when
-     * transferring to the rear facing window area and then returns it back to portrait when it's
-     * disabled.
+     * of the activity to landscape to simulate a configuration change that would occur when moving
+     * to the rear facing window area and then returns it back to portrait when it's disabled.
      */
     @SdkSuppress(minSdkVersion = Build.VERSION_CODES.Q)
     @Test
@@ -168,19 +181,14 @@ class WindowAreaControllerImplTest {
             val extensions = FakeWindowAreaComponent()
             val controller = WindowAreaControllerImpl(windowAreaComponent = extensions)
             extensions.currentRearDisplayStatus = STATUS_AVAILABLE
-            val callback = TestWindowAreaSessionCallback()
-            val windowAreaInfo: WindowAreaInfo? =
-                async {
-                        return@async controller.windowAreaInfos.first().firstOrNull {
-                            it.type == WindowAreaInfo.Type.TYPE_REAR_FACING
-                        }
-                    }
-                    .await()
-
-            assertNotNull(windowAreaInfo)
+            val collector = TestWindowAreaListConsumer()
+            controller.addWindowAreasListener(Runnable::run, collector)
+            val windowArea: WindowArea? = collector.values.last().firstOrNull()
+
+            assertNotNull(windowArea)
             assertEquals(
-                windowAreaInfo.getCapability(OPERATION_TRANSFER_ACTIVITY_TO_AREA).status,
                 WINDOW_AREA_STATUS_AVAILABLE,
+                windowArea.getCapability(OPERATION_TRANSFER_TO_AREA).status,
             )
 
             activityScenario.scenario.onActivity { testActivity ->
@@ -194,27 +202,28 @@ class WindowAreaControllerImplTest {
                     testActivity.requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
                 )
                 testActivity.resetLayoutCounter()
-                controller.transferActivityToWindowArea(
-                    windowAreaInfo.token,
-                    testActivity,
-                    Runnable::run,
-                    callback,
-                )
-            }
 
-            activityScenario.scenario.onActivity { testActivity ->
+                controller.transferToWindowArea(windowArea.token, testActivity)
+                testActivity.waitForLayout()
                 assert(
                     testActivity.requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
                 )
-                assert(callback.currentSession != null)
-                testActivity.resetLayoutCounter()
-                callback.endSession()
             }
+            val activeWindowArea: WindowArea? = collector.values.last().firstOrNull()
+
+            assertNotNull(activeWindowArea)
+            assertEquals(
+                WINDOW_AREA_STATUS_ACTIVE,
+                activeWindowArea.getCapability(OPERATION_TRANSFER_TO_AREA).status,
+            )
+
             activityScenario.scenario.onActivity { testActivity ->
+                testActivity.resetLayoutCounter()
+                controller.transferToWindowArea(null, testActivity)
+                testActivity.waitForLayout()
                 assert(
                     testActivity.requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
                 )
-                assert(callback.currentSession == null)
             }
         }
 
@@ -230,6 +239,11 @@ class WindowAreaControllerImplTest {
         testTransferRearDisplayReturnsError(STATUS_ACTIVE)
     }
 
+    /**
+     * Base test method to provide a specific [WindowAreaComponent.WindowAreaStatus] that should
+     * return an IllegalStateException when trying to move to a rear display with a status that is
+     * not [WindowAreaComponent.STATUS_ACTIVE].
+     */
     @RequiresApi(Build.VERSION_CODES.Q)
     private fun testTransferRearDisplayReturnsError(
         initialState: @WindowAreaComponent.WindowAreaStatus Int
@@ -239,30 +253,20 @@ class WindowAreaControllerImplTest {
             val extensions = FakeWindowAreaComponent()
             val controller = WindowAreaControllerImpl(windowAreaComponent = extensions)
             extensions.currentRearDisplayStatus = initialState
-            val callback = TestWindowAreaSessionCallback()
-            val windowAreaInfo: WindowAreaInfo? =
-                async {
-                        return@async controller.windowAreaInfos.first().firstOrNull {
-                            it.type == WindowAreaInfo.Type.TYPE_REAR_FACING
-                        }
-                    }
-                    .await()
-
-            assertNotNull(windowAreaInfo)
+            val collector = TestWindowAreaListConsumer()
+            controller.addWindowAreasListener(Runnable::run, collector)
+            val windowArea: WindowArea? = collector.values.last().firstOrNull()
+
+            assertNotNull(windowArea)
             assertEquals(
-                windowAreaInfo.getCapability(OPERATION_TRANSFER_ACTIVITY_TO_AREA).status,
+                windowArea.getCapability(OPERATION_TRANSFER_TO_AREA).status,
                 WindowAreaAdapter.translate(initialState),
             )
 
             activityScenario.scenario.onActivity { testActivity ->
-                controller.transferActivityToWindowArea(
-                    windowAreaInfo.token,
-                    testActivity,
-                    Runnable::run,
-                    callback,
-                )
-                assertNotNull(callback.error)
-                assertNull(callback.currentSession)
+                assertFailsWith<IllegalStateException> {
+                    controller.transferToWindowArea(windowArea.token, testActivity)
+                }
             }
         }
 
@@ -285,24 +289,20 @@ class WindowAreaControllerImplTest {
 
             extensions.updateRearDisplayStatusListeners(STATUS_AVAILABLE)
             extensions.updateRearDisplayPresentationStatusListeners(STATUS_AVAILABLE)
-            val windowAreaInfo: WindowAreaInfo? =
-                async {
-                        return@async controller.windowAreaInfos.first().firstOrNull {
-                            it.type == WindowAreaInfo.Type.TYPE_REAR_FACING
-                        }
-                    }
-                    .await()
-
-            assertNotNull(windowAreaInfo)
+            val collector = TestWindowAreaListConsumer()
+            controller.addWindowAreasListener(Runnable::run, collector)
+            val windowArea: WindowArea? = collector.values.last().firstOrNull()
+
+            assertNotNull(windowArea)
             assertTrue {
-                windowAreaInfo.getCapability(OPERATION_PRESENT_ON_AREA).status ==
+                windowArea.getCapability(OPERATION_PRESENT_ON_AREA).status ==
                     WINDOW_AREA_STATUS_AVAILABLE
             }
 
             val callback = TestWindowAreaPresentationSessionCallback()
             activityScenario.scenario.onActivity { testActivity ->
                 controller.presentContentOnWindowArea(
-                    windowAreaInfo.token,
+                    windowArea.token,
                     testActivity,
                     Runnable::run,
                     callback,
@@ -330,24 +330,20 @@ class WindowAreaControllerImplTest {
 
             extensionComponent.updateRearDisplayStatusListeners(STATUS_AVAILABLE)
             extensionComponent.updateRearDisplayPresentationStatusListeners(STATUS_UNAVAILABLE)
-            val windowAreaInfo: WindowAreaInfo? =
-                async {
-                        return@async controller.windowAreaInfos.first().firstOrNull {
-                            it.type == WindowAreaInfo.Type.TYPE_REAR_FACING
-                        }
-                    }
-                    .await()
-
-            assertNotNull(windowAreaInfo)
+            val collector = TestWindowAreaListConsumer()
+            controller.addWindowAreasListener(Runnable::run, collector)
+            val windowArea: WindowArea? = collector.values.last().firstOrNull()
+
+            assertNotNull(windowArea)
             assertTrue {
-                windowAreaInfo.getCapability(OPERATION_PRESENT_ON_AREA).status ==
+                windowArea.getCapability(OPERATION_PRESENT_ON_AREA).status ==
                     WINDOW_AREA_STATUS_UNAVAILABLE
             }
 
             val callback = TestWindowAreaPresentationSessionCallback()
             activityScenario.scenario.onActivity { testActivity ->
                 controller.presentContentOnWindowArea(
-                    windowAreaInfo.token,
+                    windowArea.token,
                     testActivity,
                     Runnable::run,
                     callback,
@@ -369,19 +365,15 @@ class WindowAreaControllerImplTest {
             extensions.updateRearDisplayStatusListeners(STATUS_AVAILABLE)
             extensions.updateRearDisplayPresentationStatusListeners(STATUS_AVAILABLE)
 
-            val windowAreaInfo =
-                async {
-                        return@async controller.windowAreaInfos.first().firstOrNull {
-                            it.type == WindowAreaInfo.Type.TYPE_REAR_FACING
-                        }
-                    }
-                    .await()
+            val collector = TestWindowAreaListConsumer()
+            controller.addWindowAreasListener(Runnable::run, collector)
+            val windowArea: WindowArea? = collector.values.last().firstOrNull()
 
-            assertNotNull(windowAreaInfo)
-            assertTrue {
-                windowAreaInfo.getCapability(OPERATION_PRESENT_ON_AREA).status ==
-                    WINDOW_AREA_STATUS_AVAILABLE
-            }
+            assertNotNull(windowArea)
+            assertEquals(
+                WINDOW_AREA_STATUS_AVAILABLE,
+                windowArea.getCapability(OPERATION_PRESENT_ON_AREA).status,
+            )
 
             // Create a new controller to start the presentation.
             val controller2 = WindowAreaControllerImpl(windowAreaComponent = extensions)
@@ -389,7 +381,7 @@ class WindowAreaControllerImplTest {
             val callback = TestWindowAreaPresentationSessionCallback()
             activityScenario.scenario.onActivity { testActivity ->
                 controller2.presentContentOnWindowArea(
-                    windowAreaInfo.token,
+                    windowArea.token,
                     testActivity,
                     Runnable::run,
                     callback,
@@ -397,18 +389,18 @@ class WindowAreaControllerImplTest {
 
                 assert(!callback.sessionActive)
                 assert(callback.sessionError != null)
-                assert(callback.sessionError is IllegalStateException)
+                assert(callback.sessionError is IllegalArgumentException)
             }
         }
 
     /**
-     * Tests that we can get a list of [WindowAreaInfo] objects with a type of
-     * [WindowAreaInfo.Type.TYPE_REAR_FACING]. Verifies that updating the status of features on
-     * device returns an updated [WindowAreaInfo] list.
+     * Tests that we can get a list of [WindowArea] objects with a type of
+     * [WindowArea.Type.TYPE_REAR_FACING]. Verifies that updating the status of features on device
+     * returns an updated [WindowArea] list.
      */
     @SdkSuppress(minSdkVersion = Build.VERSION_CODES.Q)
     @Test
-    fun testRearFacingWindowAreaInfoList_getRearDisplayMetricsClassCastException(): Unit =
+    fun testRearFacingWindowAreaList_getRearDisplayMetricsClassCastException(): Unit =
         testScope.runTest {
             assumeTrue(Build.VERSION.SDK_INT > Build.VERSION_CODES.Q)
             assumeAtLeastWindowExtensionVersion(minVendorApiLevel)
@@ -417,38 +409,37 @@ class WindowAreaControllerImplTest {
                 val controller = WindowAreaControllerImpl(windowAreaComponent = extensionComponent)
                 extensionComponent.currentRearDisplayStatus = STATUS_UNAVAILABLE
                 extensionComponent.currentRearDisplayPresentationStatus = STATUS_UNAVAILABLE
-                val collector = TestWindowAreaInfoListConsumer()
-                testScope.launch(Job()) { controller.windowAreaInfos.collect(collector::accept) }
+                val collector = TestWindowAreaListConsumer()
+                controller.addWindowAreasListener(Runnable::run, collector)
 
-                val expectedAreaInfo =
-                    WindowAreaInfo(
-                        metrics = WindowMetricsCalculator.fromDisplayMetrics(DisplayMetrics()),
-                        type = WindowAreaInfo.Type.TYPE_REAR_FACING,
-                        token = Binder(REAR_FACING_BINDER_DESCRIPTION),
-                        windowAreaComponent = extensionComponent,
-                    )
+                val capabilityMap = HashMap<WindowAreaCapability.Operation, WindowAreaCapability>()
                 val rearDisplayCapability =
-                    WindowAreaCapability(
-                        OPERATION_TRANSFER_ACTIVITY_TO_AREA,
-                        WINDOW_AREA_STATUS_UNAVAILABLE,
-                    )
+                    WindowAreaCapability(OPERATION_TRANSFER_TO_AREA, WINDOW_AREA_STATUS_UNAVAILABLE)
                 val rearDisplayPresentationCapability =
                     WindowAreaCapability(OPERATION_PRESENT_ON_AREA, WINDOW_AREA_STATUS_UNAVAILABLE)
-                expectedAreaInfo.capabilityMap[OPERATION_TRANSFER_ACTIVITY_TO_AREA] =
-                    rearDisplayCapability
-                expectedAreaInfo.capabilityMap[OPERATION_PRESENT_ON_AREA] =
-                    rearDisplayPresentationCapability
+                capabilityMap[OPERATION_TRANSFER_TO_AREA] = rearDisplayCapability
+                capabilityMap[OPERATION_PRESENT_ON_AREA] = rearDisplayPresentationCapability
+
+                val expectedAreaInfo =
+                    WindowArea(
+                        windowMetrics =
+                            WindowMetricsCalculator.fromDisplayMetrics(DisplayMetrics()),
+                        type = WindowArea.Type.TYPE_REAR_FACING,
+                        token = REAR_DISPLAY_WINDOW_AREA_TOKEN,
+                        capabilityMap = capabilityMap,
+                    )
 
                 assertEquals(listOf(expectedAreaInfo), collector.values[collector.values.size - 1])
             }
         }
 
-    private class TestWindowAreaInfoListConsumer : Consumer<List<WindowAreaInfo>> {
+    @RequiresApi(Build.VERSION_CODES.N)
+    private class TestWindowAreaListConsumer : AndroidXConsumer<List<WindowArea>> {
 
-        val values: MutableList<List<WindowAreaInfo>> = mutableListOf()
+        val values: MutableList<List<WindowArea>> = mutableListOf()
 
-        override fun accept(infos: List<WindowAreaInfo>) {
-            values.add(infos)
+        override fun accept(value: List<WindowArea>) {
+            values.add(value)
         }
     }
 
@@ -494,6 +485,7 @@ class WindowAreaControllerImplTest {
             if (currentRearDisplayStatus != STATUS_AVAILABLE) {
                 rearDisplaySessionConsumer.accept(SESSION_STATE_INACTIVE)
             }
+            updateRearDisplayStatusListeners(STATUS_ACTIVE)
             testActivity = activity
             this.rearDisplaySessionConsumer = rearDisplaySessionConsumer
             testActivity!!.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
@@ -501,6 +493,7 @@ class WindowAreaControllerImplTest {
         }
 
         override fun endRearDisplaySession() {
+            updateRearDisplayStatusListeners(STATUS_AVAILABLE)
             testActivity?.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
             rearDisplaySessionConsumer?.accept(SESSION_STATE_INACTIVE)
         }
@@ -560,22 +553,6 @@ class WindowAreaControllerImplTest {
         }
     }
 
-    private class TestWindowAreaSessionCallback : WindowAreaSessionCallback {
-        var currentSession: WindowAreaSession? = null
-        var error: Throwable? = null
-
-        override fun onSessionStarted(session: WindowAreaSession) {
-            currentSession = session
-        }
-
-        override fun onSessionEnded(t: Throwable?) {
-            error = t
-            currentSession = null
-        }
-
-        fun endSession() = currentSession?.close()
-    }
-
     private class TestWindowAreaPresentationSessionCallback :
         WindowAreaPresentationSessionCallback {
         var sessionActive: Boolean = false
@@ -630,8 +607,4 @@ class WindowAreaControllerImplTest {
             return activity.window
         }
     }
-
-    companion object {
-        private const val REAR_FACING_BINDER_DESCRIPTION = "TEST_WINDOW_AREA_REAR_FACING"
-    }
 }
diff --git a/window/window/src/androidTest/java/androidx/window/area/WindowAreaControllerTest.kt b/window/window/src/androidTest/java/androidx/window/area/WindowAreaControllerTest.kt
index 975e1fc800b4f..f256f9de2eb4d 100644
--- a/window/window/src/androidTest/java/androidx/window/area/WindowAreaControllerTest.kt
+++ b/window/window/src/androidTest/java/androidx/window/area/WindowAreaControllerTest.kt
@@ -17,9 +17,9 @@
 package androidx.window.area
 
 import android.app.Activity
-import android.os.Binder
 import android.os.Build
 import androidx.annotation.RequiresApi
+import androidx.core.util.Consumer
 import androidx.window.WindowTestUtils.Companion.assumeAtLeastWindowExtensionVersion
 import androidx.window.core.ExperimentalWindowApi
 import java.util.concurrent.Executor
@@ -27,8 +27,6 @@ import kotlin.test.Test
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.UnconfinedTestDispatcher
 import kotlinx.coroutines.test.runTest
@@ -77,22 +75,26 @@ class WindowAreaControllerTest {
     companion object {
         val testController =
             object : WindowAreaController() {
-                override val windowAreaInfos: Flow<List<WindowAreaInfo>>
-                    get() = flowOf(listOf())
+                override fun addWindowAreasListener(
+                    executor: Executor,
+                    listener: Consumer<List<WindowArea>>,
+                ) {
+                    listener.accept(listOf())
+                }
+
+                override fun removeWindowAreasListener(listener: Consumer<List<WindowArea>>) {
+                    return
+                }
 
-                override fun transferActivityToWindowArea(
-                    token: Binder,
+                override fun transferToWindowArea(
+                    windowAreaToken: WindowAreaToken?,
                     activity: Activity,
-                    executor: Executor,
-                    windowAreaSessionCallback: WindowAreaSessionCallback,
                 ) {
-                    windowAreaSessionCallback.onSessionEnded(
-                        IllegalStateException("There are no WindowAreas")
-                    )
+                    throw IllegalStateException("There are no WindowAreas")
                 }
 
                 override fun presentContentOnWindowArea(
-                    token: Binder,
+                    windowAreaToken: WindowAreaToken,
                     activity: Activity,
                     executor: Executor,
                     windowAreaPresentationSessionCallback: WindowAreaPresentationSessionCallback,
@@ -101,6 +103,12 @@ class WindowAreaControllerTest {
                         IllegalStateException("There are no WindowAreas")
                     )
                 }
+
+                override fun getActivePresentationSession(
+                    windowAreaToken: WindowAreaToken
+                ): WindowAreaSessionPresenter {
+                    throw IllegalArgumentException("There is no active session")
+                }
             }
     }
 }
diff --git a/window/window/src/main/java/androidx/window/area/EmptyWindowAreaControllerImpl.kt b/window/window/src/main/java/androidx/window/area/EmptyWindowAreaControllerImpl.kt
index 71192b5953e8e..6a22dd1d2b998 100644
--- a/window/window/src/main/java/androidx/window/area/EmptyWindowAreaControllerImpl.kt
+++ b/window/window/src/main/java/androidx/window/area/EmptyWindowAreaControllerImpl.kt
@@ -17,30 +17,28 @@
 package androidx.window.area
 
 import android.app.Activity
-import android.os.Binder
+import androidx.core.util.Consumer
 import androidx.window.core.ExperimentalWindowApi
 import java.util.concurrent.Executor
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flowOf
 
 /** Empty Implementation for devices that do not support the [WindowAreaController] functionality */
-@ExperimentalWindowApi
 internal class EmptyWindowAreaControllerImpl : WindowAreaController() {
 
-    override val windowAreaInfos: Flow<List<WindowAreaInfo>>
-        get() = flowOf(listOf())
+    override fun addWindowAreasListener(executor: Executor, listener: Consumer<List<WindowArea>>) {
+        executor.execute { listener.accept(listOf()) }
+    }
 
-    override fun transferActivityToWindowArea(
-        token: Binder,
-        activity: Activity,
-        executor: Executor,
-        windowAreaSessionCallback: WindowAreaSessionCallback,
-    ) {
-        windowAreaSessionCallback.onSessionEnded(IllegalStateException("There are no WindowAreas"))
+    override fun removeWindowAreasListener(listener: Consumer<List<WindowArea>>) {
+        return
     }
 
+    override fun transferToWindowArea(windowAreaToken: WindowAreaToken?, activity: Activity) {
+        throw IllegalStateException("There are no WindowAreas")
+    }
+
+    @ExperimentalWindowApi
     override fun presentContentOnWindowArea(
-        token: Binder,
+        windowAreaToken: WindowAreaToken,
         activity: Activity,
         executor: Executor,
         windowAreaPresentationSessionCallback: WindowAreaPresentationSessionCallback,
@@ -49,4 +47,11 @@ internal class EmptyWindowAreaControllerImpl : WindowAreaController() {
             IllegalStateException("There are no WindowAreas")
         )
     }
+
+    @ExperimentalWindowApi
+    override fun getActivePresentationSession(
+        windowAreaToken: WindowAreaToken
+    ): WindowAreaSessionPresenter {
+        throw IllegalArgumentException("There is no active session")
+    }
 }
diff --git a/window/window/src/main/java/androidx/window/area/RearDisplaySessionImpl.kt b/window/window/src/main/java/androidx/window/area/RearDisplaySessionImpl.kt
deleted file mode 100644
index cae11df7e0061..0000000000000
--- a/window/window/src/main/java/androidx/window/area/RearDisplaySessionImpl.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.window.area
-
-import androidx.window.core.ExperimentalWindowApi
-import androidx.window.extensions.area.WindowAreaComponent
-
-@ExperimentalWindowApi
-internal class RearDisplaySessionImpl(private val windowAreaComponent: WindowAreaComponent) :
-    WindowAreaSession {
-
-    override fun close() {
-        windowAreaComponent.endRearDisplaySession()
-    }
-}
diff --git a/window/window/src/main/java/androidx/window/area/WindowArea.kt b/window/window/src/main/java/androidx/window/area/WindowArea.kt
new file mode 100644
index 0000000000000..20eaddea85e21
--- /dev/null
+++ b/window/window/src/main/java/androidx/window/area/WindowArea.kt
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.window.area
+
+import androidx.annotation.RestrictTo
+import androidx.window.area.WindowAreaCapability.Status.Companion.WINDOW_AREA_STATUS_UNSUPPORTED
+import androidx.window.layout.WindowMetrics
+
+/**
+ * The current state of a window area. The [WindowArea] can represent a part of or an entire display
+ * in the system. These values can be used to modify the UI to show/hide controls and determine when
+ * features can be enabled.
+ */
+public class WindowArea
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+constructor(
+
+    /**
+     * The [WindowMetrics] that represent the size of the area. Used to determine if the behavior
+     * desired fits the size of the window area available.
+     */
+    public val windowMetrics: WindowMetrics,
+
+    /** The [Type] of this window area */
+    public val type: Type,
+
+    /** [WindowAreaToken] token to identify the specific WindowArea */
+    public val token: WindowAreaToken,
+
+    /**
+     * Map of [WindowAreaCapability.Operation]s to their status objects that this [WindowArea]
+     * currently supports
+     */
+    internal val capabilityMap: Map<WindowAreaCapability.Operation, WindowAreaCapability>,
+) {
+
+    /**
+     * Returns the [WindowAreaCapability] corresponding to the [operation] provided. If this
+     * [WindowAreaCapability] does not exist for this [WindowArea], a [WindowAreaCapability] with a
+     * [WINDOW_AREA_STATUS_UNSUPPORTED] value is returned.
+     */
+    public fun getCapability(operation: WindowAreaCapability.Operation): WindowAreaCapability {
+        return capabilityMap[operation]
+            ?: WindowAreaCapability(operation, WINDOW_AREA_STATUS_UNSUPPORTED)
+    }
+
+    /** Represents a type of [WindowArea] */
+    public class Type private constructor(private val rawValue: Int) {
+        override fun toString(): String {
+            return when (this) {
+                TYPE_REAR_FACING -> "REAR FACING"
+                else -> "UNKNOWN"
+            }
+        }
+
+        public companion object {
+            /**
+             * Type of window area that is facing the same direction as the rear camera(s) on the
+             * device.
+             */
+            @JvmField public val TYPE_REAR_FACING: Type = Type(0)
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+
+        return other is WindowArea &&
+            windowMetrics == other.windowMetrics &&
+            token == other.token &&
+            type == other.type &&
+            capabilityMap.entries == other.capabilityMap.entries
+    }
+
+    override fun hashCode(): Int {
+        var result = windowMetrics.hashCode()
+        result = 31 * result + token.hashCode()
+        result = 31 * result + type.hashCode()
+        result = 31 * result + capabilityMap.entries.hashCode()
+        return result
+    }
+
+    override fun toString(): String {
+        return "WindowAreaInfo{ Metrics: $windowMetrics, type: $type, " +
+            "Capabilities: ${capabilityMap.entries} }"
+    }
+}
diff --git a/window/window/src/main/java/androidx/window/area/WindowAreaCapability.kt b/window/window/src/main/java/androidx/window/area/WindowAreaCapability.kt
index 0cd32bb13918a..8b25292f3b7c4 100644
--- a/window/window/src/main/java/androidx/window/area/WindowAreaCapability.kt
+++ b/window/window/src/main/java/androidx/window/area/WindowAreaCapability.kt
@@ -16,22 +16,35 @@
 
 package androidx.window.area
 
-import android.app.Activity
-import androidx.window.core.ExperimentalWindowApi
-
-/** Represents a capability for a [WindowAreaInfo]. */
-@ExperimentalWindowApi
+/** Represents a capability for a [WindowArea]. */
 public class WindowAreaCapability
 internal constructor(public val operation: Operation, public val status: Status) {
     override fun toString(): String {
-        return "Operation: $operation: Status: $status"
+        return "WindowAreaCapability [Operation: $operation: Status: $status]"
     }
 
     /** Represents the status of availability for a specific [WindowAreaCapability] */
-    @ExperimentalWindowApi
-    public class Status private constructor(private val description: String) {
+    public class Status private constructor(private val rawValue: Int) {
         override fun toString(): String {
-            return description
+            return when (this) {
+                WINDOW_AREA_STATUS_UNSUPPORTED -> "UNSUPPORTED"
+                WINDOW_AREA_STATUS_UNAVAILABLE -> "UNAVAILABLE"
+                WINDOW_AREA_STATUS_AVAILABLE -> "AVAILABLE"
+                WINDOW_AREA_STATUS_ACTIVE -> "ACTIVE"
+                else -> "UNKNOWN"
+            }
+        }
+
+        override fun equals(other: Any?): Boolean {
+            if (this === other) return true
+            if (other == null) return false
+            if (other !is Status) return false
+
+            return rawValue == other.rawValue
+        }
+
+        override fun hashCode(): Int {
+            return rawValue
         }
 
         public companion object {
@@ -39,46 +52,62 @@ internal constructor(public val operation: Operation, public val status: Status)
              * Status indicating that the WindowArea feature status is unknown, e.g. a status has
              * not been received from the extensions implementation yet. Note that this is an
              * internal status - external clients should receive [WINDOW_AREA_STATUS_UNSUPPORTED]
-             * instead. See [WindowAreaAdapter].
+             * instead. See [androidx.window.area.adapter.WindowAreaAdapter].
              */
-            internal val WINDOW_AREA_STATUS_UNKNOWN = Status("UNKNOWN")
+            internal val WINDOW_AREA_STATUS_UNKNOWN = Status(0)
 
             /**
              * Status indicating that the WindowArea feature is not a supported feature on the
              * device.
              */
-            @JvmField public val WINDOW_AREA_STATUS_UNSUPPORTED: Status = Status("UNSUPPORTED")
+            @JvmField public val WINDOW_AREA_STATUS_UNSUPPORTED: Status = Status(1)
 
             /**
              * Status indicating that the WindowArea feature is currently not available to be
              * enabled. This could be because a different feature is active, or the current device
              * configuration doesn't allow it.
              */
-            @JvmField public val WINDOW_AREA_STATUS_UNAVAILABLE: Status = Status("UNAVAILABLE")
+            @JvmField public val WINDOW_AREA_STATUS_UNAVAILABLE: Status = Status(2)
 
             /** Status indicating that the WindowArea feature is available to be enabled. */
-            @JvmField public val WINDOW_AREA_STATUS_AVAILABLE: Status = Status("AVAILABLE")
+            @JvmField public val WINDOW_AREA_STATUS_AVAILABLE: Status = Status(3)
 
             /** Status indicating that the WindowArea feature is currently active. */
-            @JvmField public val WINDOW_AREA_STATUS_ACTIVE: Status = Status("ACTIVE")
+            @JvmField public val WINDOW_AREA_STATUS_ACTIVE: Status = Status(4)
         }
     }
 
-    /** Represents an operation that a [WindowAreaInfo] may support. */
-    @ExperimentalWindowApi
-    public class Operation private constructor(private val description: String) {
+    /** Represents an operation that a [WindowArea] may support. */
+    public class Operation private constructor(private val rawValue: Int) {
         override fun toString(): String {
-            return description
+            return when (this) {
+                OPERATION_TRANSFER_TO_AREA -> "TRANSFER"
+                OPERATION_PRESENT_ON_AREA -> "PRESENT"
+                else -> "UNKNOWN"
+            }
+        }
+
+        override fun equals(other: Any?): Boolean {
+            if (this === other) return true
+            if (other == null) return false
+            if (other::class != Operation::class) return false
+
+            other as Operation
+
+            return rawValue == other.rawValue
+        }
+
+        override fun hashCode(): Int {
+            return rawValue
         }
 
         public companion object {
 
-            /** Operation that transfers an [Activity] into a [WindowAreaInfo] */
-            @JvmField
-            public val OPERATION_TRANSFER_ACTIVITY_TO_AREA: Operation = Operation("TRANSFER")
+            /** Operation that moves the device into a [WindowArea] */
+            @JvmField public val OPERATION_TRANSFER_TO_AREA: Operation = Operation(0)
 
-            /** Operation that presents additional content into a [WindowAreaInfo] */
-            @JvmField public val OPERATION_PRESENT_ON_AREA: Operation = Operation("PRESENT")
+            /** Operation that presents additional content into a [WindowArea] */
+            @JvmField public val OPERATION_PRESENT_ON_AREA: Operation = Operation(1)
         }
     }
 
diff --git a/window/window/src/main/java/androidx/window/area/WindowAreaController.kt b/window/window/src/main/java/androidx/window/area/WindowAreaController.kt
index 4c986ebd62205..529428660996e 100644
--- a/window/window/src/main/java/androidx/window/area/WindowAreaController.kt
+++ b/window/window/src/main/java/androidx/window/area/WindowAreaController.kt
@@ -17,84 +17,93 @@
 package androidx.window.area
 
 import android.app.Activity
-import android.os.Binder
 import android.os.Build
 import android.util.Log
 import androidx.annotation.RestrictTo
-import androidx.window.WindowSdkExtensions
-import androidx.window.area.WindowAreaInfo.Type.Companion.TYPE_REAR_FACING
+import androidx.core.util.Consumer
+import androidx.window.area.WindowArea.Type.Companion.TYPE_REAR_FACING
+import androidx.window.area.WindowAreaCapability.Operation.Companion.OPERATION_TRANSFER_TO_AREA
+import androidx.window.area.WindowAreaCapability.Status.Companion.WINDOW_AREA_STATUS_AVAILABLE
 import androidx.window.core.BuildConfig
 import androidx.window.core.ExperimentalWindowApi
 import androidx.window.core.ExtensionsUtil
 import androidx.window.core.VerificationMode
 import java.util.concurrent.Executor
-import kotlinx.coroutines.flow.Flow
 
 /**
  * An interface to provide the information and behavior around moving windows between displays or
  * display areas on a device.
  */
-@ExperimentalWindowApi
 public abstract class WindowAreaController
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 constructor() {
 
     /**
-     * [Flow] of the list of current [WindowAreaInfo]s that are currently available to be interacted
-     * with.
+     * Registers a listener that is interested in the current list of [WindowArea] available to be
+     * interacted with.
      *
-     * If [WindowSdkExtensions.extensionVersion] is less than 2, the flow will return empty
-     * [WindowAreaInfo] list flow.
+     * The [listener] will receive an initial value on registration, as soon as it becomes
+     * available.
+     *
+     * @param executor to handle sending listener updates.
+     * @param listener to receive updates to the list of [WindowArea].
+     * @see WindowAreaController.transferToWindowArea
+     * @see WindowAreaController.presentContentOnWindowArea
+     */
+    public abstract fun addWindowAreasListener(
+        executor: Executor,
+        listener: Consumer<List<WindowArea>>,
+    )
+
+    /**
+     * Removes a listener of available [WindowArea] records. If the listener is not present then
+     * this method is a no-op.
+     *
+     * @param listener to remove from receiving status updates.
+     * @see WindowAreaController.transferToWindowArea
+     * @see WindowAreaController.presentContentOnWindowArea
      */
-    public abstract val windowAreaInfos: Flow<List<WindowAreaInfo>>
+    public abstract fun removeWindowAreasListener(listener: Consumer<List<WindowArea>>)
 
     /**
-     * Starts a transfer session where the calling [Activity] is moved to the window area identified
-     * by the [token]. Updates on the session are provided through the [WindowAreaSessionCallback].
-     * Attempting to start a transfer session when the [WindowAreaInfo] does not return
-     * [WindowAreaCapability.Status.WINDOW_AREA_STATUS_AVAILABLE] will result in
-     * [WindowAreaSessionCallback.onSessionEnded] containing an [IllegalStateException]
+     * Moves the calling [Activity] and the global state of the device to the [WindowArea] provided.
+     * This is a long lasting and sticky operation that will outlive the application that requests
+     * this operation. Status updates can be received from the value received by registering a
+     * listener through [addWindowAreasListener] and then querying for the
+     * [WindowAreaCapability.Operation.OPERATION_TRANSFER_TO_AREA] operation.
      *
-     * Only the top visible application can request to start a transfer session.
+     * Attempting to move the device to a window area when the [WindowArea] does not return
+     * [WindowAreaCapability.Status.WINDOW_AREA_STATUS_AVAILABLE] will result in an
+     * [IllegalStateException].
      *
-     * The calling [Activity] will likely go through a configuration change since the window area it
-     * will be transferred to is usually different from the current area the [Activity] is in. The
-     * callback is retained during the lifetime of the session. If an [Activity] is captured in the
-     * callback and it does not handle the configuration change then it will be leaked. Consider
-     * using an [androidx.lifecycle.ViewModel] since that is meant to outlive the [Activity]
-     * lifecycle. If the [Activity] does override configuration changes, it is safe to have the
-     * [Activity] handle the WindowAreaSessionCallback. This guarantees that the calling [Activity]
-     * will continue to receive [WindowAreaSessionCallback.onSessionEnded] and keep a handle to the
-     * [WindowAreaSession] provided through [WindowAreaSessionCallback.onSessionStarted].
+     * Only the top visible application can request the device ot move to a [WindowArea]. If this
+     * operation is requested when the application is not the top level process, a
+     * [SecurityException] will be thrown.
      *
-     * The [windowAreaSessionCallback] provided will receive a call to
-     * [WindowAreaSessionCallback.onSessionStarted] after the [Activity] has been transferred to the
-     * window area. The transfer session will stay active until the session provided through
-     * [WindowAreaSessionCallback.onSessionStarted] is closed. Depending on the
-     * [WindowAreaInfo.Type] there may be other triggers that end the session, such as if a device
-     * state change makes the window area unavailable. One example of this is if the [Activity] is
-     * currently transferred to the [TYPE_REAR_FACING] window area of a foldable device, the session
-     * will be ended when the device is closed. When this occurs,
-     * [WindowAreaSessionCallback.onSessionEnded] is called.
+     * Passing a null [WindowAreaToken] returns back to the default window area (usually going to be
+     * the [android.view.Display.DEFAULT_DISPLAY]). Depending on the [WindowArea.Type] there may be
+     * other triggers that end the session, such as if a device state change makes the window area
+     * =unavailable. One example of this is if the device is currently moved to the
+     * [TYPE_REAR_FACING] window area of a foldable device, the device will be moved back to the
+     * default window area, and the status of the operation will no longer be
+     * [WindowAreaCapability.Status.WINDOW_AREA_STATUS_ACTIVE].
      *
-     * @param token [Binder] token identifying the window area to be transferred to.
-     * @param activity Base Activity making the call to [transferActivityToWindowArea].
-     * @param executor Executor used to provide updates to [windowAreaSessionCallback].
-     * @param windowAreaSessionCallback to be notified when the rear display session is started and
-     *   ended.
-     * @see windowAreaInfos
+     * @param windowAreaToken [WindowAreaToken] window area token that identifies the [WindowArea]
+     *   to move to.
+     * @param activity Base Activity making the call to [transferToWindowArea].
+     * @throws IllegalStateException if this method is called when the provided [WindowArea] does
+     *   not have a [WINDOW_AREA_STATUS_AVAILABLE] status for [OPERATION_TRANSFER_TO_AREA].
+     * @throws SecurityException if this method is called from a process that is not the top-level
+     *   process.
+     * @throws IllegalArgumentException if this method is called with a [WindowArea] with a
+     *   [WindowArea.Type] that is unrecognized.
+     * @see windowAreas
      */
-    public abstract fun transferActivityToWindowArea(
-        token: Binder,
-        activity: Activity,
-        executor: Executor,
-        // TODO(272064992) investigate how to make this safer from leaks
-        windowAreaSessionCallback: WindowAreaSessionCallback,
-    )
+    public abstract fun transferToWindowArea(windowAreaToken: WindowAreaToken?, activity: Activity)
 
     /**
-     * Starts a presentation session on the [WindowAreaInfo] identified by the [token] and sends
-     * updates through the [WindowAreaPresentationSessionCallback].
+     * Starts a presentation session on the [WindowArea] identified by the [windowAreaToken] and
+     * sends updates through the [WindowAreaPresentationSessionCallback].
      *
      * If a presentation session is attempted to be started without it being available,
      * [WindowAreaPresentationSessionCallback.onSessionEnded] will be called immediately with an
@@ -103,8 +112,8 @@ constructor() {
      * Only the top visible application can request to start a presentation session.
      *
      * The presentation session will stay active until the presentation provided through
-     * [WindowAreaPresentationSessionCallback.onSessionStarted] is closed. The [WindowAreaInfo.Type]
-     * may provide different triggers to close the session such as if the calling application is no
+     * [WindowAreaPresentationSessionCallback.onSessionStarted] is closed. The [WindowArea.Type] may
+     * provide different triggers to close the session such as if the calling application is no
      * longer in the foreground, or there is a device state change that makes the window area
      * unavailable to be presented on. One example scenario is if a [TYPE_REAR_FACING] window area
      * is being presented to on a foldable device that is open and has 2 screens. If the device is
@@ -113,20 +122,33 @@ constructor() {
      * has been ended. The session may end prematurely if the device gets to a critical thermal
      * level, or if power saver mode is enabled.
      *
-     * @param token [Binder] token to identify which [WindowAreaInfo] is to be presented on
+     * @param windowAreaToken identifier for which [WindowArea] is to be presented on
      * @param activity An [Activity] that will present content on the Rear Display.
      * @param executor Executor used to provide updates to [windowAreaPresentationSessionCallback].
      * @param windowAreaPresentationSessionCallback to be notified of updates to the lifecycle of
      *   the currently enabled rear display presentation.
-     * @see windowAreaInfos
+     * @see addWindowAreasListener
      */
+    @ExperimentalWindowApi
     public abstract fun presentContentOnWindowArea(
-        token: Binder,
+        windowAreaToken: WindowAreaToken,
         activity: Activity,
         executor: Executor,
         windowAreaPresentationSessionCallback: WindowAreaPresentationSessionCallback,
     )
 
+    /**
+     * Returns the current active [WindowAreaSessionPresenter] if one is currently active in the
+     * [WindowArea] identified by the provided [WindowAreaToken].
+     *
+     * @throws IllegalArgumentException if there is no active presentation session for the provided
+     *   [windowAreaToken].
+     */
+    @ExperimentalWindowApi
+    public abstract fun getActivePresentationSession(
+        windowAreaToken: WindowAreaToken
+    ): WindowAreaSessionPresenter
+
     public companion object {
 
         private val TAG = WindowAreaController::class.simpleName
@@ -140,7 +162,7 @@ constructor() {
                     }
                 } catch (t: Throwable) {
                     if (BuildConfig.verificationMode == VerificationMode.LOG) {
-                        Log.d(TAG, "Failed to load WindowExtensions")
+                        Log.d(TAG, "Failed to load WindowExtensions: ${t.message}")
                     }
                     null
                 }
@@ -151,7 +173,7 @@ constructor() {
                     ExtensionsUtil.safeVendorApiLevel >= 3
 
             if (deviceSupported) {
-                WindowAreaControllerImpl(windowAreaComponent = windowAreaComponentExtensions!!)
+                WindowAreaControllerImpl(windowAreaComponent = windowAreaComponentExtensions)
             } else {
                 EmptyWindowAreaControllerImpl()
             }
@@ -179,7 +201,6 @@ constructor() {
 }
 
 /** Decorator that allows us to provide different functionality in our window-testing artifact. */
-@ExperimentalWindowApi
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public interface WindowAreaControllerDecorator {
     /** Returns an instance of [WindowAreaController] associated to the [Activity] */
@@ -187,7 +208,6 @@ public interface WindowAreaControllerDecorator {
     public fun decorate(controller: WindowAreaController): WindowAreaController
 }
 
-@ExperimentalWindowApi
 private object EmptyDecorator : WindowAreaControllerDecorator {
     override fun decorate(controller: WindowAreaController): WindowAreaController {
         return controller
diff --git a/window/window/src/main/java/androidx/window/area/WindowAreaControllerImpl.kt b/window/window/src/main/java/androidx/window/area/WindowAreaControllerImpl.kt
index 7b26db3bb1d07..9868cb3c636ce 100644
--- a/window/window/src/main/java/androidx/window/area/WindowAreaControllerImpl.kt
+++ b/window/window/src/main/java/androidx/window/area/WindowAreaControllerImpl.kt
@@ -21,12 +21,18 @@ import android.os.Binder
 import android.os.Build
 import android.util.DisplayMetrics
 import android.util.Log
+import androidx.annotation.GuardedBy
 import androidx.annotation.RequiresApi
+import androidx.core.util.Consumer
 import androidx.window.RequiresWindowSdkExtension
+import androidx.window.area.WindowArea.Type.Companion.TYPE_REAR_FACING
+import androidx.window.area.WindowAreaCapability.Operation.Companion.OPERATION_PRESENT_ON_AREA
+import androidx.window.area.WindowAreaCapability.Operation.Companion.OPERATION_TRANSFER_TO_AREA
 import androidx.window.area.WindowAreaCapability.Status.Companion.WINDOW_AREA_STATUS_ACTIVE
 import androidx.window.area.WindowAreaCapability.Status.Companion.WINDOW_AREA_STATUS_AVAILABLE
 import androidx.window.area.WindowAreaCapability.Status.Companion.WINDOW_AREA_STATUS_UNKNOWN
 import androidx.window.area.WindowAreaCapability.Status.Companion.WINDOW_AREA_STATUS_UNSUPPORTED
+import androidx.window.area.WindowAreaControllerImpl.Companion.REAR_DISPLAY_WINDOW_AREA_TOKEN
 import androidx.window.area.adapter.WindowAreaAdapter
 import androidx.window.core.BuildConfig
 import androidx.window.core.ExperimentalWindowApi
@@ -42,9 +48,6 @@ import androidx.window.layout.WindowMetrics
 import androidx.window.layout.WindowMetricsCalculator
 import androidx.window.reflection.Consumer2
 import java.util.concurrent.Executor
-import kotlinx.coroutines.channels.awaitClose
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.callbackFlow
 
 /**
  * Implementation of WindowAreaController for devices that do implement the WindowAreaComponent on
@@ -54,7 +57,6 @@ import kotlinx.coroutines.flow.callbackFlow
  * levels lower than [Build.VERSION_CODES.S] as that's the min level of support for this
  * functionality.
  */
-@ExperimentalWindowApi
 @RequiresWindowSdkExtension(3)
 @RequiresApi(Build.VERSION_CODES.Q)
 internal class WindowAreaControllerImpl(private val windowAreaComponent: WindowAreaComponent) :
@@ -69,42 +71,65 @@ internal class WindowAreaControllerImpl(private val windowAreaComponent: WindowA
     private var activeWindowAreaSession: Boolean = false
     private var presentationSessionActive: Boolean = false
 
-    private val currentWindowAreaInfoMap = HashMap<String, WindowAreaInfo>()
+    private val lock = Any()
 
-    override val windowAreaInfos: Flow<List<WindowAreaInfo>>
-        get() {
-            return callbackFlow {
-                val rearDisplayListener =
-                    Consumer2<Int> { status ->
-                        updateRearDisplayAvailability(status)
-                        channel.trySend(currentWindowAreaInfoMap.values.toList())
-                    }
-                val rearDisplayPresentationListener =
-                    Consumer2<ExtensionWindowAreaStatus> { extensionWindowAreaStatus ->
-                        updateRearDisplayPresentationAvailability(extensionWindowAreaStatus)
-                        channel.trySend(currentWindowAreaInfoMap.values.toList())
-                    }
+    @GuardedBy("lock") private val currentWindowAreaMap = HashMap<WindowAreaToken, WindowArea>()
 
-                windowAreaComponent.addRearDisplayStatusListener(rearDisplayListener)
-                windowAreaComponent.addRearDisplayPresentationStatusListener(
-                    rearDisplayPresentationListener
-                )
+    private val listeners = ArrayList<Pair<Executor, Consumer<List<WindowArea>>>>()
 
-                awaitClose {
-                    windowAreaComponent.removeRearDisplayStatusListener(rearDisplayListener)
-                    windowAreaComponent.removeRearDisplayPresentationStatusListener(
-                        rearDisplayPresentationListener
-                    )
-                }
+    val rearDisplayExtensionListener =
+        Consumer2<Int> { status ->
+            updateRearDisplayAvailability(status)
+            updateWindowAreaListeners()
+        }
+    val rearDisplayPresentationExtensionListener =
+        Consumer2<ExtensionWindowAreaStatus> { extensionWindowAreaStatus ->
+            updateRearDisplayPresentationAvailability(extensionWindowAreaStatus)
+            updateWindowAreaListeners()
+        }
+
+    override fun addWindowAreasListener(executor: Executor, listener: Consumer<List<WindowArea>>) {
+        synchronized(lock) {
+            if (listeners.isEmpty()) {
+                listeners.add(Pair(executor, listener))
+                initializeExtensionListeners()
+            } else {
+                listeners.add(Pair(executor, listener))
+                executor.execute { listener.accept(currentWindowAreaMap.values.toList()) }
+            }
+        }
+    }
+
+    override fun removeWindowAreasListener(listener: Consumer<List<WindowArea>>) {
+        synchronized(lock) {
+            val valueToRemove = listeners.firstOrNull { it.second == listener }
+            valueToRemove?.let { listenerToRemove -> listeners.remove(listenerToRemove) }
+            if (listeners.isEmpty()) {
+                removeExtensionListeners()
             }
         }
+    }
+
+    private fun initializeExtensionListeners() {
+        windowAreaComponent.addRearDisplayStatusListener(rearDisplayExtensionListener)
+        windowAreaComponent.addRearDisplayPresentationStatusListener(
+            rearDisplayPresentationExtensionListener
+        )
+    }
+
+    private fun removeExtensionListeners() {
+        windowAreaComponent.removeRearDisplayStatusListener(rearDisplayExtensionListener)
+        windowAreaComponent.removeRearDisplayPresentationStatusListener(
+            rearDisplayPresentationExtensionListener
+        )
+    }
 
     private fun updateRearDisplayAvailability(status: @WindowAreaComponent.WindowAreaStatus Int) {
         val rearDisplayWindowMetrics = getRearDisplayMetrics(windowAreaComponent)
 
         currentRearDisplayModeStatus = WindowAreaAdapter.translate(status, activeWindowAreaSession)
         updateRearDisplayWindowArea(
-            WindowAreaCapability.Operation.OPERATION_TRANSFER_ACTIVITY_TO_AREA,
+            OPERATION_TRANSFER_TO_AREA,
             currentRearDisplayModeStatus,
             rearDisplayWindowMetrics,
         )
@@ -118,19 +143,19 @@ internal class WindowAreaControllerImpl(private val windowAreaComponent: WindowA
                 extensionWindowAreaStatus.windowAreaStatus,
                 presentationSessionActive,
             )
-        val windowMetrics = getRearDisplayMetrics(windowAreaComponent)
+        val rearDisplayWindowMetrics = getRearDisplayMetrics(windowAreaComponent)
 
         updateRearDisplayWindowArea(
-            WindowAreaCapability.Operation.OPERATION_PRESENT_ON_AREA,
+            OPERATION_PRESENT_ON_AREA,
             currentRearDisplayPresentationStatus,
-            windowMetrics,
+            rearDisplayWindowMetrics,
         )
     }
 
     /**
-     * Updates the [WindowAreaInfo] object with the [REAR_DISPLAY_BINDER_DESCRIPTOR] binder token
-     * with the updated [status] corresponding to the [operation] and with the updated [metrics]
-     * received from the device for this window area.
+     * Updates the [WindowArea] object with the [REAR_DISPLAY_WINDOW_AREA_TOKEN] token with the
+     * updated [status] corresponding to the [operation] and with the updated [metrics] received
+     * from the device for this window area.
      *
      * @param operation Operation that we are updating the status of.
      * @param status New status for the operation provided on this window area.
@@ -141,41 +166,40 @@ internal class WindowAreaControllerImpl(private val windowAreaComponent: WindowA
         status: WindowAreaCapability.Status,
         metrics: WindowMetrics,
     ) {
-        var rearDisplayAreaInfo: WindowAreaInfo? =
-            currentWindowAreaInfoMap[REAR_DISPLAY_BINDER_DESCRIPTOR]
-        if (status == WINDOW_AREA_STATUS_UNSUPPORTED) {
-            rearDisplayAreaInfo?.let { info ->
-                if (shouldRemoveWindowAreaInfo(info)) {
-                    currentWindowAreaInfoMap.remove(REAR_DISPLAY_BINDER_DESCRIPTOR)
-                } else {
-                    val capability = WindowAreaCapability(operation, status)
-                    info.capabilityMap[operation] = capability
-                }
-            }
-        } else {
-            if (rearDisplayAreaInfo == null) {
-                rearDisplayAreaInfo =
-                    WindowAreaInfo(
-                        metrics = metrics,
-                        type = WindowAreaInfo.Type.TYPE_REAR_FACING,
-                        // TODO(b/273807238): Update extensions to send the binder token and type
-                        token = Binder(REAR_DISPLAY_BINDER_DESCRIPTOR),
-                        windowAreaComponent = windowAreaComponent,
-                    )
-            }
-            val capability = WindowAreaCapability(operation, status)
-            rearDisplayAreaInfo.capabilityMap[operation] = capability
-            rearDisplayAreaInfo.metrics = metrics
-            currentWindowAreaInfoMap[REAR_DISPLAY_BINDER_DESCRIPTOR] = rearDisplayAreaInfo
+        val rearDisplayAreaInfo: WindowArea? =
+            synchronized(lock) { currentWindowAreaMap[REAR_DISPLAY_WINDOW_AREA_TOKEN] }
+
+        if (
+            status == WINDOW_AREA_STATUS_UNSUPPORTED &&
+                (rearDisplayAreaInfo == null || shouldRemoveWindowAreaInfo(rearDisplayAreaInfo))
+        ) {
+            synchronized(lock) { currentWindowAreaMap.remove(REAR_DISPLAY_WINDOW_AREA_TOKEN) }
+            return
+        }
+
+        val capability = WindowAreaCapability(operation, status)
+        val capabilityMap: MutableMap<WindowAreaCapability.Operation, WindowAreaCapability> =
+            rearDisplayAreaInfo?.capabilityMap?.toMutableMap() ?: HashMap()
+        capabilityMap[operation] = capability
+
+        val rearDisplayWindowArea =
+            WindowArea(
+                windowMetrics = metrics,
+                type = TYPE_REAR_FACING,
+                capabilityMap = capabilityMap.toMap(),
+                token = REAR_DISPLAY_WINDOW_AREA_TOKEN,
+            )
+        synchronized(lock) {
+            currentWindowAreaMap[rearDisplayWindowArea.token] = rearDisplayWindowArea
         }
     }
 
     /**
-     * Determines if a [WindowAreaInfo] should be removed from [windowAreaInfos] if all
+     * Determines if a [WindowArea] should be removed from [currentWindowAreaMap] if all
      * [WindowAreaCapability] are currently [WINDOW_AREA_STATUS_UNSUPPORTED]
      */
-    private fun shouldRemoveWindowAreaInfo(windowAreaInfo: WindowAreaInfo): Boolean {
-        for (capability: WindowAreaCapability in windowAreaInfo.capabilityMap.values) {
+    private fun shouldRemoveWindowAreaInfo(windowArea: WindowArea): Boolean {
+        for (capability: WindowAreaCapability in windowArea.capabilityMap.values) {
             if (capability.status != WINDOW_AREA_STATUS_UNSUPPORTED) {
                 return false
             }
@@ -183,31 +207,41 @@ internal class WindowAreaControllerImpl(private val windowAreaComponent: WindowA
         return true
     }
 
-    override fun transferActivityToWindowArea(
-        token: Binder,
-        activity: Activity,
-        executor: Executor,
-        windowAreaSessionCallback: WindowAreaSessionCallback,
-    ) {
-        if (token.interfaceDescriptor != REAR_DISPLAY_BINDER_DESCRIPTOR) {
-            executor.execute {
-                windowAreaSessionCallback.onSessionEnded(
-                    IllegalArgumentException("Invalid WindowAreaInfo token")
-                )
+    override fun transferToWindowArea(windowAreaToken: WindowAreaToken?, activity: Activity) {
+        if (windowAreaToken == null) {
+            moveDeviceToDefaultWindowArea()
+        } else {
+            if (currentWindowAreaMap[windowAreaToken]?.type != TYPE_REAR_FACING) {
+                throw IllegalArgumentException("Invalid WindowAreaInfo type")
             }
-            return
+            startRearDisplayMode(activity)
         }
+    }
 
-        startRearDisplayMode(activity, executor, windowAreaSessionCallback)
+    private fun moveDeviceToDefaultWindowArea() {
+        val activeTransferWindowArea =
+            synchronized(lock) {
+                currentWindowAreaMap.values.firstOrNull { windowAreaInfo ->
+                    windowAreaInfo.getCapability(OPERATION_TRANSFER_TO_AREA).status ==
+                        WINDOW_AREA_STATUS_ACTIVE
+                } ?: return
+            }
+
+        if (activeTransferWindowArea.type == TYPE_REAR_FACING) {
+            windowAreaComponent.endRearDisplaySession()
+        }
     }
 
+    @ExperimentalWindowApi
     override fun presentContentOnWindowArea(
-        token: Binder,
+        windowAreaToken: WindowAreaToken,
         activity: Activity,
         executor: Executor,
         windowAreaPresentationSessionCallback: WindowAreaPresentationSessionCallback,
     ) {
-        if (token.interfaceDescriptor != REAR_DISPLAY_BINDER_DESCRIPTOR) {
+        val windowArea = synchronized(lock) { currentWindowAreaMap[windowAreaToken] }
+
+        if (windowArea?.type != TYPE_REAR_FACING) {
             executor.execute {
                 windowAreaPresentationSessionCallback.onSessionEnded(
                     IllegalArgumentException("Invalid WindowAreaInfo token")
@@ -219,41 +253,31 @@ internal class WindowAreaControllerImpl(private val windowAreaComponent: WindowA
         startRearDisplayPresentationMode(activity, executor, windowAreaPresentationSessionCallback)
     }
 
-    private fun startRearDisplayMode(
-        activity: Activity,
-        executor: Executor,
-        windowAreaSessionCallback: WindowAreaSessionCallback,
-    ) {
+    private fun startRearDisplayMode(activity: Activity) {
         // If the capability is currently active, provide an error pointing the developer on how to
         // get access to the current session
         if (currentRearDisplayModeStatus == WINDOW_AREA_STATUS_ACTIVE) {
-            windowAreaSessionCallback.onSessionEnded(
-                IllegalStateException(
-                    "The WindowArea feature is currently active, WindowAreaInfo#getActiveSession" +
-                        "can be used to get an instance of the current active session"
-                )
+            throw IllegalStateException(
+                "The WindowArea feature is currently active, WindowAreaInfo#getActiveSession" +
+                    "can be used to get an instance of the current active session"
             )
-            return
         }
 
         // If we already have an availability value that is not
         // [Availability.WINDOW_AREA_CAPABILITY_AVAILABLE] we should end the session and pass an
         // exception to indicate they tried to enable rear display mode when it was not available.
         if (currentRearDisplayModeStatus != WINDOW_AREA_STATUS_AVAILABLE) {
-            windowAreaSessionCallback.onSessionEnded(
-                IllegalStateException(
-                    "The WindowArea feature is currently not available to be entered"
-                )
+            throw IllegalStateException(
+                "The WindowArea feature is currently not available to be entered"
             )
-            return
         }
 
         activeWindowAreaSession = true
-        rearDisplaySessionConsumer =
-            RearDisplaySessionConsumer(executor, windowAreaSessionCallback, windowAreaComponent)
+        rearDisplaySessionConsumer = RearDisplaySessionConsumer()
         windowAreaComponent.startRearDisplaySession(activity, rearDisplaySessionConsumer)
     }
 
+    @ExperimentalWindowApi
     private fun startRearDisplayPresentationMode(
         activity: Activity,
         executor: Executor,
@@ -279,6 +303,37 @@ internal class WindowAreaControllerImpl(private val windowAreaComponent: WindowA
         )
     }
 
+    @ExperimentalWindowApi
+    override fun getActivePresentationSession(
+        windowAreaToken: WindowAreaToken
+    ): WindowAreaSessionPresenter {
+        val windowArea = synchronized(lock) { currentWindowAreaMap[windowAreaToken] }
+
+        if (
+            windowArea == null ||
+                windowArea.getCapability(OPERATION_PRESENT_ON_AREA).status !=
+                    WINDOW_AREA_STATUS_ACTIVE
+        ) {
+            throw IllegalArgumentException("No session is currently active")
+        }
+
+        if (windowArea.type != TYPE_REAR_FACING) {
+            throw IllegalArgumentException(
+                "Unable to create session for window area info type: ${windowArea.type}"
+            )
+        }
+        return createRearFacingPresentationSession()
+    }
+
+    @ExperimentalWindowApi
+    private fun createRearFacingPresentationSession(): WindowAreaSessionPresenter {
+        return RearDisplayPresentationSessionPresenterImpl(
+            windowAreaComponent,
+            windowAreaComponent.rearDisplayPresentation!!,
+            ExtensionsUtil.safeVendorApiLevel,
+        )
+    }
+
     private fun getRearDisplayMetrics(windowAreaComponent: WindowAreaComponent): WindowMetrics {
         val rearDisplayMetrics =
             try {
@@ -290,39 +345,33 @@ internal class WindowAreaControllerImpl(private val windowAreaComponent: WindowA
         return WindowMetricsCalculator.fromDisplayMetrics(displayMetrics = rearDisplayMetrics)
     }
 
-    internal inner class RearDisplaySessionConsumer(
-        private val executor: Executor,
-        private val appCallback: WindowAreaSessionCallback,
-        private val extensionsComponent: WindowAreaComponent,
-    ) : Consumer2<Int> {
+    private fun updateWindowAreaListeners() {
+        synchronized(lock) {
+            listeners.forEach { listener ->
+                listener.first.execute {
+                    listener.second.accept(currentWindowAreaMap.values.toList())
+                }
+            }
+        }
+    }
 
-        private var session: WindowAreaSession? = null
+    internal inner class RearDisplaySessionConsumer() : Consumer2<Int> {
 
         override fun accept(value: Int) {
             when (value) {
-                SESSION_STATE_ACTIVE -> onSessionStarted()
-                SESSION_STATE_INACTIVE -> onSessionFinished()
+                SESSION_STATE_ACTIVE -> return
+                SESSION_STATE_INACTIVE -> activeWindowAreaSession = false
                 else -> {
                     if (BuildConfig.verificationMode == VerificationMode.STRICT) {
                         Log.d(TAG, "Received an unknown session status value: $value")
                     }
-                    onSessionFinished()
+                    activeWindowAreaSession = false
                 }
             }
         }
-
-        private fun onSessionStarted() {
-            session = RearDisplaySessionImpl(extensionsComponent)
-            session?.let { executor.execute { appCallback.onSessionStarted(it) } }
-        }
-
-        private fun onSessionFinished() {
-            activeWindowAreaSession = false
-            session = null
-            executor.execute { appCallback.onSessionEnded(null) }
-        }
     }
 
+    @ExperimentalWindowApi
     internal inner class RearDisplayPresentationSessionConsumer(
         private val executor: Executor,
         private val windowAreaPresentationSessionCallback: WindowAreaPresentationSessionCallback,
@@ -372,6 +421,7 @@ internal class WindowAreaControllerImpl(private val windowAreaComponent: WindowA
     internal companion object {
         private val TAG = WindowAreaControllerImpl::class.simpleName
 
-        private const val REAR_DISPLAY_BINDER_DESCRIPTOR = "WINDOW_AREA_REAR_DISPLAY"
+        internal val REAR_DISPLAY_WINDOW_AREA_TOKEN =
+            WindowAreaToken(Binder("WINDOW_AREA_REAR_DISPLAY"))
     }
 }
diff --git a/window/window/src/main/java/androidx/window/area/WindowAreaInfo.kt b/window/window/src/main/java/androidx/window/area/WindowAreaInfo.kt
deleted file mode 100644
index c5cf21d5cbad9..0000000000000
--- a/window/window/src/main/java/androidx/window/area/WindowAreaInfo.kt
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright 2023 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.window.area
-
-import android.os.Binder
-import androidx.window.area.WindowAreaCapability.Operation.Companion.OPERATION_PRESENT_ON_AREA
-import androidx.window.area.WindowAreaCapability.Operation.Companion.OPERATION_TRANSFER_ACTIVITY_TO_AREA
-import androidx.window.area.WindowAreaCapability.Status.Companion.WINDOW_AREA_STATUS_ACTIVE
-import androidx.window.area.WindowAreaCapability.Status.Companion.WINDOW_AREA_STATUS_UNSUPPORTED
-import androidx.window.core.ExperimentalWindowApi
-import androidx.window.core.ExtensionsUtil
-import androidx.window.extensions.area.WindowAreaComponent
-import androidx.window.layout.WindowMetrics
-
-/**
- * The current state of a window area. The [WindowAreaInfo] can represent a part of or an entire
- * display in the system. These values can be used to modify the UI to show/hide controls and
- * determine when features can be enabled.
- */
-@ExperimentalWindowApi
-public class WindowAreaInfo
-internal constructor(
-
-    /**
-     * The [WindowMetrics] that represent the size of the area. Used to determine if the behavior
-     * desired fits the size of the window area available.
-     */
-    public var metrics: WindowMetrics,
-
-    /** The [Type] of this window area */
-    public val type: Type,
-
-    /** [Binder] token to identify the specific WindowArea */
-    public val token: Binder,
-    private val windowAreaComponent: WindowAreaComponent,
-) {
-
-    internal val capabilityMap = HashMap<WindowAreaCapability.Operation, WindowAreaCapability>()
-
-    /**
-     * Returns the [WindowAreaCapability] corresponding to the [operation] provided. If this
-     * [WindowAreaCapability] does not exist for this [WindowAreaInfo], a [WindowAreaCapability]
-     * with a [WINDOW_AREA_STATUS_UNSUPPORTED] value is returned.
-     */
-    public fun getCapability(operation: WindowAreaCapability.Operation): WindowAreaCapability {
-        return capabilityMap[operation]
-            ?: WindowAreaCapability(operation, WINDOW_AREA_STATUS_UNSUPPORTED)
-    }
-
-    /**
-     * Returns the current active [WindowAreaSession] is one is currently active for the provided
-     * [operation]
-     *
-     * @throws IllegalStateException if there is no active session for the provided [operation]
-     */
-    public fun getActiveSession(operation: WindowAreaCapability.Operation): WindowAreaSession? {
-        if (getCapability(operation).status != WINDOW_AREA_STATUS_ACTIVE) {
-            throw IllegalStateException("No session is currently active")
-        }
-
-        if (type == Type.TYPE_REAR_FACING) {
-            // TODO(b/273807246) We should cache instead of always creating a new session
-            return createRearFacingSession(operation)
-        }
-        return null
-    }
-
-    private fun createRearFacingSession(
-        operation: WindowAreaCapability.Operation
-    ): WindowAreaSession {
-        return when (operation) {
-            OPERATION_TRANSFER_ACTIVITY_TO_AREA -> RearDisplaySessionImpl(windowAreaComponent)
-            OPERATION_PRESENT_ON_AREA ->
-                RearDisplayPresentationSessionPresenterImpl(
-                    windowAreaComponent,
-                    windowAreaComponent.rearDisplayPresentation!!,
-                    ExtensionsUtil.safeVendorApiLevel,
-                )
-            else -> {
-                throw IllegalArgumentException("Invalid operation provided")
-            }
-        }
-    }
-
-    /** Represents a type of [WindowAreaInfo] */
-    @ExperimentalWindowApi
-    public class Type private constructor(private val description: String) {
-        override fun toString(): String {
-            return description
-        }
-
-        public companion object {
-            /**
-             * Type of window area that is facing the same direction as the rear camera(s) on the
-             * device.
-             */
-            @JvmField public val TYPE_REAR_FACING: Type = Type("REAR FACING")
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        return other is WindowAreaInfo &&
-            metrics == other.metrics &&
-            type == other.type &&
-            capabilityMap.entries == other.capabilityMap.entries
-    }
-
-    override fun hashCode(): Int {
-        var result = metrics.hashCode()
-        result = 31 * result + type.hashCode()
-        result = 31 * result + capabilityMap.entries.hashCode()
-        return result
-    }
-
-    override fun toString(): String {
-        return "WindowAreaInfo{ Metrics: $metrics, type: $type, " +
-            "Capabilities: ${capabilityMap.entries} }"
-    }
-}
diff --git a/window/window/src/main/java/androidx/window/area/WindowAreaSession.kt b/window/window/src/main/java/androidx/window/area/WindowAreaSession.kt
deleted file mode 100644
index c8921a6cb3588..0000000000000
--- a/window/window/src/main/java/androidx/window/area/WindowAreaSession.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.window.area
-
-import androidx.window.core.ExperimentalWindowApi
-
-/**
- * Session interface to represent an active window area feature.
- *
- * @see WindowAreaSessionCallback.onSessionStarted
- */
-@ExperimentalWindowApi
-public interface WindowAreaSession {
-
-    /** Closes the active session, no-op if the session is not currently active. */
-    public fun close()
-}
diff --git a/window/window/src/main/java/androidx/window/area/WindowAreaSessionCallback.kt b/window/window/src/main/java/androidx/window/area/WindowAreaSessionCallback.kt
deleted file mode 100644
index ab82449f98af7..0000000000000
--- a/window/window/src/main/java/androidx/window/area/WindowAreaSessionCallback.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.window.area
-
-import androidx.window.core.ExperimentalWindowApi
-
-/**
- * Callback to update the client on the WindowArea Session being started and ended.
- *
- * TODO(b/207720511) Move to window-java module when Kotlin API Finalized
- */
-@ExperimentalWindowApi
-public interface WindowAreaSessionCallback {
-
-    /**
-     * Notifies about a start of a session. Provides a reference to the current [WindowAreaSession]
-     * the application the ability to close the session through [WindowAreaSession.close].
-     */
-    public fun onSessionStarted(session: WindowAreaSession)
-
-    /**
-     * Notifies about an end of a [WindowAreaSession].
-     *
-     * @param t [Throwable] to provide information on if the session was ended due to an error. This
-     *   will only occur if a session is attempted to be enabled when it is not available, but can
-     *   be expanded to alert for more errors in the future.
-     */
-    public fun onSessionEnded(t: Throwable?)
-}
diff --git a/window/window/src/main/java/androidx/window/area/WindowAreaSessionPresenter.kt b/window/window/src/main/java/androidx/window/area/WindowAreaSessionPresenter.kt
index 1c5c90d7e4c54..133a1b1e152e9 100644
--- a/window/window/src/main/java/androidx/window/area/WindowAreaSessionPresenter.kt
+++ b/window/window/src/main/java/androidx/window/area/WindowAreaSessionPresenter.kt
@@ -30,7 +30,7 @@ import androidx.window.core.ExperimentalWindowApi
  * @see WindowAreaController.presentContentOnWindowArea
  */
 @ExperimentalWindowApi
-public interface WindowAreaSessionPresenter : WindowAreaSession {
+public interface WindowAreaSessionPresenter : AutoCloseable {
     /** Returns the [Context] associated with the window area. */
     public val context: Context
 
@@ -48,4 +48,7 @@ public interface WindowAreaSessionPresenter : WindowAreaSession {
      * corresponding display and start showing content.
      */
     public fun setContentView(view: View)
+
+    /** Closes the active session, no-op if the session is not currently active. */
+    public override fun close()
 }
diff --git a/window/window/src/main/java/androidx/window/area/WindowAreaToken.kt b/window/window/src/main/java/androidx/window/area/WindowAreaToken.kt
new file mode 100644
index 0000000000000..56a5b6bc78830
--- /dev/null
+++ b/window/window/src/main/java/androidx/window/area/WindowAreaToken.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2025 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.window.area
+
+import android.os.IBinder
+import androidx.annotation.RestrictTo
+
+/** Identifier wrapper around [IBinder] to identify [WindowArea]s. */
+public class WindowAreaToken internal constructor(internal val binder: IBinder) {
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as WindowAreaToken
+
+        return binder.interfaceDescriptor == other.binder.interfaceDescriptor
+    }
+
+    override fun hashCode(): Int {
+        return binder.hashCode()
+    }
+
+    override fun toString(): String {
+        return "WindowAreaInfoToken: Descriptor: ${binder.interfaceDescriptor}"
+    }
+
+    public companion object {
+        @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+        public fun fromBinder(binder: IBinder): WindowAreaToken = WindowAreaToken(binder)
+    }
+}
diff --git a/window/window/src/main/java/androidx/window/area/adapter/WindowAreaAdapter.kt b/window/window/src/main/java/androidx/window/area/adapter/WindowAreaAdapter.kt
index 4719c8b288da3..1e6f8ef760cff 100644
--- a/window/window/src/main/java/androidx/window/area/adapter/WindowAreaAdapter.kt
+++ b/window/window/src/main/java/androidx/window/area/adapter/WindowAreaAdapter.kt
@@ -18,7 +18,6 @@ package androidx.window.area.adapter
 
 import androidx.window.area.WindowAreaCapability
 import androidx.window.area.WindowAreaController
-import androidx.window.core.ExperimentalWindowApi
 import androidx.window.core.ExtensionsUtil
 import androidx.window.extensions.area.WindowAreaComponent
 
@@ -26,7 +25,6 @@ import androidx.window.extensions.area.WindowAreaComponent
  * Adapter object to assist in translating values received from [WindowAreaComponent] to developer
  * friendly values in [WindowAreaController]
  */
-@ExperimentalWindowApi
 internal object WindowAreaAdapter {
 
     internal fun translate(
diff --git a/window/window/src/main/java/androidx/window/area/adapter/WindowAreaAdapterApi3.kt b/window/window/src/main/java/androidx/window/area/adapter/WindowAreaAdapterApi3.kt
index f6804c4da11dd..8fb60c55a4b4f 100644
--- a/window/window/src/main/java/androidx/window/area/adapter/WindowAreaAdapterApi3.kt
+++ b/window/window/src/main/java/androidx/window/area/adapter/WindowAreaAdapterApi3.kt
@@ -21,14 +21,12 @@ import androidx.window.area.WindowAreaCapability.Status.Companion.WINDOW_AREA_ST
 import androidx.window.area.WindowAreaCapability.Status.Companion.WINDOW_AREA_STATUS_AVAILABLE
 import androidx.window.area.WindowAreaCapability.Status.Companion.WINDOW_AREA_STATUS_UNAVAILABLE
 import androidx.window.area.WindowAreaCapability.Status.Companion.WINDOW_AREA_STATUS_UNSUPPORTED
-import androidx.window.core.ExperimentalWindowApi
 import androidx.window.extensions.area.WindowAreaComponent
 import androidx.window.extensions.area.WindowAreaComponent.STATUS_ACTIVE
 import androidx.window.extensions.area.WindowAreaComponent.STATUS_AVAILABLE
 import androidx.window.extensions.area.WindowAreaComponent.STATUS_UNAVAILABLE
 import androidx.window.extensions.area.WindowAreaComponent.STATUS_UNSUPPORTED
 
-@ExperimentalWindowApi
 internal object WindowAreaAdapterApi3 {
     fun translate(
         status: @WindowAreaComponent.WindowAreaStatus Int,
diff --git a/window/window/src/main/java/androidx/window/area/adapter/WindowAreaAdapterApi4.kt b/window/window/src/main/java/androidx/window/area/adapter/WindowAreaAdapterApi4.kt
index 9f176ded4d2bd..ddbe17be32e2b 100644
--- a/window/window/src/main/java/androidx/window/area/adapter/WindowAreaAdapterApi4.kt
+++ b/window/window/src/main/java/androidx/window/area/adapter/WindowAreaAdapterApi4.kt
@@ -21,14 +21,12 @@ import androidx.window.area.WindowAreaCapability.Status.Companion.WINDOW_AREA_ST
 import androidx.window.area.WindowAreaCapability.Status.Companion.WINDOW_AREA_STATUS_AVAILABLE
 import androidx.window.area.WindowAreaCapability.Status.Companion.WINDOW_AREA_STATUS_UNAVAILABLE
 import androidx.window.area.WindowAreaCapability.Status.Companion.WINDOW_AREA_STATUS_UNSUPPORTED
-import androidx.window.core.ExperimentalWindowApi
 import androidx.window.extensions.area.WindowAreaComponent
 import androidx.window.extensions.area.WindowAreaComponent.STATUS_ACTIVE
 import androidx.window.extensions.area.WindowAreaComponent.STATUS_AVAILABLE
 import androidx.window.extensions.area.WindowAreaComponent.STATUS_UNAVAILABLE
 import androidx.window.extensions.area.WindowAreaComponent.STATUS_UNSUPPORTED
 
-@ExperimentalWindowApi
 internal object WindowAreaAdapterApi4 {
     fun translate(status: @WindowAreaComponent.WindowAreaStatus Int): WindowAreaCapability.Status {
         return when (status) {

From 3f4bbd3ab9ab4e7b768b4217ebfa354d81d1c27e Mon Sep 17 00:00:00 2001
From: Hongwei Wang <hwwang@google.com>
Date: Tue, 13 Jan 2026 15:44:49 -0800
Subject: [PATCH 02/12] Update androidx.core:core-pip dependencies

Update the implementation and androidTestImplementation dependencies
following the latest androidx.core and androidx.activity releases.

Bug: 462178249
Test: existing test suites pass
Relnote: N/A
Change-Id: I2efdbb0c3fb92c96df6e7f2ec063d39d9a363853
---
 core/core-pip/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/core-pip/build.gradle b/core/core-pip/build.gradle
index c3f561fb0f316..d5e1460c0a376 100644
--- a/core/core-pip/build.gradle
+++ b/core/core-pip/build.gradle
@@ -29,8 +29,8 @@ plugins {
 }
 
 dependencies {
-    implementation(project(":core:core"))
-    androidTestImplementation(project(":activity:activity"))
+    implementation("androidx.core:core:1.18.0-alpha01")
+    androidTestImplementation("androidx.activity:activity:1.13.0-alpha01")
     androidTestImplementation(libs.testExtJunit)
     androidTestImplementation(libs.testRunner)
     androidTestImplementation(libs.truth)

From a77fd8d4610aa1585ad5818a22e30b3de21b2030 Mon Sep 17 00:00:00 2001
From: EthanWu <ethanphwu@google.com>
Date: Wed, 31 Dec 2025 18:03:54 +0800
Subject: [PATCH 03/12] Align RuntimeUtilsTest with XrExtensions HitInfo
 Null-Safety Contract

Updates RuntimeUtilsTest.java to align with the stricter null-safety contract
introduced in com.android.extensions.xr.node.InputEvent.HitInfo.

The HitInfo class now strictly enforces NonNull for its parameters,
meaning test cases attempting to pass null to these parameters are no longer valid and will throw.

Specifically:
- Removed getHitInfo_nullInputNode_returnsNull: Not applicable as inputNode in HitInfo is always NonNull.
- Removed getHitInfo_nullTransform_returnsNull: Not applicable as transform in HitInfo is always NonNull.
- Removed getHitInfo_nullHitEntity_returnsNull: getHitInfo_unKnownNode_returnsNull already cover this case
                                                if I take an unknow node into HitInfo of XrExtensions.

Bug: 475709106
Test: Presubmit

Change-Id: Icffbda4ceb544dd6964ad538c3537a7ce7e28830
---
 .../spatial/core/RuntimeUtilsTest.java        | 58 -------------------
 1 file changed, 58 deletions(-)

diff --git a/xr/scenecore/scenecore-spatial-core/src/test/java/androidx/xr/scenecore/spatial/core/RuntimeUtilsTest.java b/xr/scenecore/scenecore-spatial-core/src/test/java/androidx/xr/scenecore/spatial/core/RuntimeUtilsTest.java
index c892603c8549e..5a193c1d1728d 100644
--- a/xr/scenecore/scenecore-spatial-core/src/test/java/androidx/xr/scenecore/spatial/core/RuntimeUtilsTest.java
+++ b/xr/scenecore/scenecore-spatial-core/src/test/java/androidx/xr/scenecore/spatial/core/RuntimeUtilsTest.java
@@ -372,64 +372,6 @@ public void getHitInfo_nullHitInfo_returnsNull() {
         assertThat(RuntimeUtils.getHitInfo(null, entityManager)).isNull();
     }
 
-    @Test
-    public void getHitInfo_nullInputNode_returnsNull() {
-        EntityManager entityManager = new EntityManager();
-        SpatialSceneRuntime sceneRuntime = createSceneRuntime(entityManager);
-        Entity testEntity =
-                sceneRuntime.createGroupEntity(
-                        new Pose(), "testGroup", sceneRuntime.getActivitySpace());
-        Node testNode = ((AndroidXrEntity) testEntity).getNode();
-
-        float[] transformData = new float[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
-        Mat4f transform = new Mat4f(transformData);
-        Vec3 hitPosition = new Vec3(1, 2, 3);
-
-        com.android.extensions.xr.node.InputEvent.HitInfo extensionHitInfo =
-                new com.android.extensions.xr.node.InputEvent.HitInfo(
-                        1, null, transform, hitPosition);
-        InputEvent.HitInfo hitInfo = RuntimeUtils.getHitInfo(extensionHitInfo, entityManager);
-
-        assertThat(hitInfo).isNull();
-    }
-
-    @Test
-    public void getHitInfo_nullTransform_returnsNull() {
-        EntityManager entityManager = new EntityManager();
-        SpatialSceneRuntime sceneRuntime = createSceneRuntime(entityManager);
-        Entity testEntity =
-                sceneRuntime.createGroupEntity(
-                        new Pose(), "testGroup", sceneRuntime.getActivitySpace());
-        Node testNode = ((AndroidXrEntity) testEntity).getNode();
-
-        Vec3 hitPosition = new Vec3(1, 2, 3);
-
-        com.android.extensions.xr.node.InputEvent.HitInfo extensionHitInfo =
-                new com.android.extensions.xr.node.InputEvent.HitInfo(
-                        1, testNode, null, hitPosition);
-        InputEvent.HitInfo hitInfo = RuntimeUtils.getHitInfo(extensionHitInfo, entityManager);
-
-        assertThat(hitInfo).isNull();
-    }
-
-    @Test
-    public void getHitInfo_nullHitEntity_returnsNull() {
-        // Create the entity manager but do not set the hit entity.
-        EntityManager entityManager = new EntityManager();
-        SpatialSceneRuntime sceneRuntime = createSceneRuntime(entityManager);
-
-        float[] transformData = new float[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
-        Mat4f transform = new Mat4f(transformData);
-        Vec3 hitPosition = new Vec3(1, 2, 3);
-
-        com.android.extensions.xr.node.InputEvent.HitInfo extensionHitInfo =
-                new com.android.extensions.xr.node.InputEvent.HitInfo(
-                        1, null, transform, hitPosition);
-        InputEvent.HitInfo hitInfo = RuntimeUtils.getHitInfo(extensionHitInfo, entityManager);
-
-        assertThat(hitInfo).isNull();
-    }
-
     @Test
     public void getHitInfo_unKnownNode_returnsNull() {
         EntityManager entityManager = new EntityManager();

From 4b3dab45a78a7a4d160cdb86bafaa8d10c1aaf1c Mon Sep 17 00:00:00 2001
From: drchen <conradchen@google.com>
Date: Thu, 15 Jan 2026 10:29:28 -0800
Subject: [PATCH 04/12] Add a flag to scaffold directive to opt out auto
 focusing

Relnote: "Add a boolean flag to PaneScaffoldDirective to opt out the
  behavior that automactically moves the focus to the current
  destination pane."

Test: manual
Bug: 445720462
Change-Id: I929f5960c59f10a82b53d701eaf757da9e20f9e2
---
 .../adaptive/adaptive-layout/api/current.txt  |  4 ++++
 .../api/restricted_current.txt                |  4 ++++
 .../adaptive-layout/bcv/native/current.txt    |  3 +++
 .../adaptive/layout/PaneScaffoldDirective.kt  | 24 +++++++++++++++++++
 .../adaptive/layout/ThreePaneScaffold.kt      |  6 +++--
 5 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/compose/material3/adaptive/adaptive-layout/api/current.txt b/compose/material3/adaptive/adaptive-layout/api/current.txt
index a8eb821471f70..2490ace042f28 100644
--- a/compose/material3/adaptive/adaptive-layout/api/current.txt
+++ b/compose/material3/adaptive/adaptive-layout/api/current.txt
@@ -381,7 +381,9 @@ package androidx.compose.material3.adaptive.layout {
 
   @androidx.compose.runtime.Immutable public final class PaneScaffoldDirective {
     ctor @KotlinOnly public PaneScaffoldDirective(int maxHorizontalPartitions, androidx.compose.ui.unit.Dp horizontalPartitionSpacerSize, int maxVerticalPartitions, androidx.compose.ui.unit.Dp verticalPartitionSpacerSize, androidx.compose.ui.unit.Dp defaultPanePreferredWidth, androidx.compose.ui.unit.Dp defaultPanePreferredHeight, java.util.List<androidx.compose.ui.geometry.Rect> excludedBounds);
+    ctor @KotlinOnly public PaneScaffoldDirective(int maxHorizontalPartitions, androidx.compose.ui.unit.Dp horizontalPartitionSpacerSize, int maxVerticalPartitions, androidx.compose.ui.unit.Dp verticalPartitionSpacerSize, androidx.compose.ui.unit.Dp defaultPanePreferredWidth, androidx.compose.ui.unit.Dp defaultPanePreferredHeight, java.util.List<androidx.compose.ui.geometry.Rect> excludedBounds, boolean shouldAutoFocusCurrentDestination);
     ctor @KotlinOnly public PaneScaffoldDirective(int maxHorizontalPartitions, androidx.compose.ui.unit.Dp horizontalPartitionSpacerSize, int maxVerticalPartitions, androidx.compose.ui.unit.Dp verticalPartitionSpacerSize, androidx.compose.ui.unit.Dp defaultPanePreferredWidth, java.util.List<androidx.compose.ui.geometry.Rect> excludedBounds);
+    ctor @BytecodeOnly public PaneScaffoldDirective(int, float, int, float, float, float, java.util.List!, boolean, kotlin.jvm.internal.DefaultConstructorMarker!);
     ctor @BytecodeOnly public PaneScaffoldDirective(int, float, int, float, float, float, java.util.List!, kotlin.jvm.internal.DefaultConstructorMarker!);
     ctor @BytecodeOnly public PaneScaffoldDirective(int, float, int, float, float, java.util.List!, kotlin.jvm.internal.DefaultConstructorMarker!);
     method @KotlinOnly public androidx.compose.material3.adaptive.layout.PaneScaffoldDirective copy(optional int maxHorizontalPartitions, optional androidx.compose.ui.unit.Dp horizontalPartitionSpacerSize, optional int maxVerticalPartitions, optional androidx.compose.ui.unit.Dp verticalPartitionSpacerSize, optional androidx.compose.ui.unit.Dp defaultPanePreferredWidth, optional java.util.List<androidx.compose.ui.geometry.Rect> excludedBounds, optional androidx.compose.ui.unit.Dp defaultPanePreferredHeight);
@@ -396,12 +398,14 @@ package androidx.compose.material3.adaptive.layout {
     method @InaccessibleFromKotlin public int getMaxHorizontalPartitions();
     method @InaccessibleFromKotlin public int getMaxVerticalPartitions();
     method @BytecodeOnly public float getVerticalPartitionSpacerSize-D9Ej5fM();
+    method @InaccessibleFromKotlin public boolean shouldAutoFocusCurrentDestination();
     property public androidx.compose.ui.unit.Dp defaultPanePreferredHeight;
     property public androidx.compose.ui.unit.Dp defaultPanePreferredWidth;
     property public java.util.List<androidx.compose.ui.geometry.Rect> excludedBounds;
     property public androidx.compose.ui.unit.Dp horizontalPartitionSpacerSize;
     property public int maxHorizontalPartitions;
     property public int maxVerticalPartitions;
+    property public boolean shouldAutoFocusCurrentDestination;
     property public androidx.compose.ui.unit.Dp verticalPartitionSpacerSize;
     field public static final androidx.compose.material3.adaptive.layout.PaneScaffoldDirective.Companion Companion;
   }
diff --git a/compose/material3/adaptive/adaptive-layout/api/restricted_current.txt b/compose/material3/adaptive/adaptive-layout/api/restricted_current.txt
index a8eb821471f70..2490ace042f28 100644
--- a/compose/material3/adaptive/adaptive-layout/api/restricted_current.txt
+++ b/compose/material3/adaptive/adaptive-layout/api/restricted_current.txt
@@ -381,7 +381,9 @@ package androidx.compose.material3.adaptive.layout {
 
   @androidx.compose.runtime.Immutable public final class PaneScaffoldDirective {
     ctor @KotlinOnly public PaneScaffoldDirective(int maxHorizontalPartitions, androidx.compose.ui.unit.Dp horizontalPartitionSpacerSize, int maxVerticalPartitions, androidx.compose.ui.unit.Dp verticalPartitionSpacerSize, androidx.compose.ui.unit.Dp defaultPanePreferredWidth, androidx.compose.ui.unit.Dp defaultPanePreferredHeight, java.util.List<androidx.compose.ui.geometry.Rect> excludedBounds);
+    ctor @KotlinOnly public PaneScaffoldDirective(int maxHorizontalPartitions, androidx.compose.ui.unit.Dp horizontalPartitionSpacerSize, int maxVerticalPartitions, androidx.compose.ui.unit.Dp verticalPartitionSpacerSize, androidx.compose.ui.unit.Dp defaultPanePreferredWidth, androidx.compose.ui.unit.Dp defaultPanePreferredHeight, java.util.List<androidx.compose.ui.geometry.Rect> excludedBounds, boolean shouldAutoFocusCurrentDestination);
     ctor @KotlinOnly public PaneScaffoldDirective(int maxHorizontalPartitions, androidx.compose.ui.unit.Dp horizontalPartitionSpacerSize, int maxVerticalPartitions, androidx.compose.ui.unit.Dp verticalPartitionSpacerSize, androidx.compose.ui.unit.Dp defaultPanePreferredWidth, java.util.List<androidx.compose.ui.geometry.Rect> excludedBounds);
+    ctor @BytecodeOnly public PaneScaffoldDirective(int, float, int, float, float, float, java.util.List!, boolean, kotlin.jvm.internal.DefaultConstructorMarker!);
     ctor @BytecodeOnly public PaneScaffoldDirective(int, float, int, float, float, float, java.util.List!, kotlin.jvm.internal.DefaultConstructorMarker!);
     ctor @BytecodeOnly public PaneScaffoldDirective(int, float, int, float, float, java.util.List!, kotlin.jvm.internal.DefaultConstructorMarker!);
     method @KotlinOnly public androidx.compose.material3.adaptive.layout.PaneScaffoldDirective copy(optional int maxHorizontalPartitions, optional androidx.compose.ui.unit.Dp horizontalPartitionSpacerSize, optional int maxVerticalPartitions, optional androidx.compose.ui.unit.Dp verticalPartitionSpacerSize, optional androidx.compose.ui.unit.Dp defaultPanePreferredWidth, optional java.util.List<androidx.compose.ui.geometry.Rect> excludedBounds, optional androidx.compose.ui.unit.Dp defaultPanePreferredHeight);
@@ -396,12 +398,14 @@ package androidx.compose.material3.adaptive.layout {
     method @InaccessibleFromKotlin public int getMaxHorizontalPartitions();
     method @InaccessibleFromKotlin public int getMaxVerticalPartitions();
     method @BytecodeOnly public float getVerticalPartitionSpacerSize-D9Ej5fM();
+    method @InaccessibleFromKotlin public boolean shouldAutoFocusCurrentDestination();
     property public androidx.compose.ui.unit.Dp defaultPanePreferredHeight;
     property public androidx.compose.ui.unit.Dp defaultPanePreferredWidth;
     property public java.util.List<androidx.compose.ui.geometry.Rect> excludedBounds;
     property public androidx.compose.ui.unit.Dp horizontalPartitionSpacerSize;
     property public int maxHorizontalPartitions;
     property public int maxVerticalPartitions;
+    property public boolean shouldAutoFocusCurrentDestination;
     property public androidx.compose.ui.unit.Dp verticalPartitionSpacerSize;
     field public static final androidx.compose.material3.adaptive.layout.PaneScaffoldDirective.Companion Companion;
   }
diff --git a/compose/material3/adaptive/adaptive-layout/bcv/native/current.txt b/compose/material3/adaptive/adaptive-layout/bcv/native/current.txt
index 6982bcbcbe654..6aaf408ca32ff 100644
--- a/compose/material3/adaptive/adaptive-layout/bcv/native/current.txt
+++ b/compose/material3/adaptive/adaptive-layout/bcv/native/current.txt
@@ -351,6 +351,7 @@ final class androidx.compose.material3.adaptive.layout/PaneMotionData { // andro
 
 final class androidx.compose.material3.adaptive.layout/PaneScaffoldDirective { // androidx.compose.material3.adaptive.layout/PaneScaffoldDirective|null[0]
     constructor <init>(kotlin/Int, androidx.compose.ui.unit/Dp, kotlin/Int, androidx.compose.ui.unit/Dp, androidx.compose.ui.unit/Dp, androidx.compose.ui.unit/Dp, kotlin.collections/List<androidx.compose.ui.geometry/Rect>) // androidx.compose.material3.adaptive.layout/PaneScaffoldDirective.<init>|<init>(kotlin.Int;androidx.compose.ui.unit.Dp;kotlin.Int;androidx.compose.ui.unit.Dp;androidx.compose.ui.unit.Dp;androidx.compose.ui.unit.Dp;kotlin.collections.List<androidx.compose.ui.geometry.Rect>){}[0]
+    constructor <init>(kotlin/Int, androidx.compose.ui.unit/Dp, kotlin/Int, androidx.compose.ui.unit/Dp, androidx.compose.ui.unit/Dp, androidx.compose.ui.unit/Dp, kotlin.collections/List<androidx.compose.ui.geometry/Rect>, kotlin/Boolean) // androidx.compose.material3.adaptive.layout/PaneScaffoldDirective.<init>|<init>(kotlin.Int;androidx.compose.ui.unit.Dp;kotlin.Int;androidx.compose.ui.unit.Dp;androidx.compose.ui.unit.Dp;androidx.compose.ui.unit.Dp;kotlin.collections.List<androidx.compose.ui.geometry.Rect>;kotlin.Boolean){}[0]
     constructor <init>(kotlin/Int, androidx.compose.ui.unit/Dp, kotlin/Int, androidx.compose.ui.unit/Dp, androidx.compose.ui.unit/Dp, kotlin.collections/List<androidx.compose.ui.geometry/Rect>) // androidx.compose.material3.adaptive.layout/PaneScaffoldDirective.<init>|<init>(kotlin.Int;androidx.compose.ui.unit.Dp;kotlin.Int;androidx.compose.ui.unit.Dp;androidx.compose.ui.unit.Dp;kotlin.collections.List<androidx.compose.ui.geometry.Rect>){}[0]
 
     final val defaultPanePreferredHeight // androidx.compose.material3.adaptive.layout/PaneScaffoldDirective.defaultPanePreferredHeight|{}defaultPanePreferredHeight[0]
@@ -365,6 +366,8 @@ final class androidx.compose.material3.adaptive.layout/PaneScaffoldDirective { /
         final fun <get-maxHorizontalPartitions>(): kotlin/Int // androidx.compose.material3.adaptive.layout/PaneScaffoldDirective.maxHorizontalPartitions.<get-maxHorizontalPartitions>|<get-maxHorizontalPartitions>(){}[0]
     final val maxVerticalPartitions // androidx.compose.material3.adaptive.layout/PaneScaffoldDirective.maxVerticalPartitions|{}maxVerticalPartitions[0]
         final fun <get-maxVerticalPartitions>(): kotlin/Int // androidx.compose.material3.adaptive.layout/PaneScaffoldDirective.maxVerticalPartitions.<get-maxVerticalPartitions>|<get-maxVerticalPartitions>(){}[0]
+    final val shouldAutoFocusCurrentDestination // androidx.compose.material3.adaptive.layout/PaneScaffoldDirective.shouldAutoFocusCurrentDestination|{}shouldAutoFocusCurrentDestination[0]
+        final fun <get-shouldAutoFocusCurrentDestination>(): kotlin/Boolean // androidx.compose.material3.adaptive.layout/PaneScaffoldDirective.shouldAutoFocusCurrentDestination.<get-shouldAutoFocusCurrentDestination>|<get-shouldAutoFocusCurrentDestination>(){}[0]
     final val verticalPartitionSpacerSize // androidx.compose.material3.adaptive.layout/PaneScaffoldDirective.verticalPartitionSpacerSize|{}verticalPartitionSpacerSize[0]
         final fun <get-verticalPartitionSpacerSize>(): androidx.compose.ui.unit/Dp // androidx.compose.material3.adaptive.layout/PaneScaffoldDirective.verticalPartitionSpacerSize.<get-verticalPartitionSpacerSize>|<get-verticalPartitionSpacerSize>(){}[0]
 
diff --git a/compose/material3/adaptive/adaptive-layout/src/commonMain/kotlin/androidx/compose/material3/adaptive/layout/PaneScaffoldDirective.kt b/compose/material3/adaptive/adaptive-layout/src/commonMain/kotlin/androidx/compose/material3/adaptive/layout/PaneScaffoldDirective.kt
index b63e5223fbda4..fc0cc0dc6d967 100644
--- a/compose/material3/adaptive/adaptive-layout/src/commonMain/kotlin/androidx/compose/material3/adaptive/layout/PaneScaffoldDirective.kt
+++ b/compose/material3/adaptive/adaptive-layout/src/commonMain/kotlin/androidx/compose/material3/adaptive/layout/PaneScaffoldDirective.kt
@@ -29,6 +29,7 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.window.core.layout.WindowSizeClass
 import kotlin.jvm.JvmInline
+import kotlin.jvm.JvmName
 
 /**
  * Calculates the recommended [PaneScaffoldDirective] from a given [WindowAdaptiveInfo]. Use this
@@ -178,6 +179,9 @@ private fun getExcludedVerticalBounds(posture: Posture, hingePolicy: HingePolicy
  *   used.
  * @property excludedBounds the bounds of all areas in the window that the layout needs to avoid
  *   displaying anything upon it. Usually these bounds represent where physical hinges are.
+ * @property shouldAutoFocusCurrentDestination set to `true` to make the scaffold automatically move
+ *   focus onto the current destination pane indicated by
+ *   [ThreePaneScaffoldValue.currentDestination] when it changes, otherwise set it to `false`.
  */
 @Immutable
 class PaneScaffoldDirective(
@@ -188,6 +192,7 @@ class PaneScaffoldDirective(
     val defaultPanePreferredWidth: Dp,
     val defaultPanePreferredHeight: Dp,
     val excludedBounds: List<Rect>,
+    @get:JvmName("shouldAutoFocusCurrentDestination") val shouldAutoFocusCurrentDestination: Boolean,
 ) {
     constructor(
         maxHorizontalPartitions: Int,
@@ -206,6 +211,25 @@ class PaneScaffoldDirective(
         excludedBounds = excludedBounds,
     )
 
+    constructor(
+        maxHorizontalPartitions: Int,
+        horizontalPartitionSpacerSize: Dp,
+        maxVerticalPartitions: Int,
+        verticalPartitionSpacerSize: Dp,
+        defaultPanePreferredWidth: Dp,
+        defaultPanePreferredHeight: Dp,
+        excludedBounds: List<Rect>,
+    ) : this(
+        maxHorizontalPartitions = maxHorizontalPartitions,
+        horizontalPartitionSpacerSize = horizontalPartitionSpacerSize,
+        maxVerticalPartitions = maxVerticalPartitions,
+        verticalPartitionSpacerSize = verticalPartitionSpacerSize,
+        defaultPanePreferredWidth = defaultPanePreferredWidth,
+        defaultPanePreferredHeight = defaultPanePreferredHeight,
+        excludedBounds = excludedBounds,
+        shouldAutoFocusCurrentDestination = true,
+    )
+
     /**
      * Returns a new copy of [PaneScaffoldDirective] with specified fields overwritten. Use this
      * method to create a custom [PaneScaffoldDirective] from the default instance or the result of
diff --git a/compose/material3/adaptive/adaptive-layout/src/commonMain/kotlin/androidx/compose/material3/adaptive/layout/ThreePaneScaffold.kt b/compose/material3/adaptive/adaptive-layout/src/commonMain/kotlin/androidx/compose/material3/adaptive/layout/ThreePaneScaffold.kt
index 2b55038ac1fcb..969ff099f9e8b 100644
--- a/compose/material3/adaptive/adaptive-layout/src/commonMain/kotlin/androidx/compose/material3/adaptive/layout/ThreePaneScaffold.kt
+++ b/compose/material3/adaptive/adaptive-layout/src/commonMain/kotlin/androidx/compose/material3/adaptive/layout/ThreePaneScaffold.kt
@@ -216,8 +216,10 @@ internal fun ThreePaneScaffold(
                 )
                 .ThreePaneScaffold()
 
-            LaunchedEffect(scaffoldValue.currentDestination) {
-                scaffoldScope.focusRequesters[scaffoldValue.currentDestination]?.requestFocus()
+            if (scaffoldDirective.shouldAutoFocusCurrentDestination) {
+                LaunchedEffect(scaffoldValue.currentDestination) {
+                    scaffoldScope.focusRequesters[scaffoldValue.currentDestination]?.requestFocus()
+                }
             }
         }
     }

From 0da39057b802876d77768657126370cbfc61b08f Mon Sep 17 00:00:00 2001
From: Prajakta Patil <prajakt@google.com>
Date: Thu, 15 Jan 2026 10:33:55 -0800
Subject: [PATCH 05/12] BENCHMARK = "1.5.0-alpha02"

Change-Id: I5d6ab48d7db2320710401393648096ca31351376
---
 libraryversions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraryversions.toml b/libraryversions.toml
index 8af6b489d4cf8..d848ceb0bb6e3 100644
--- a/libraryversions.toml
+++ b/libraryversions.toml
@@ -9,7 +9,7 @@ APPSEARCH = "1.2.0-alpha01"
 ARCH_CORE = "2.3.0-alpha01"
 ASYNCLAYOUTINFLATER = "1.1.0"
 AUTOFILL = "1.4.0-alpha01"
-BENCHMARK = "1.5.0-alpha01"
+BENCHMARK = "1.5.0-alpha02"
 BIOMETRIC = "1.4.0-alpha05"
 BLUETOOTH = "1.0.0-alpha02"
 BROWSER = "1.10.0-alpha02"

From 1ccb387f52d403ed33207f4b01bfb716108eb209 Mon Sep 17 00:00:00 2001
From: Chuck Jazdzewski <chuckj@google.com>
Date: Wed, 27 Aug 2025 16:48:23 -0700
Subject: [PATCH 06/12] Move the changelist to the gapbuffer package

This refactoring moves the gapbuffer specific change list implementation
to the gapbuffer package.

This is a step in a larger refactoring that will eventually allow a
new composer implementation, based on a link buffer instead of a gap
buffer, to land behind a flag.

Test: N/A - refactor
Relnote: N/A
Bug: 268366116
Change-Id: Icab1f6421c1bf1d9b2615492912e76c1f03e5bb6
---
 .../runtime/runtime/bcv/native/current.ignore | 890 +++++++++++++++++-
 .../runtime/runtime/bcv/native/current.txt    | 148 +--
 .../androidx/compose/runtime/Composition.kt   |   2 +-
 .../androidx/compose/runtime/GapComposer.kt   |   6 +-
 .../gapbuffer}/changelist/ChangeList.kt       |  72 +-
 .../changelist/ComposerChangeListWriter.kt    |   2 +-
 .../gapbuffer}/changelist/FixupList.kt        |  30 +-
 .../gapbuffer}/changelist/Operation.kt        |   2 +-
 .../changelist/OperationArgContainer.kt       |   2 +-
 .../gapbuffer}/changelist/Operations.kt       |   8 +-
 .../tooling/CompositionErrorContext.kt        |   2 +-
 .../runtime/changelist/TestOperations.kt      |  33 -
 .../gapbuffer/changelist/TestOperations.kt    |  31 +
 .../OperationDefinitionValidationTest.kt      |   6 +-
 .../runtime/changelist/OperationsTest.kt      |  22 +-
 .../OperationDefinitionValidationTest.kt      | 167 ++++
 .../gapbuffer/changelist/OperationsTest.kt    | 725 ++++++++++++++
 17 files changed, 1963 insertions(+), 185 deletions(-)
 rename compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/{ => composer/gapbuffer}/changelist/ChangeList.kt (75%)
 rename compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/{ => composer/gapbuffer}/changelist/ComposerChangeListWriter.kt (99%)
 rename compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/{ => composer/gapbuffer}/changelist/FixupList.kt (73%)
 rename compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/{ => composer/gapbuffer}/changelist/Operation.kt (99%)
 rename compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/{ => composer/gapbuffer}/changelist/OperationArgContainer.kt (96%)
 rename compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/{ => composer/gapbuffer}/changelist/Operations.kt (98%)
 delete mode 100644 compose/runtime/runtime/src/commonTest/kotlin/androidx/compose/runtime/changelist/TestOperations.kt
 create mode 100644 compose/runtime/runtime/src/commonTest/kotlin/androidx/compose/runtime/composer/gapbuffer/changelist/TestOperations.kt
 create mode 100644 compose/runtime/runtime/src/jvmTest/kotlin/androidx/compose/runtime/composer/gapbuffer/changelist/OperationDefinitionValidationTest.kt
 create mode 100644 compose/runtime/runtime/src/jvmTest/kotlin/androidx/compose/runtime/composer/gapbuffer/changelist/OperationsTest.kt

diff --git a/compose/runtime/runtime/bcv/native/current.ignore b/compose/runtime/runtime/bcv/native/current.ignore
index 4fa964187d2a5..38107d8eb1e00 100644
--- a/compose/runtime/runtime/bcv/native/current.ignore
+++ b/compose/runtime/runtime/bcv/native/current.ignore
@@ -2,4 +2,892 @@
 [iosX64]: Target was removed
 [macosX64]: Target was removed
 [tvosX64]: Target was removed
-[watchosX64]: Target was removed
\ No newline at end of file
+[watchosX64]: Target was removed
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AdvanceSlotsBy$stableprop from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AppendValue$stableprop from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ApplyChangeList$stableprop from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopyNodesToNewAnchorLocation$stableprop from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopySlotTableToAnchorLocation$stableprop from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DeactivateCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DetermineMovableContentNodeIndex$stableprop from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Downs$stableprop from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCompositionScope$stableprop from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndMovableContentPlacement$stableprop from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndResumingScope$stableprop from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureGroupStarted$stableprop from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureRootGroupStarted$stableprop from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertNodeFixup$stableprop from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlots$stableprop from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlotsWithFixups$stableprop from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveNode$stableprop from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_PostInsertNodeFixup$stableprop from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ReleaseMovableGroupAtCurrent$stableprop from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Remember$stableprop from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RememberPausingScope$stableprop from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveNode$stableprop from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ResetSlots$stableprop from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SideEffect$stableprop from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SkipToEndOfCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_StartResumingScope$stableprop from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TestOperation$stableprop from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TrimParentValues$stableprop from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAnchoredValue$stableprop from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAuxData$stableprop from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateNode$stableprop from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateValue$stableprop from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Ups$stableprop from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UseCurrentNode$stableprop from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AdvanceSlotsBy$stableprop_getter() from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AppendValue$stableprop_getter() from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ApplyChangeList$stableprop_getter() from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopyNodesToNewAnchorLocation$stableprop_getter() from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopySlotTableToAnchorLocation$stableprop_getter() from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DeactivateCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DetermineMovableContentNodeIndex$stableprop_getter() from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Downs$stableprop_getter() from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCompositionScope$stableprop_getter() from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndMovableContentPlacement$stableprop_getter() from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndResumingScope$stableprop_getter() from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureGroupStarted$stableprop_getter() from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureRootGroupStarted$stableprop_getter() from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertNodeFixup$stableprop_getter() from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlots$stableprop_getter() from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlotsWithFixups$stableprop_getter() from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveNode$stableprop_getter() from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_PostInsertNodeFixup$stableprop_getter() from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ReleaseMovableGroupAtCurrent$stableprop_getter() from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Remember$stableprop_getter() from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RememberPausingScope$stableprop_getter() from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveNode$stableprop_getter() from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ResetSlots$stableprop_getter() from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SideEffect$stableprop_getter() from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SkipToEndOfCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_StartResumingScope$stableprop_getter() from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TestOperation$stableprop_getter() from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TrimParentValues$stableprop_getter() from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAnchoredValue$stableprop_getter() from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAuxData$stableprop_getter() from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateNode$stableprop_getter() from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateValue$stableprop_getter() from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Ups$stableprop_getter() from androidx.compose.runtime:runtime
+[iosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UseCurrentNode$stableprop_getter() from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AdvanceSlotsBy$stableprop from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AppendValue$stableprop from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ApplyChangeList$stableprop from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopyNodesToNewAnchorLocation$stableprop from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopySlotTableToAnchorLocation$stableprop from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DeactivateCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DetermineMovableContentNodeIndex$stableprop from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Downs$stableprop from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCompositionScope$stableprop from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndMovableContentPlacement$stableprop from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndResumingScope$stableprop from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureGroupStarted$stableprop from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureRootGroupStarted$stableprop from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertNodeFixup$stableprop from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlots$stableprop from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlotsWithFixups$stableprop from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveNode$stableprop from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_PostInsertNodeFixup$stableprop from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ReleaseMovableGroupAtCurrent$stableprop from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Remember$stableprop from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RememberPausingScope$stableprop from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveNode$stableprop from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ResetSlots$stableprop from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SideEffect$stableprop from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SkipToEndOfCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_StartResumingScope$stableprop from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TestOperation$stableprop from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TrimParentValues$stableprop from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAnchoredValue$stableprop from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAuxData$stableprop from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateNode$stableprop from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateValue$stableprop from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Ups$stableprop from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UseCurrentNode$stableprop from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AdvanceSlotsBy$stableprop_getter() from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AppendValue$stableprop_getter() from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ApplyChangeList$stableprop_getter() from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopyNodesToNewAnchorLocation$stableprop_getter() from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopySlotTableToAnchorLocation$stableprop_getter() from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DeactivateCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DetermineMovableContentNodeIndex$stableprop_getter() from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Downs$stableprop_getter() from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCompositionScope$stableprop_getter() from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndMovableContentPlacement$stableprop_getter() from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndResumingScope$stableprop_getter() from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureGroupStarted$stableprop_getter() from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureRootGroupStarted$stableprop_getter() from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertNodeFixup$stableprop_getter() from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlots$stableprop_getter() from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlotsWithFixups$stableprop_getter() from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveNode$stableprop_getter() from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_PostInsertNodeFixup$stableprop_getter() from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ReleaseMovableGroupAtCurrent$stableprop_getter() from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Remember$stableprop_getter() from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RememberPausingScope$stableprop_getter() from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveNode$stableprop_getter() from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ResetSlots$stableprop_getter() from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SideEffect$stableprop_getter() from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SkipToEndOfCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_StartResumingScope$stableprop_getter() from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TestOperation$stableprop_getter() from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TrimParentValues$stableprop_getter() from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAnchoredValue$stableprop_getter() from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAuxData$stableprop_getter() from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateNode$stableprop_getter() from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateValue$stableprop_getter() from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Ups$stableprop_getter() from androidx.compose.runtime:runtime
+[iosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UseCurrentNode$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AdvanceSlotsBy$stableprop from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AppendValue$stableprop from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ApplyChangeList$stableprop from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopyNodesToNewAnchorLocation$stableprop from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopySlotTableToAnchorLocation$stableprop from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DeactivateCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DetermineMovableContentNodeIndex$stableprop from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Downs$stableprop from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCompositionScope$stableprop from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndMovableContentPlacement$stableprop from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndResumingScope$stableprop from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureGroupStarted$stableprop from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureRootGroupStarted$stableprop from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertNodeFixup$stableprop from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlots$stableprop from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlotsWithFixups$stableprop from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveNode$stableprop from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_PostInsertNodeFixup$stableprop from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ReleaseMovableGroupAtCurrent$stableprop from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Remember$stableprop from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RememberPausingScope$stableprop from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveNode$stableprop from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ResetSlots$stableprop from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SideEffect$stableprop from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SkipToEndOfCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_StartResumingScope$stableprop from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TestOperation$stableprop from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TrimParentValues$stableprop from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAnchoredValue$stableprop from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAuxData$stableprop from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateNode$stableprop from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateValue$stableprop from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Ups$stableprop from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UseCurrentNode$stableprop from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AdvanceSlotsBy$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AppendValue$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ApplyChangeList$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopyNodesToNewAnchorLocation$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopySlotTableToAnchorLocation$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DeactivateCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DetermineMovableContentNodeIndex$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Downs$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCompositionScope$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndMovableContentPlacement$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndResumingScope$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureGroupStarted$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureRootGroupStarted$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertNodeFixup$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlots$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlotsWithFixups$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveNode$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_PostInsertNodeFixup$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ReleaseMovableGroupAtCurrent$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Remember$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RememberPausingScope$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveNode$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ResetSlots$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SideEffect$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SkipToEndOfCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_StartResumingScope$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TestOperation$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TrimParentValues$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAnchoredValue$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAuxData$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateNode$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateValue$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Ups$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UseCurrentNode$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AdvanceSlotsBy$stableprop from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AppendValue$stableprop from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ApplyChangeList$stableprop from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopyNodesToNewAnchorLocation$stableprop from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopySlotTableToAnchorLocation$stableprop from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DeactivateCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DetermineMovableContentNodeIndex$stableprop from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Downs$stableprop from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCompositionScope$stableprop from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndMovableContentPlacement$stableprop from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndResumingScope$stableprop from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureGroupStarted$stableprop from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureRootGroupStarted$stableprop from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertNodeFixup$stableprop from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlots$stableprop from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlotsWithFixups$stableprop from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveNode$stableprop from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_PostInsertNodeFixup$stableprop from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ReleaseMovableGroupAtCurrent$stableprop from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Remember$stableprop from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RememberPausingScope$stableprop from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveNode$stableprop from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ResetSlots$stableprop from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SideEffect$stableprop from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SkipToEndOfCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_StartResumingScope$stableprop from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TestOperation$stableprop from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TrimParentValues$stableprop from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAnchoredValue$stableprop from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAuxData$stableprop from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateNode$stableprop from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateValue$stableprop from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Ups$stableprop from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UseCurrentNode$stableprop from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AdvanceSlotsBy$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AppendValue$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ApplyChangeList$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopyNodesToNewAnchorLocation$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopySlotTableToAnchorLocation$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DeactivateCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DetermineMovableContentNodeIndex$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Downs$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCompositionScope$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndMovableContentPlacement$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndResumingScope$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureGroupStarted$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureRootGroupStarted$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertNodeFixup$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlots$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlotsWithFixups$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveNode$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_PostInsertNodeFixup$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ReleaseMovableGroupAtCurrent$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Remember$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RememberPausingScope$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveNode$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ResetSlots$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SideEffect$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SkipToEndOfCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_StartResumingScope$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TestOperation$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TrimParentValues$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAnchoredValue$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAuxData$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateNode$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateValue$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Ups$stableprop_getter() from androidx.compose.runtime:runtime
+[linuxX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UseCurrentNode$stableprop_getter() from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AdvanceSlotsBy$stableprop from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AppendValue$stableprop from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ApplyChangeList$stableprop from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopyNodesToNewAnchorLocation$stableprop from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopySlotTableToAnchorLocation$stableprop from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DeactivateCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DetermineMovableContentNodeIndex$stableprop from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Downs$stableprop from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCompositionScope$stableprop from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndMovableContentPlacement$stableprop from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndResumingScope$stableprop from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureGroupStarted$stableprop from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureRootGroupStarted$stableprop from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertNodeFixup$stableprop from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlots$stableprop from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlotsWithFixups$stableprop from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveNode$stableprop from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_PostInsertNodeFixup$stableprop from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ReleaseMovableGroupAtCurrent$stableprop from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Remember$stableprop from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RememberPausingScope$stableprop from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveNode$stableprop from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ResetSlots$stableprop from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SideEffect$stableprop from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SkipToEndOfCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_StartResumingScope$stableprop from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TestOperation$stableprop from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TrimParentValues$stableprop from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAnchoredValue$stableprop from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAuxData$stableprop from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateNode$stableprop from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateValue$stableprop from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Ups$stableprop from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UseCurrentNode$stableprop from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AdvanceSlotsBy$stableprop_getter() from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AppendValue$stableprop_getter() from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ApplyChangeList$stableprop_getter() from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopyNodesToNewAnchorLocation$stableprop_getter() from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopySlotTableToAnchorLocation$stableprop_getter() from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DeactivateCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DetermineMovableContentNodeIndex$stableprop_getter() from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Downs$stableprop_getter() from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCompositionScope$stableprop_getter() from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndMovableContentPlacement$stableprop_getter() from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndResumingScope$stableprop_getter() from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureGroupStarted$stableprop_getter() from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureRootGroupStarted$stableprop_getter() from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertNodeFixup$stableprop_getter() from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlots$stableprop_getter() from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlotsWithFixups$stableprop_getter() from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveNode$stableprop_getter() from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_PostInsertNodeFixup$stableprop_getter() from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ReleaseMovableGroupAtCurrent$stableprop_getter() from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Remember$stableprop_getter() from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RememberPausingScope$stableprop_getter() from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveNode$stableprop_getter() from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ResetSlots$stableprop_getter() from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SideEffect$stableprop_getter() from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SkipToEndOfCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_StartResumingScope$stableprop_getter() from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TestOperation$stableprop_getter() from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TrimParentValues$stableprop_getter() from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAnchoredValue$stableprop_getter() from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAuxData$stableprop_getter() from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateNode$stableprop_getter() from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateValue$stableprop_getter() from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Ups$stableprop_getter() from androidx.compose.runtime:runtime
+[macosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UseCurrentNode$stableprop_getter() from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AdvanceSlotsBy$stableprop from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AppendValue$stableprop from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ApplyChangeList$stableprop from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopyNodesToNewAnchorLocation$stableprop from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopySlotTableToAnchorLocation$stableprop from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DeactivateCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DetermineMovableContentNodeIndex$stableprop from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Downs$stableprop from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCompositionScope$stableprop from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndMovableContentPlacement$stableprop from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndResumingScope$stableprop from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureGroupStarted$stableprop from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureRootGroupStarted$stableprop from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertNodeFixup$stableprop from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlots$stableprop from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlotsWithFixups$stableprop from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveNode$stableprop from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_PostInsertNodeFixup$stableprop from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ReleaseMovableGroupAtCurrent$stableprop from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Remember$stableprop from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RememberPausingScope$stableprop from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveNode$stableprop from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ResetSlots$stableprop from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SideEffect$stableprop from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SkipToEndOfCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_StartResumingScope$stableprop from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TestOperation$stableprop from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TrimParentValues$stableprop from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAnchoredValue$stableprop from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAuxData$stableprop from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateNode$stableprop from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateValue$stableprop from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Ups$stableprop from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UseCurrentNode$stableprop from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AdvanceSlotsBy$stableprop_getter() from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AppendValue$stableprop_getter() from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ApplyChangeList$stableprop_getter() from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopyNodesToNewAnchorLocation$stableprop_getter() from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopySlotTableToAnchorLocation$stableprop_getter() from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DeactivateCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DetermineMovableContentNodeIndex$stableprop_getter() from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Downs$stableprop_getter() from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCompositionScope$stableprop_getter() from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndMovableContentPlacement$stableprop_getter() from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndResumingScope$stableprop_getter() from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureGroupStarted$stableprop_getter() from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureRootGroupStarted$stableprop_getter() from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertNodeFixup$stableprop_getter() from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlots$stableprop_getter() from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlotsWithFixups$stableprop_getter() from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveNode$stableprop_getter() from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_PostInsertNodeFixup$stableprop_getter() from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ReleaseMovableGroupAtCurrent$stableprop_getter() from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Remember$stableprop_getter() from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RememberPausingScope$stableprop_getter() from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveNode$stableprop_getter() from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ResetSlots$stableprop_getter() from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SideEffect$stableprop_getter() from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SkipToEndOfCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_StartResumingScope$stableprop_getter() from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TestOperation$stableprop_getter() from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TrimParentValues$stableprop_getter() from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAnchoredValue$stableprop_getter() from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAuxData$stableprop_getter() from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateNode$stableprop_getter() from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateValue$stableprop_getter() from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Ups$stableprop_getter() from androidx.compose.runtime:runtime
+[mingwX64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UseCurrentNode$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AdvanceSlotsBy$stableprop from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AppendValue$stableprop from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ApplyChangeList$stableprop from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopyNodesToNewAnchorLocation$stableprop from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopySlotTableToAnchorLocation$stableprop from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DeactivateCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DetermineMovableContentNodeIndex$stableprop from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Downs$stableprop from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCompositionScope$stableprop from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndMovableContentPlacement$stableprop from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndResumingScope$stableprop from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureGroupStarted$stableprop from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureRootGroupStarted$stableprop from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertNodeFixup$stableprop from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlots$stableprop from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlotsWithFixups$stableprop from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveNode$stableprop from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_PostInsertNodeFixup$stableprop from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ReleaseMovableGroupAtCurrent$stableprop from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Remember$stableprop from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RememberPausingScope$stableprop from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveNode$stableprop from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ResetSlots$stableprop from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SideEffect$stableprop from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SkipToEndOfCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_StartResumingScope$stableprop from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TestOperation$stableprop from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TrimParentValues$stableprop from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAnchoredValue$stableprop from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAuxData$stableprop from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateNode$stableprop from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateValue$stableprop from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Ups$stableprop from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UseCurrentNode$stableprop from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AdvanceSlotsBy$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AppendValue$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ApplyChangeList$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopyNodesToNewAnchorLocation$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopySlotTableToAnchorLocation$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DeactivateCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DetermineMovableContentNodeIndex$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Downs$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCompositionScope$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndMovableContentPlacement$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndResumingScope$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureGroupStarted$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureRootGroupStarted$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertNodeFixup$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlots$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlotsWithFixups$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveNode$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_PostInsertNodeFixup$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ReleaseMovableGroupAtCurrent$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Remember$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RememberPausingScope$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveNode$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ResetSlots$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SideEffect$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SkipToEndOfCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_StartResumingScope$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TestOperation$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TrimParentValues$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAnchoredValue$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAuxData$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateNode$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateValue$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Ups$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UseCurrentNode$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AdvanceSlotsBy$stableprop from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AppendValue$stableprop from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ApplyChangeList$stableprop from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopyNodesToNewAnchorLocation$stableprop from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopySlotTableToAnchorLocation$stableprop from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DeactivateCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DetermineMovableContentNodeIndex$stableprop from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Downs$stableprop from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCompositionScope$stableprop from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndMovableContentPlacement$stableprop from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndResumingScope$stableprop from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureGroupStarted$stableprop from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureRootGroupStarted$stableprop from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertNodeFixup$stableprop from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlots$stableprop from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlotsWithFixups$stableprop from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveNode$stableprop from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_PostInsertNodeFixup$stableprop from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ReleaseMovableGroupAtCurrent$stableprop from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Remember$stableprop from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RememberPausingScope$stableprop from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveNode$stableprop from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ResetSlots$stableprop from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SideEffect$stableprop from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SkipToEndOfCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_StartResumingScope$stableprop from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TestOperation$stableprop from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TrimParentValues$stableprop from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAnchoredValue$stableprop from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAuxData$stableprop from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateNode$stableprop from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateValue$stableprop from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Ups$stableprop from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UseCurrentNode$stableprop from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AdvanceSlotsBy$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AppendValue$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ApplyChangeList$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopyNodesToNewAnchorLocation$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopySlotTableToAnchorLocation$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DeactivateCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DetermineMovableContentNodeIndex$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Downs$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCompositionScope$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndMovableContentPlacement$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndResumingScope$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureGroupStarted$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureRootGroupStarted$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertNodeFixup$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlots$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlotsWithFixups$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveNode$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_PostInsertNodeFixup$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ReleaseMovableGroupAtCurrent$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Remember$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RememberPausingScope$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveNode$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ResetSlots$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SideEffect$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SkipToEndOfCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_StartResumingScope$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TestOperation$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TrimParentValues$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAnchoredValue$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAuxData$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateNode$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateValue$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Ups$stableprop_getter() from androidx.compose.runtime:runtime
+[tvosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UseCurrentNode$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AdvanceSlotsBy$stableprop from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AppendValue$stableprop from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ApplyChangeList$stableprop from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopyNodesToNewAnchorLocation$stableprop from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopySlotTableToAnchorLocation$stableprop from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DeactivateCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DetermineMovableContentNodeIndex$stableprop from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Downs$stableprop from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCompositionScope$stableprop from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndMovableContentPlacement$stableprop from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndResumingScope$stableprop from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureGroupStarted$stableprop from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureRootGroupStarted$stableprop from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertNodeFixup$stableprop from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlots$stableprop from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlotsWithFixups$stableprop from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveNode$stableprop from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_PostInsertNodeFixup$stableprop from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ReleaseMovableGroupAtCurrent$stableprop from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Remember$stableprop from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RememberPausingScope$stableprop from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveNode$stableprop from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ResetSlots$stableprop from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SideEffect$stableprop from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SkipToEndOfCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_StartResumingScope$stableprop from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TestOperation$stableprop from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TrimParentValues$stableprop from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAnchoredValue$stableprop from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAuxData$stableprop from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateNode$stableprop from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateValue$stableprop from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Ups$stableprop from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UseCurrentNode$stableprop from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AdvanceSlotsBy$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AppendValue$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ApplyChangeList$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopyNodesToNewAnchorLocation$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopySlotTableToAnchorLocation$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DeactivateCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DetermineMovableContentNodeIndex$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Downs$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCompositionScope$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndMovableContentPlacement$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndResumingScope$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureGroupStarted$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureRootGroupStarted$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertNodeFixup$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlots$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlotsWithFixups$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveNode$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_PostInsertNodeFixup$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ReleaseMovableGroupAtCurrent$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Remember$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RememberPausingScope$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveNode$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ResetSlots$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SideEffect$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SkipToEndOfCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_StartResumingScope$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TestOperation$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TrimParentValues$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAnchoredValue$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAuxData$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateNode$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateValue$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Ups$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm32]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UseCurrentNode$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AdvanceSlotsBy$stableprop from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AppendValue$stableprop from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ApplyChangeList$stableprop from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopyNodesToNewAnchorLocation$stableprop from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopySlotTableToAnchorLocation$stableprop from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DeactivateCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DetermineMovableContentNodeIndex$stableprop from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Downs$stableprop from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCompositionScope$stableprop from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndMovableContentPlacement$stableprop from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndResumingScope$stableprop from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureGroupStarted$stableprop from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureRootGroupStarted$stableprop from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertNodeFixup$stableprop from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlots$stableprop from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlotsWithFixups$stableprop from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveNode$stableprop from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_PostInsertNodeFixup$stableprop from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ReleaseMovableGroupAtCurrent$stableprop from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Remember$stableprop from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RememberPausingScope$stableprop from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveNode$stableprop from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ResetSlots$stableprop from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SideEffect$stableprop from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SkipToEndOfCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_StartResumingScope$stableprop from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TestOperation$stableprop from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TrimParentValues$stableprop from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAnchoredValue$stableprop from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAuxData$stableprop from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateNode$stableprop from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateValue$stableprop from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Ups$stableprop from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UseCurrentNode$stableprop from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AdvanceSlotsBy$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AppendValue$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ApplyChangeList$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopyNodesToNewAnchorLocation$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopySlotTableToAnchorLocation$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DeactivateCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DetermineMovableContentNodeIndex$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Downs$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCompositionScope$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndMovableContentPlacement$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndResumingScope$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureGroupStarted$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureRootGroupStarted$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertNodeFixup$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlots$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlotsWithFixups$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveNode$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_PostInsertNodeFixup$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ReleaseMovableGroupAtCurrent$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Remember$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RememberPausingScope$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveNode$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ResetSlots$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SideEffect$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SkipToEndOfCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_StartResumingScope$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TestOperation$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TrimParentValues$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAnchoredValue$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAuxData$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateNode$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateValue$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Ups$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UseCurrentNode$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AdvanceSlotsBy$stableprop from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AppendValue$stableprop from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ApplyChangeList$stableprop from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopyNodesToNewAnchorLocation$stableprop from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopySlotTableToAnchorLocation$stableprop from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DeactivateCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DetermineMovableContentNodeIndex$stableprop from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Downs$stableprop from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCompositionScope$stableprop from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndMovableContentPlacement$stableprop from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndResumingScope$stableprop from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureGroupStarted$stableprop from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureRootGroupStarted$stableprop from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertNodeFixup$stableprop from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlots$stableprop from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlotsWithFixups$stableprop from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveNode$stableprop from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_PostInsertNodeFixup$stableprop from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ReleaseMovableGroupAtCurrent$stableprop from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Remember$stableprop from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RememberPausingScope$stableprop from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveNode$stableprop from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ResetSlots$stableprop from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SideEffect$stableprop from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SkipToEndOfCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_StartResumingScope$stableprop from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TestOperation$stableprop from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TrimParentValues$stableprop from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAnchoredValue$stableprop from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAuxData$stableprop from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateNode$stableprop from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateValue$stableprop from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Ups$stableprop from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UseCurrentNode$stableprop from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AdvanceSlotsBy$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AppendValue$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ApplyChangeList$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopyNodesToNewAnchorLocation$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopySlotTableToAnchorLocation$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DeactivateCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DetermineMovableContentNodeIndex$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Downs$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCompositionScope$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndMovableContentPlacement$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndResumingScope$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureGroupStarted$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureRootGroupStarted$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertNodeFixup$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlots$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlotsWithFixups$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveNode$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_PostInsertNodeFixup$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ReleaseMovableGroupAtCurrent$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Remember$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RememberPausingScope$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveNode$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ResetSlots$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SideEffect$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SkipToEndOfCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_StartResumingScope$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TestOperation$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TrimParentValues$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAnchoredValue$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAuxData$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateNode$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateValue$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Ups$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosDeviceArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UseCurrentNode$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AdvanceSlotsBy$stableprop from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AppendValue$stableprop from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ApplyChangeList$stableprop from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopyNodesToNewAnchorLocation$stableprop from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopySlotTableToAnchorLocation$stableprop from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DeactivateCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DetermineMovableContentNodeIndex$stableprop from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Downs$stableprop from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCompositionScope$stableprop from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndMovableContentPlacement$stableprop from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndResumingScope$stableprop from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureGroupStarted$stableprop from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureRootGroupStarted$stableprop from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertNodeFixup$stableprop from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlots$stableprop from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlotsWithFixups$stableprop from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveNode$stableprop from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_PostInsertNodeFixup$stableprop from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ReleaseMovableGroupAtCurrent$stableprop from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Remember$stableprop from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RememberPausingScope$stableprop from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveNode$stableprop from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ResetSlots$stableprop from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SideEffect$stableprop from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SkipToEndOfCurrentGroup$stableprop from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_StartResumingScope$stableprop from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TestOperation$stableprop from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TrimParentValues$stableprop from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAnchoredValue$stableprop from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAuxData$stableprop from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateNode$stableprop from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateValue$stableprop from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Ups$stableprop from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UseCurrentNode$stableprop from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AdvanceSlotsBy$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AppendValue$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ApplyChangeList$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopyNodesToNewAnchorLocation$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopySlotTableToAnchorLocation$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DeactivateCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DetermineMovableContentNodeIndex$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Downs$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCompositionScope$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndMovableContentPlacement$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndResumingScope$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureGroupStarted$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureRootGroupStarted$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertNodeFixup$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlots$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlotsWithFixups$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveNode$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_PostInsertNodeFixup$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ReleaseMovableGroupAtCurrent$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Remember$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RememberPausingScope$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveNode$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ResetSlots$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SideEffect$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SkipToEndOfCurrentGroup$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_StartResumingScope$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TestOperation$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TrimParentValues$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAnchoredValue$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAuxData$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateNode$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateValue$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Ups$stableprop_getter() from androidx.compose.runtime:runtime
+[watchosSimulatorArm64]: Removed declaration androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UseCurrentNode$stableprop_getter() from androidx.compose.runtime:runtime
\ No newline at end of file
diff --git a/compose/runtime/runtime/bcv/native/current.txt b/compose/runtime/runtime/bcv/native/current.txt
index f3922e81ddef2..95e5052dda30a 100644
--- a/compose/runtime/runtime/bcv/native/current.txt
+++ b/compose/runtime/runtime/bcv/native/current.txt
@@ -1053,44 +1053,44 @@ final const val androidx.compose.runtime/referenceKey // androidx.compose.runtim
 final const val androidx.compose.runtime/reuseKey // androidx.compose.runtime/reuseKey|{}reuseKey[0]
     final fun <get-reuseKey>(): kotlin/Int // androidx.compose.runtime/reuseKey.<get-reuseKey>|<get-reuseKey>(){}[0]
 
-final val androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AdvanceSlotsBy$stableprop // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AdvanceSlotsBy$stableprop|#static{}androidx_compose_runtime_changelist_Operation_AdvanceSlotsBy$stableprop[0]
-final val androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AppendValue$stableprop // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AppendValue$stableprop|#static{}androidx_compose_runtime_changelist_Operation_AppendValue$stableprop[0]
-final val androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ApplyChangeList$stableprop // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ApplyChangeList$stableprop|#static{}androidx_compose_runtime_changelist_Operation_ApplyChangeList$stableprop[0]
-final val androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopyNodesToNewAnchorLocation$stableprop // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopyNodesToNewAnchorLocation$stableprop|#static{}androidx_compose_runtime_changelist_Operation_CopyNodesToNewAnchorLocation$stableprop[0]
-final val androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopySlotTableToAnchorLocation$stableprop // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopySlotTableToAnchorLocation$stableprop|#static{}androidx_compose_runtime_changelist_Operation_CopySlotTableToAnchorLocation$stableprop[0]
-final val androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DeactivateCurrentGroup$stableprop // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DeactivateCurrentGroup$stableprop|#static{}androidx_compose_runtime_changelist_Operation_DeactivateCurrentGroup$stableprop[0]
-final val androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DetermineMovableContentNodeIndex$stableprop // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DetermineMovableContentNodeIndex$stableprop|#static{}androidx_compose_runtime_changelist_Operation_DetermineMovableContentNodeIndex$stableprop[0]
-final val androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Downs$stableprop // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Downs$stableprop|#static{}androidx_compose_runtime_changelist_Operation_Downs$stableprop[0]
-final val androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCompositionScope$stableprop // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCompositionScope$stableprop|#static{}androidx_compose_runtime_changelist_Operation_EndCompositionScope$stableprop[0]
-final val androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCurrentGroup$stableprop // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCurrentGroup$stableprop|#static{}androidx_compose_runtime_changelist_Operation_EndCurrentGroup$stableprop[0]
-final val androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndMovableContentPlacement$stableprop // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndMovableContentPlacement$stableprop|#static{}androidx_compose_runtime_changelist_Operation_EndMovableContentPlacement$stableprop[0]
-final val androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndResumingScope$stableprop // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndResumingScope$stableprop|#static{}androidx_compose_runtime_changelist_Operation_EndResumingScope$stableprop[0]
-final val androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureGroupStarted$stableprop // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureGroupStarted$stableprop|#static{}androidx_compose_runtime_changelist_Operation_EnsureGroupStarted$stableprop[0]
-final val androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureRootGroupStarted$stableprop // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureRootGroupStarted$stableprop|#static{}androidx_compose_runtime_changelist_Operation_EnsureRootGroupStarted$stableprop[0]
-final val androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertNodeFixup$stableprop // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertNodeFixup$stableprop|#static{}androidx_compose_runtime_changelist_Operation_InsertNodeFixup$stableprop[0]
-final val androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlots$stableprop // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlots$stableprop|#static{}androidx_compose_runtime_changelist_Operation_InsertSlots$stableprop[0]
-final val androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlotsWithFixups$stableprop // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlotsWithFixups$stableprop|#static{}androidx_compose_runtime_changelist_Operation_InsertSlotsWithFixups$stableprop[0]
-final val androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveCurrentGroup$stableprop // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveCurrentGroup$stableprop|#static{}androidx_compose_runtime_changelist_Operation_MoveCurrentGroup$stableprop[0]
-final val androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveNode$stableprop // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveNode$stableprop|#static{}androidx_compose_runtime_changelist_Operation_MoveNode$stableprop[0]
-final val androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_PostInsertNodeFixup$stableprop // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_PostInsertNodeFixup$stableprop|#static{}androidx_compose_runtime_changelist_Operation_PostInsertNodeFixup$stableprop[0]
-final val androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ReleaseMovableGroupAtCurrent$stableprop // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ReleaseMovableGroupAtCurrent$stableprop|#static{}androidx_compose_runtime_changelist_Operation_ReleaseMovableGroupAtCurrent$stableprop[0]
-final val androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Remember$stableprop // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Remember$stableprop|#static{}androidx_compose_runtime_changelist_Operation_Remember$stableprop[0]
-final val androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RememberPausingScope$stableprop // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RememberPausingScope$stableprop|#static{}androidx_compose_runtime_changelist_Operation_RememberPausingScope$stableprop[0]
-final val androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveCurrentGroup$stableprop // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveCurrentGroup$stableprop|#static{}androidx_compose_runtime_changelist_Operation_RemoveCurrentGroup$stableprop[0]
-final val androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveNode$stableprop // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveNode$stableprop|#static{}androidx_compose_runtime_changelist_Operation_RemoveNode$stableprop[0]
-final val androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ResetSlots$stableprop // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ResetSlots$stableprop|#static{}androidx_compose_runtime_changelist_Operation_ResetSlots$stableprop[0]
-final val androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SideEffect$stableprop // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SideEffect$stableprop|#static{}androidx_compose_runtime_changelist_Operation_SideEffect$stableprop[0]
-final val androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SkipToEndOfCurrentGroup$stableprop // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SkipToEndOfCurrentGroup$stableprop|#static{}androidx_compose_runtime_changelist_Operation_SkipToEndOfCurrentGroup$stableprop[0]
-final val androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_StartResumingScope$stableprop // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_StartResumingScope$stableprop|#static{}androidx_compose_runtime_changelist_Operation_StartResumingScope$stableprop[0]
-final val androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TestOperation$stableprop // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TestOperation$stableprop|#static{}androidx_compose_runtime_changelist_Operation_TestOperation$stableprop[0]
-final val androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TrimParentValues$stableprop // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TrimParentValues$stableprop|#static{}androidx_compose_runtime_changelist_Operation_TrimParentValues$stableprop[0]
-final val androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAnchoredValue$stableprop // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAnchoredValue$stableprop|#static{}androidx_compose_runtime_changelist_Operation_UpdateAnchoredValue$stableprop[0]
-final val androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAuxData$stableprop // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAuxData$stableprop|#static{}androidx_compose_runtime_changelist_Operation_UpdateAuxData$stableprop[0]
-final val androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateNode$stableprop // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateNode$stableprop|#static{}androidx_compose_runtime_changelist_Operation_UpdateNode$stableprop[0]
-final val androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateValue$stableprop // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateValue$stableprop|#static{}androidx_compose_runtime_changelist_Operation_UpdateValue$stableprop[0]
-final val androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Ups$stableprop // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Ups$stableprop|#static{}androidx_compose_runtime_changelist_Operation_Ups$stableprop[0]
-final val androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UseCurrentNode$stableprop // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UseCurrentNode$stableprop|#static{}androidx_compose_runtime_changelist_Operation_UseCurrentNode$stableprop[0]
 final val androidx.compose.runtime.collection/androidx_compose_runtime_collection_MutableVector$stableprop // androidx.compose.runtime.collection/androidx_compose_runtime_collection_MutableVector$stableprop|#static{}androidx_compose_runtime_collection_MutableVector$stableprop[0]
+final val androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_AdvanceSlotsBy$stableprop // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_AdvanceSlotsBy$stableprop|#static{}androidx_compose_runtime_composer_gapbuffer_changelist_Operation_AdvanceSlotsBy$stableprop[0]
+final val androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_AppendValue$stableprop // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_AppendValue$stableprop|#static{}androidx_compose_runtime_composer_gapbuffer_changelist_Operation_AppendValue$stableprop[0]
+final val androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_ApplyChangeList$stableprop // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_ApplyChangeList$stableprop|#static{}androidx_compose_runtime_composer_gapbuffer_changelist_Operation_ApplyChangeList$stableprop[0]
+final val androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_CopyNodesToNewAnchorLocation$stableprop // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_CopyNodesToNewAnchorLocation$stableprop|#static{}androidx_compose_runtime_composer_gapbuffer_changelist_Operation_CopyNodesToNewAnchorLocation$stableprop[0]
+final val androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_CopySlotTableToAnchorLocation$stableprop // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_CopySlotTableToAnchorLocation$stableprop|#static{}androidx_compose_runtime_composer_gapbuffer_changelist_Operation_CopySlotTableToAnchorLocation$stableprop[0]
+final val androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_DeactivateCurrentGroup$stableprop // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_DeactivateCurrentGroup$stableprop|#static{}androidx_compose_runtime_composer_gapbuffer_changelist_Operation_DeactivateCurrentGroup$stableprop[0]
+final val androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_DetermineMovableContentNodeIndex$stableprop // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_DetermineMovableContentNodeIndex$stableprop|#static{}androidx_compose_runtime_composer_gapbuffer_changelist_Operation_DetermineMovableContentNodeIndex$stableprop[0]
+final val androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_Downs$stableprop // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_Downs$stableprop|#static{}androidx_compose_runtime_composer_gapbuffer_changelist_Operation_Downs$stableprop[0]
+final val androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_EndCompositionScope$stableprop // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_EndCompositionScope$stableprop|#static{}androidx_compose_runtime_composer_gapbuffer_changelist_Operation_EndCompositionScope$stableprop[0]
+final val androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_EndCurrentGroup$stableprop // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_EndCurrentGroup$stableprop|#static{}androidx_compose_runtime_composer_gapbuffer_changelist_Operation_EndCurrentGroup$stableprop[0]
+final val androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_EndMovableContentPlacement$stableprop // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_EndMovableContentPlacement$stableprop|#static{}androidx_compose_runtime_composer_gapbuffer_changelist_Operation_EndMovableContentPlacement$stableprop[0]
+final val androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_EndResumingScope$stableprop // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_EndResumingScope$stableprop|#static{}androidx_compose_runtime_composer_gapbuffer_changelist_Operation_EndResumingScope$stableprop[0]
+final val androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_EnsureGroupStarted$stableprop // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_EnsureGroupStarted$stableprop|#static{}androidx_compose_runtime_composer_gapbuffer_changelist_Operation_EnsureGroupStarted$stableprop[0]
+final val androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_EnsureRootGroupStarted$stableprop // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_EnsureRootGroupStarted$stableprop|#static{}androidx_compose_runtime_composer_gapbuffer_changelist_Operation_EnsureRootGroupStarted$stableprop[0]
+final val androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_InsertNodeFixup$stableprop // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_InsertNodeFixup$stableprop|#static{}androidx_compose_runtime_composer_gapbuffer_changelist_Operation_InsertNodeFixup$stableprop[0]
+final val androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_InsertSlots$stableprop // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_InsertSlots$stableprop|#static{}androidx_compose_runtime_composer_gapbuffer_changelist_Operation_InsertSlots$stableprop[0]
+final val androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_InsertSlotsWithFixups$stableprop // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_InsertSlotsWithFixups$stableprop|#static{}androidx_compose_runtime_composer_gapbuffer_changelist_Operation_InsertSlotsWithFixups$stableprop[0]
+final val androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_MoveCurrentGroup$stableprop // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_MoveCurrentGroup$stableprop|#static{}androidx_compose_runtime_composer_gapbuffer_changelist_Operation_MoveCurrentGroup$stableprop[0]
+final val androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_MoveNode$stableprop // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_MoveNode$stableprop|#static{}androidx_compose_runtime_composer_gapbuffer_changelist_Operation_MoveNode$stableprop[0]
+final val androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_PostInsertNodeFixup$stableprop // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_PostInsertNodeFixup$stableprop|#static{}androidx_compose_runtime_composer_gapbuffer_changelist_Operation_PostInsertNodeFixup$stableprop[0]
+final val androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_ReleaseMovableGroupAtCurrent$stableprop // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_ReleaseMovableGroupAtCurrent$stableprop|#static{}androidx_compose_runtime_composer_gapbuffer_changelist_Operation_ReleaseMovableGroupAtCurrent$stableprop[0]
+final val androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_Remember$stableprop // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_Remember$stableprop|#static{}androidx_compose_runtime_composer_gapbuffer_changelist_Operation_Remember$stableprop[0]
+final val androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_RememberPausingScope$stableprop // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_RememberPausingScope$stableprop|#static{}androidx_compose_runtime_composer_gapbuffer_changelist_Operation_RememberPausingScope$stableprop[0]
+final val androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_RemoveCurrentGroup$stableprop // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_RemoveCurrentGroup$stableprop|#static{}androidx_compose_runtime_composer_gapbuffer_changelist_Operation_RemoveCurrentGroup$stableprop[0]
+final val androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_RemoveNode$stableprop // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_RemoveNode$stableprop|#static{}androidx_compose_runtime_composer_gapbuffer_changelist_Operation_RemoveNode$stableprop[0]
+final val androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_ResetSlots$stableprop // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_ResetSlots$stableprop|#static{}androidx_compose_runtime_composer_gapbuffer_changelist_Operation_ResetSlots$stableprop[0]
+final val androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_SideEffect$stableprop // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_SideEffect$stableprop|#static{}androidx_compose_runtime_composer_gapbuffer_changelist_Operation_SideEffect$stableprop[0]
+final val androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_SkipToEndOfCurrentGroup$stableprop // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_SkipToEndOfCurrentGroup$stableprop|#static{}androidx_compose_runtime_composer_gapbuffer_changelist_Operation_SkipToEndOfCurrentGroup$stableprop[0]
+final val androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_StartResumingScope$stableprop // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_StartResumingScope$stableprop|#static{}androidx_compose_runtime_composer_gapbuffer_changelist_Operation_StartResumingScope$stableprop[0]
+final val androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_TestOperation$stableprop // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_TestOperation$stableprop|#static{}androidx_compose_runtime_composer_gapbuffer_changelist_Operation_TestOperation$stableprop[0]
+final val androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_TrimParentValues$stableprop // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_TrimParentValues$stableprop|#static{}androidx_compose_runtime_composer_gapbuffer_changelist_Operation_TrimParentValues$stableprop[0]
+final val androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_UpdateAnchoredValue$stableprop // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_UpdateAnchoredValue$stableprop|#static{}androidx_compose_runtime_composer_gapbuffer_changelist_Operation_UpdateAnchoredValue$stableprop[0]
+final val androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_UpdateAuxData$stableprop // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_UpdateAuxData$stableprop|#static{}androidx_compose_runtime_composer_gapbuffer_changelist_Operation_UpdateAuxData$stableprop[0]
+final val androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_UpdateNode$stableprop // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_UpdateNode$stableprop|#static{}androidx_compose_runtime_composer_gapbuffer_changelist_Operation_UpdateNode$stableprop[0]
+final val androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_UpdateValue$stableprop // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_UpdateValue$stableprop|#static{}androidx_compose_runtime_composer_gapbuffer_changelist_Operation_UpdateValue$stableprop[0]
+final val androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_Ups$stableprop // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_Ups$stableprop|#static{}androidx_compose_runtime_composer_gapbuffer_changelist_Operation_Ups$stableprop[0]
+final val androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_UseCurrentNode$stableprop // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_UseCurrentNode$stableprop|#static{}androidx_compose_runtime_composer_gapbuffer_changelist_Operation_UseCurrentNode$stableprop[0]
 final val androidx.compose.runtime.internal/androidx_compose_runtime_internal_AwaiterQueue_Awaiter$stableprop // androidx.compose.runtime.internal/androidx_compose_runtime_internal_AwaiterQueue_Awaiter$stableprop|#static{}androidx_compose_runtime_internal_AwaiterQueue_Awaiter$stableprop[0]
 final val androidx.compose.runtime.internal/androidx_compose_runtime_internal_PersistentCompositionLocalHashMap_Builder$stableprop // androidx.compose.runtime.internal/androidx_compose_runtime_internal_PersistentCompositionLocalHashMap_Builder$stableprop|#static{}androidx_compose_runtime_internal_PersistentCompositionLocalHashMap_Builder$stableprop[0]
 final val androidx.compose.runtime.snapshots.tooling/androidx_compose_runtime_snapshots_tooling_SnapshotInstanceObservers$stableprop // androidx.compose.runtime.snapshots.tooling/androidx_compose_runtime_snapshots_tooling_SnapshotInstanceObservers$stableprop|#static{}androidx_compose_runtime_snapshots_tooling_SnapshotInstanceObservers$stableprop[0]
@@ -1204,44 +1204,44 @@ final fun <#A: kotlin/Any?> androidx.compose.runtime/snapshotFlow(androidx.compo
 final fun <#A: kotlin/Any?> androidx.compose.runtime/snapshotFlow(kotlin/Function0<#A>): kotlinx.coroutines.flow/Flow<#A> // androidx.compose.runtime/snapshotFlow|snapshotFlow(kotlin.Function0<0:0>){0§<kotlin.Any?>}[0]
 final fun <#A: kotlin/Any?> androidx.compose.runtime/staticCompositionLocalOf(kotlin/Function0<#A>): androidx.compose.runtime/ProvidableCompositionLocal<#A> // androidx.compose.runtime/staticCompositionLocalOf|staticCompositionLocalOf(kotlin.Function0<0:0>){0§<kotlin.Any?>}[0]
 final fun <#A: kotlin/Any?> androidx.compose.runtime/structuralEqualityPolicy(): androidx.compose.runtime/SnapshotMutationPolicy<#A> // androidx.compose.runtime/structuralEqualityPolicy|structuralEqualityPolicy(){0§<kotlin.Any?>}[0]
-final fun androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AdvanceSlotsBy$stableprop_getter(): kotlin/Int // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AdvanceSlotsBy$stableprop_getter|androidx_compose_runtime_changelist_Operation_AdvanceSlotsBy$stableprop_getter(){}[0]
-final fun androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AppendValue$stableprop_getter(): kotlin/Int // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_AppendValue$stableprop_getter|androidx_compose_runtime_changelist_Operation_AppendValue$stableprop_getter(){}[0]
-final fun androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ApplyChangeList$stableprop_getter(): kotlin/Int // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ApplyChangeList$stableprop_getter|androidx_compose_runtime_changelist_Operation_ApplyChangeList$stableprop_getter(){}[0]
-final fun androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopyNodesToNewAnchorLocation$stableprop_getter(): kotlin/Int // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopyNodesToNewAnchorLocation$stableprop_getter|androidx_compose_runtime_changelist_Operation_CopyNodesToNewAnchorLocation$stableprop_getter(){}[0]
-final fun androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopySlotTableToAnchorLocation$stableprop_getter(): kotlin/Int // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_CopySlotTableToAnchorLocation$stableprop_getter|androidx_compose_runtime_changelist_Operation_CopySlotTableToAnchorLocation$stableprop_getter(){}[0]
-final fun androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DeactivateCurrentGroup$stableprop_getter(): kotlin/Int // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DeactivateCurrentGroup$stableprop_getter|androidx_compose_runtime_changelist_Operation_DeactivateCurrentGroup$stableprop_getter(){}[0]
-final fun androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DetermineMovableContentNodeIndex$stableprop_getter(): kotlin/Int // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_DetermineMovableContentNodeIndex$stableprop_getter|androidx_compose_runtime_changelist_Operation_DetermineMovableContentNodeIndex$stableprop_getter(){}[0]
-final fun androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Downs$stableprop_getter(): kotlin/Int // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Downs$stableprop_getter|androidx_compose_runtime_changelist_Operation_Downs$stableprop_getter(){}[0]
-final fun androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCompositionScope$stableprop_getter(): kotlin/Int // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCompositionScope$stableprop_getter|androidx_compose_runtime_changelist_Operation_EndCompositionScope$stableprop_getter(){}[0]
-final fun androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCurrentGroup$stableprop_getter(): kotlin/Int // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndCurrentGroup$stableprop_getter|androidx_compose_runtime_changelist_Operation_EndCurrentGroup$stableprop_getter(){}[0]
-final fun androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndMovableContentPlacement$stableprop_getter(): kotlin/Int // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndMovableContentPlacement$stableprop_getter|androidx_compose_runtime_changelist_Operation_EndMovableContentPlacement$stableprop_getter(){}[0]
-final fun androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndResumingScope$stableprop_getter(): kotlin/Int // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EndResumingScope$stableprop_getter|androidx_compose_runtime_changelist_Operation_EndResumingScope$stableprop_getter(){}[0]
-final fun androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureGroupStarted$stableprop_getter(): kotlin/Int // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureGroupStarted$stableprop_getter|androidx_compose_runtime_changelist_Operation_EnsureGroupStarted$stableprop_getter(){}[0]
-final fun androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureRootGroupStarted$stableprop_getter(): kotlin/Int // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_EnsureRootGroupStarted$stableprop_getter|androidx_compose_runtime_changelist_Operation_EnsureRootGroupStarted$stableprop_getter(){}[0]
-final fun androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertNodeFixup$stableprop_getter(): kotlin/Int // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertNodeFixup$stableprop_getter|androidx_compose_runtime_changelist_Operation_InsertNodeFixup$stableprop_getter(){}[0]
-final fun androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlots$stableprop_getter(): kotlin/Int // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlots$stableprop_getter|androidx_compose_runtime_changelist_Operation_InsertSlots$stableprop_getter(){}[0]
-final fun androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlotsWithFixups$stableprop_getter(): kotlin/Int // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_InsertSlotsWithFixups$stableprop_getter|androidx_compose_runtime_changelist_Operation_InsertSlotsWithFixups$stableprop_getter(){}[0]
-final fun androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveCurrentGroup$stableprop_getter(): kotlin/Int // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveCurrentGroup$stableprop_getter|androidx_compose_runtime_changelist_Operation_MoveCurrentGroup$stableprop_getter(){}[0]
-final fun androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveNode$stableprop_getter(): kotlin/Int // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_MoveNode$stableprop_getter|androidx_compose_runtime_changelist_Operation_MoveNode$stableprop_getter(){}[0]
-final fun androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_PostInsertNodeFixup$stableprop_getter(): kotlin/Int // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_PostInsertNodeFixup$stableprop_getter|androidx_compose_runtime_changelist_Operation_PostInsertNodeFixup$stableprop_getter(){}[0]
-final fun androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ReleaseMovableGroupAtCurrent$stableprop_getter(): kotlin/Int // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ReleaseMovableGroupAtCurrent$stableprop_getter|androidx_compose_runtime_changelist_Operation_ReleaseMovableGroupAtCurrent$stableprop_getter(){}[0]
-final fun androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Remember$stableprop_getter(): kotlin/Int // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Remember$stableprop_getter|androidx_compose_runtime_changelist_Operation_Remember$stableprop_getter(){}[0]
-final fun androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RememberPausingScope$stableprop_getter(): kotlin/Int // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RememberPausingScope$stableprop_getter|androidx_compose_runtime_changelist_Operation_RememberPausingScope$stableprop_getter(){}[0]
-final fun androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveCurrentGroup$stableprop_getter(): kotlin/Int // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveCurrentGroup$stableprop_getter|androidx_compose_runtime_changelist_Operation_RemoveCurrentGroup$stableprop_getter(){}[0]
-final fun androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveNode$stableprop_getter(): kotlin/Int // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_RemoveNode$stableprop_getter|androidx_compose_runtime_changelist_Operation_RemoveNode$stableprop_getter(){}[0]
-final fun androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ResetSlots$stableprop_getter(): kotlin/Int // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_ResetSlots$stableprop_getter|androidx_compose_runtime_changelist_Operation_ResetSlots$stableprop_getter(){}[0]
-final fun androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SideEffect$stableprop_getter(): kotlin/Int // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SideEffect$stableprop_getter|androidx_compose_runtime_changelist_Operation_SideEffect$stableprop_getter(){}[0]
-final fun androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SkipToEndOfCurrentGroup$stableprop_getter(): kotlin/Int // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_SkipToEndOfCurrentGroup$stableprop_getter|androidx_compose_runtime_changelist_Operation_SkipToEndOfCurrentGroup$stableprop_getter(){}[0]
-final fun androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_StartResumingScope$stableprop_getter(): kotlin/Int // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_StartResumingScope$stableprop_getter|androidx_compose_runtime_changelist_Operation_StartResumingScope$stableprop_getter(){}[0]
-final fun androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TestOperation$stableprop_getter(): kotlin/Int // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TestOperation$stableprop_getter|androidx_compose_runtime_changelist_Operation_TestOperation$stableprop_getter(){}[0]
-final fun androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TrimParentValues$stableprop_getter(): kotlin/Int // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_TrimParentValues$stableprop_getter|androidx_compose_runtime_changelist_Operation_TrimParentValues$stableprop_getter(){}[0]
-final fun androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAnchoredValue$stableprop_getter(): kotlin/Int // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAnchoredValue$stableprop_getter|androidx_compose_runtime_changelist_Operation_UpdateAnchoredValue$stableprop_getter(){}[0]
-final fun androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAuxData$stableprop_getter(): kotlin/Int // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateAuxData$stableprop_getter|androidx_compose_runtime_changelist_Operation_UpdateAuxData$stableprop_getter(){}[0]
-final fun androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateNode$stableprop_getter(): kotlin/Int // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateNode$stableprop_getter|androidx_compose_runtime_changelist_Operation_UpdateNode$stableprop_getter(){}[0]
-final fun androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateValue$stableprop_getter(): kotlin/Int // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UpdateValue$stableprop_getter|androidx_compose_runtime_changelist_Operation_UpdateValue$stableprop_getter(){}[0]
-final fun androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Ups$stableprop_getter(): kotlin/Int // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_Ups$stableprop_getter|androidx_compose_runtime_changelist_Operation_Ups$stableprop_getter(){}[0]
-final fun androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UseCurrentNode$stableprop_getter(): kotlin/Int // androidx.compose.runtime.changelist/androidx_compose_runtime_changelist_Operation_UseCurrentNode$stableprop_getter|androidx_compose_runtime_changelist_Operation_UseCurrentNode$stableprop_getter(){}[0]
 final fun androidx.compose.runtime.collection/androidx_compose_runtime_collection_MutableVector$stableprop_getter(): kotlin/Int // androidx.compose.runtime.collection/androidx_compose_runtime_collection_MutableVector$stableprop_getter|androidx_compose_runtime_collection_MutableVector$stableprop_getter(){}[0]
+final fun androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_AdvanceSlotsBy$stableprop_getter(): kotlin/Int // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_AdvanceSlotsBy$stableprop_getter|androidx_compose_runtime_composer_gapbuffer_changelist_Operation_AdvanceSlotsBy$stableprop_getter(){}[0]
+final fun androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_AppendValue$stableprop_getter(): kotlin/Int // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_AppendValue$stableprop_getter|androidx_compose_runtime_composer_gapbuffer_changelist_Operation_AppendValue$stableprop_getter(){}[0]
+final fun androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_ApplyChangeList$stableprop_getter(): kotlin/Int // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_ApplyChangeList$stableprop_getter|androidx_compose_runtime_composer_gapbuffer_changelist_Operation_ApplyChangeList$stableprop_getter(){}[0]
+final fun androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_CopyNodesToNewAnchorLocation$stableprop_getter(): kotlin/Int // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_CopyNodesToNewAnchorLocation$stableprop_getter|androidx_compose_runtime_composer_gapbuffer_changelist_Operation_CopyNodesToNewAnchorLocation$stableprop_getter(){}[0]
+final fun androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_CopySlotTableToAnchorLocation$stableprop_getter(): kotlin/Int // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_CopySlotTableToAnchorLocation$stableprop_getter|androidx_compose_runtime_composer_gapbuffer_changelist_Operation_CopySlotTableToAnchorLocation$stableprop_getter(){}[0]
+final fun androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_DeactivateCurrentGroup$stableprop_getter(): kotlin/Int // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_DeactivateCurrentGroup$stableprop_getter|androidx_compose_runtime_composer_gapbuffer_changelist_Operation_DeactivateCurrentGroup$stableprop_getter(){}[0]
+final fun androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_DetermineMovableContentNodeIndex$stableprop_getter(): kotlin/Int // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_DetermineMovableContentNodeIndex$stableprop_getter|androidx_compose_runtime_composer_gapbuffer_changelist_Operation_DetermineMovableContentNodeIndex$stableprop_getter(){}[0]
+final fun androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_Downs$stableprop_getter(): kotlin/Int // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_Downs$stableprop_getter|androidx_compose_runtime_composer_gapbuffer_changelist_Operation_Downs$stableprop_getter(){}[0]
+final fun androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_EndCompositionScope$stableprop_getter(): kotlin/Int // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_EndCompositionScope$stableprop_getter|androidx_compose_runtime_composer_gapbuffer_changelist_Operation_EndCompositionScope$stableprop_getter(){}[0]
+final fun androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_EndCurrentGroup$stableprop_getter(): kotlin/Int // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_EndCurrentGroup$stableprop_getter|androidx_compose_runtime_composer_gapbuffer_changelist_Operation_EndCurrentGroup$stableprop_getter(){}[0]
+final fun androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_EndMovableContentPlacement$stableprop_getter(): kotlin/Int // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_EndMovableContentPlacement$stableprop_getter|androidx_compose_runtime_composer_gapbuffer_changelist_Operation_EndMovableContentPlacement$stableprop_getter(){}[0]
+final fun androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_EndResumingScope$stableprop_getter(): kotlin/Int // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_EndResumingScope$stableprop_getter|androidx_compose_runtime_composer_gapbuffer_changelist_Operation_EndResumingScope$stableprop_getter(){}[0]
+final fun androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_EnsureGroupStarted$stableprop_getter(): kotlin/Int // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_EnsureGroupStarted$stableprop_getter|androidx_compose_runtime_composer_gapbuffer_changelist_Operation_EnsureGroupStarted$stableprop_getter(){}[0]
+final fun androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_EnsureRootGroupStarted$stableprop_getter(): kotlin/Int // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_EnsureRootGroupStarted$stableprop_getter|androidx_compose_runtime_composer_gapbuffer_changelist_Operation_EnsureRootGroupStarted$stableprop_getter(){}[0]
+final fun androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_InsertNodeFixup$stableprop_getter(): kotlin/Int // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_InsertNodeFixup$stableprop_getter|androidx_compose_runtime_composer_gapbuffer_changelist_Operation_InsertNodeFixup$stableprop_getter(){}[0]
+final fun androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_InsertSlots$stableprop_getter(): kotlin/Int // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_InsertSlots$stableprop_getter|androidx_compose_runtime_composer_gapbuffer_changelist_Operation_InsertSlots$stableprop_getter(){}[0]
+final fun androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_InsertSlotsWithFixups$stableprop_getter(): kotlin/Int // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_InsertSlotsWithFixups$stableprop_getter|androidx_compose_runtime_composer_gapbuffer_changelist_Operation_InsertSlotsWithFixups$stableprop_getter(){}[0]
+final fun androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_MoveCurrentGroup$stableprop_getter(): kotlin/Int // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_MoveCurrentGroup$stableprop_getter|androidx_compose_runtime_composer_gapbuffer_changelist_Operation_MoveCurrentGroup$stableprop_getter(){}[0]
+final fun androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_MoveNode$stableprop_getter(): kotlin/Int // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_MoveNode$stableprop_getter|androidx_compose_runtime_composer_gapbuffer_changelist_Operation_MoveNode$stableprop_getter(){}[0]
+final fun androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_PostInsertNodeFixup$stableprop_getter(): kotlin/Int // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_PostInsertNodeFixup$stableprop_getter|androidx_compose_runtime_composer_gapbuffer_changelist_Operation_PostInsertNodeFixup$stableprop_getter(){}[0]
+final fun androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_ReleaseMovableGroupAtCurrent$stableprop_getter(): kotlin/Int // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_ReleaseMovableGroupAtCurrent$stableprop_getter|androidx_compose_runtime_composer_gapbuffer_changelist_Operation_ReleaseMovableGroupAtCurrent$stableprop_getter(){}[0]
+final fun androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_Remember$stableprop_getter(): kotlin/Int // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_Remember$stableprop_getter|androidx_compose_runtime_composer_gapbuffer_changelist_Operation_Remember$stableprop_getter(){}[0]
+final fun androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_RememberPausingScope$stableprop_getter(): kotlin/Int // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_RememberPausingScope$stableprop_getter|androidx_compose_runtime_composer_gapbuffer_changelist_Operation_RememberPausingScope$stableprop_getter(){}[0]
+final fun androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_RemoveCurrentGroup$stableprop_getter(): kotlin/Int // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_RemoveCurrentGroup$stableprop_getter|androidx_compose_runtime_composer_gapbuffer_changelist_Operation_RemoveCurrentGroup$stableprop_getter(){}[0]
+final fun androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_RemoveNode$stableprop_getter(): kotlin/Int // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_RemoveNode$stableprop_getter|androidx_compose_runtime_composer_gapbuffer_changelist_Operation_RemoveNode$stableprop_getter(){}[0]
+final fun androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_ResetSlots$stableprop_getter(): kotlin/Int // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_ResetSlots$stableprop_getter|androidx_compose_runtime_composer_gapbuffer_changelist_Operation_ResetSlots$stableprop_getter(){}[0]
+final fun androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_SideEffect$stableprop_getter(): kotlin/Int // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_SideEffect$stableprop_getter|androidx_compose_runtime_composer_gapbuffer_changelist_Operation_SideEffect$stableprop_getter(){}[0]
+final fun androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_SkipToEndOfCurrentGroup$stableprop_getter(): kotlin/Int // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_SkipToEndOfCurrentGroup$stableprop_getter|androidx_compose_runtime_composer_gapbuffer_changelist_Operation_SkipToEndOfCurrentGroup$stableprop_getter(){}[0]
+final fun androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_StartResumingScope$stableprop_getter(): kotlin/Int // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_StartResumingScope$stableprop_getter|androidx_compose_runtime_composer_gapbuffer_changelist_Operation_StartResumingScope$stableprop_getter(){}[0]
+final fun androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_TestOperation$stableprop_getter(): kotlin/Int // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_TestOperation$stableprop_getter|androidx_compose_runtime_composer_gapbuffer_changelist_Operation_TestOperation$stableprop_getter(){}[0]
+final fun androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_TrimParentValues$stableprop_getter(): kotlin/Int // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_TrimParentValues$stableprop_getter|androidx_compose_runtime_composer_gapbuffer_changelist_Operation_TrimParentValues$stableprop_getter(){}[0]
+final fun androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_UpdateAnchoredValue$stableprop_getter(): kotlin/Int // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_UpdateAnchoredValue$stableprop_getter|androidx_compose_runtime_composer_gapbuffer_changelist_Operation_UpdateAnchoredValue$stableprop_getter(){}[0]
+final fun androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_UpdateAuxData$stableprop_getter(): kotlin/Int // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_UpdateAuxData$stableprop_getter|androidx_compose_runtime_composer_gapbuffer_changelist_Operation_UpdateAuxData$stableprop_getter(){}[0]
+final fun androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_UpdateNode$stableprop_getter(): kotlin/Int // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_UpdateNode$stableprop_getter|androidx_compose_runtime_composer_gapbuffer_changelist_Operation_UpdateNode$stableprop_getter(){}[0]
+final fun androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_UpdateValue$stableprop_getter(): kotlin/Int // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_UpdateValue$stableprop_getter|androidx_compose_runtime_composer_gapbuffer_changelist_Operation_UpdateValue$stableprop_getter(){}[0]
+final fun androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_Ups$stableprop_getter(): kotlin/Int // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_Ups$stableprop_getter|androidx_compose_runtime_composer_gapbuffer_changelist_Operation_Ups$stableprop_getter(){}[0]
+final fun androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_UseCurrentNode$stableprop_getter(): kotlin/Int // androidx.compose.runtime.composer.gapbuffer.changelist/androidx_compose_runtime_composer_gapbuffer_changelist_Operation_UseCurrentNode$stableprop_getter|androidx_compose_runtime_composer_gapbuffer_changelist_Operation_UseCurrentNode$stableprop_getter(){}[0]
 final fun androidx.compose.runtime.internal/androidx_compose_runtime_internal_AwaiterQueue_Awaiter$stableprop_getter(): kotlin/Int // androidx.compose.runtime.internal/androidx_compose_runtime_internal_AwaiterQueue_Awaiter$stableprop_getter|androidx_compose_runtime_internal_AwaiterQueue_Awaiter$stableprop_getter(){}[0]
 final fun androidx.compose.runtime.internal/androidx_compose_runtime_internal_PersistentCompositionLocalHashMap_Builder$stableprop_getter(): kotlin/Int // androidx.compose.runtime.internal/androidx_compose_runtime_internal_PersistentCompositionLocalHashMap_Builder$stableprop_getter|androidx_compose_runtime_internal_PersistentCompositionLocalHashMap_Builder$stableprop_getter(){}[0]
 final fun androidx.compose.runtime.internal/composableLambda(androidx.compose.runtime/Composer, kotlin/Int, kotlin/Boolean, kotlin/Any): androidx.compose.runtime.internal/ComposableLambda // androidx.compose.runtime.internal/composableLambda|composableLambda(androidx.compose.runtime.Composer;kotlin.Int;kotlin.Boolean;kotlin.Any){}[0]
diff --git a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/Composition.kt b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/Composition.kt
index 31aa0746af319..cd9c5f10814f2 100644
--- a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/Composition.kt
+++ b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/Composition.kt
@@ -20,11 +20,11 @@ package androidx.compose.runtime
 
 import androidx.collection.MutableScatterSet
 import androidx.collection.ScatterSet
-import androidx.compose.runtime.changelist.ChangeList
 import androidx.compose.runtime.collection.ScopeMap
 import androidx.compose.runtime.collection.fastForEach
 import androidx.compose.runtime.composer.gapbuffer.Anchor
 import androidx.compose.runtime.composer.gapbuffer.SlotTable
+import androidx.compose.runtime.composer.gapbuffer.changelist.ChangeList
 import androidx.compose.runtime.internal.AtomicReference
 import androidx.compose.runtime.internal.RememberEventDispatcher
 import androidx.compose.runtime.internal.trace
diff --git a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/GapComposer.kt b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/GapComposer.kt
index 7252c7ba8a47c..cacfdfa4de8c6 100644
--- a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/GapComposer.kt
+++ b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/GapComposer.kt
@@ -25,9 +25,6 @@ import androidx.collection.MutableScatterMap
 import androidx.collection.MutableScatterSet
 import androidx.collection.ScatterSet
 import androidx.collection.mutableScatterSetOf
-import androidx.compose.runtime.changelist.ChangeList
-import androidx.compose.runtime.changelist.ComposerChangeListWriter
-import androidx.compose.runtime.changelist.FixupList
 import androidx.compose.runtime.collection.MultiValueMap
 import androidx.compose.runtime.collection.ScopeMap
 import androidx.compose.runtime.composer.gapbuffer.Anchor
@@ -35,6 +32,9 @@ import androidx.compose.runtime.composer.gapbuffer.KeyInfo
 import androidx.compose.runtime.composer.gapbuffer.SlotReader
 import androidx.compose.runtime.composer.gapbuffer.SlotTable
 import androidx.compose.runtime.composer.gapbuffer.SlotWriter
+import androidx.compose.runtime.composer.gapbuffer.changelist.ChangeList
+import androidx.compose.runtime.composer.gapbuffer.changelist.ComposerChangeListWriter
+import androidx.compose.runtime.composer.gapbuffer.changelist.FixupList
 import androidx.compose.runtime.internal.IntRef
 import androidx.compose.runtime.internal.invokeComposable
 import androidx.compose.runtime.internal.persistentCompositionLocalHashMapOf
diff --git a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/changelist/ChangeList.kt b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/composer/gapbuffer/changelist/ChangeList.kt
similarity index 75%
rename from compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/changelist/ChangeList.kt
rename to compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/composer/gapbuffer/changelist/ChangeList.kt
index 0290dd4895052..6412bcdd00cf6 100644
--- a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/changelist/ChangeList.kt
+++ b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/composer/gapbuffer/changelist/ChangeList.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Android Open Source Project
+ * Copyright 2025 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.compose.runtime.changelist
+package androidx.compose.runtime.composer.gapbuffer.changelist
 
 import androidx.compose.runtime.Applier
 import androidx.compose.runtime.ComposeNodeLifecycleCallback
@@ -27,43 +27,43 @@ import androidx.compose.runtime.MovableContentStateReference
 import androidx.compose.runtime.RecomposeScopeImpl
 import androidx.compose.runtime.RememberManager
 import androidx.compose.runtime.RememberObserverHolder
-import androidx.compose.runtime.changelist.Operation.AdvanceSlotsBy
-import androidx.compose.runtime.changelist.Operation.AppendValue
-import androidx.compose.runtime.changelist.Operation.ApplyChangeList
-import androidx.compose.runtime.changelist.Operation.CopyNodesToNewAnchorLocation
-import androidx.compose.runtime.changelist.Operation.CopySlotTableToAnchorLocation
-import androidx.compose.runtime.changelist.Operation.DeactivateCurrentGroup
-import androidx.compose.runtime.changelist.Operation.DetermineMovableContentNodeIndex
-import androidx.compose.runtime.changelist.Operation.Downs
-import androidx.compose.runtime.changelist.Operation.EndCompositionScope
-import androidx.compose.runtime.changelist.Operation.EndCurrentGroup
-import androidx.compose.runtime.changelist.Operation.EndMovableContentPlacement
-import androidx.compose.runtime.changelist.Operation.EndResumingScope
-import androidx.compose.runtime.changelist.Operation.EnsureGroupStarted
-import androidx.compose.runtime.changelist.Operation.EnsureRootGroupStarted
-import androidx.compose.runtime.changelist.Operation.InsertSlots
-import androidx.compose.runtime.changelist.Operation.InsertSlotsWithFixups
-import androidx.compose.runtime.changelist.Operation.MoveCurrentGroup
-import androidx.compose.runtime.changelist.Operation.MoveNode
-import androidx.compose.runtime.changelist.Operation.ReleaseMovableGroupAtCurrent
-import androidx.compose.runtime.changelist.Operation.Remember
-import androidx.compose.runtime.changelist.Operation.RememberPausingScope
-import androidx.compose.runtime.changelist.Operation.RemoveCurrentGroup
-import androidx.compose.runtime.changelist.Operation.RemoveNode
-import androidx.compose.runtime.changelist.Operation.ResetSlots
-import androidx.compose.runtime.changelist.Operation.SideEffect
-import androidx.compose.runtime.changelist.Operation.SkipToEndOfCurrentGroup
-import androidx.compose.runtime.changelist.Operation.StartResumingScope
-import androidx.compose.runtime.changelist.Operation.TrimParentValues
-import androidx.compose.runtime.changelist.Operation.UpdateAnchoredValue
-import androidx.compose.runtime.changelist.Operation.UpdateAuxData
-import androidx.compose.runtime.changelist.Operation.UpdateNode
-import androidx.compose.runtime.changelist.Operation.UpdateValue
-import androidx.compose.runtime.changelist.Operation.Ups
-import androidx.compose.runtime.changelist.Operation.UseCurrentNode
 import androidx.compose.runtime.composer.gapbuffer.Anchor
 import androidx.compose.runtime.composer.gapbuffer.SlotTable
 import androidx.compose.runtime.composer.gapbuffer.SlotWriter
+import androidx.compose.runtime.composer.gapbuffer.changelist.Operation.AdvanceSlotsBy
+import androidx.compose.runtime.composer.gapbuffer.changelist.Operation.AppendValue
+import androidx.compose.runtime.composer.gapbuffer.changelist.Operation.ApplyChangeList
+import androidx.compose.runtime.composer.gapbuffer.changelist.Operation.CopyNodesToNewAnchorLocation
+import androidx.compose.runtime.composer.gapbuffer.changelist.Operation.CopySlotTableToAnchorLocation
+import androidx.compose.runtime.composer.gapbuffer.changelist.Operation.DeactivateCurrentGroup
+import androidx.compose.runtime.composer.gapbuffer.changelist.Operation.DetermineMovableContentNodeIndex
+import androidx.compose.runtime.composer.gapbuffer.changelist.Operation.Downs
+import androidx.compose.runtime.composer.gapbuffer.changelist.Operation.EndCompositionScope
+import androidx.compose.runtime.composer.gapbuffer.changelist.Operation.EndCurrentGroup
+import androidx.compose.runtime.composer.gapbuffer.changelist.Operation.EndMovableContentPlacement
+import androidx.compose.runtime.composer.gapbuffer.changelist.Operation.EndResumingScope
+import androidx.compose.runtime.composer.gapbuffer.changelist.Operation.EnsureGroupStarted
+import androidx.compose.runtime.composer.gapbuffer.changelist.Operation.EnsureRootGroupStarted
+import androidx.compose.runtime.composer.gapbuffer.changelist.Operation.InsertSlots
+import androidx.compose.runtime.composer.gapbuffer.changelist.Operation.InsertSlotsWithFixups
+import androidx.compose.runtime.composer.gapbuffer.changelist.Operation.MoveCurrentGroup
+import androidx.compose.runtime.composer.gapbuffer.changelist.Operation.MoveNode
+import androidx.compose.runtime.composer.gapbuffer.changelist.Operation.ReleaseMovableGroupAtCurrent
+import androidx.compose.runtime.composer.gapbuffer.changelist.Operation.Remember
+import androidx.compose.runtime.composer.gapbuffer.changelist.Operation.RememberPausingScope
+import androidx.compose.runtime.composer.gapbuffer.changelist.Operation.RemoveCurrentGroup
+import androidx.compose.runtime.composer.gapbuffer.changelist.Operation.RemoveNode
+import androidx.compose.runtime.composer.gapbuffer.changelist.Operation.ResetSlots
+import androidx.compose.runtime.composer.gapbuffer.changelist.Operation.SideEffect
+import androidx.compose.runtime.composer.gapbuffer.changelist.Operation.SkipToEndOfCurrentGroup
+import androidx.compose.runtime.composer.gapbuffer.changelist.Operation.StartResumingScope
+import androidx.compose.runtime.composer.gapbuffer.changelist.Operation.TrimParentValues
+import androidx.compose.runtime.composer.gapbuffer.changelist.Operation.UpdateAnchoredValue
+import androidx.compose.runtime.composer.gapbuffer.changelist.Operation.UpdateAuxData
+import androidx.compose.runtime.composer.gapbuffer.changelist.Operation.UpdateNode
+import androidx.compose.runtime.composer.gapbuffer.changelist.Operation.UpdateValue
+import androidx.compose.runtime.composer.gapbuffer.changelist.Operation.Ups
+import androidx.compose.runtime.composer.gapbuffer.changelist.Operation.UseCurrentNode
 import androidx.compose.runtime.internal.IntRef
 
 internal class ChangeList : OperationsDebugStringFormattable() {
diff --git a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/changelist/ComposerChangeListWriter.kt b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/composer/gapbuffer/changelist/ComposerChangeListWriter.kt
similarity index 99%
rename from compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/changelist/ComposerChangeListWriter.kt
rename to compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/composer/gapbuffer/changelist/ComposerChangeListWriter.kt
index e617be9762e10..72cf30a017d67 100644
--- a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/changelist/ComposerChangeListWriter.kt
+++ b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/composer/gapbuffer/changelist/ComposerChangeListWriter.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.compose.runtime.changelist
+package androidx.compose.runtime.composer.gapbuffer.changelist
 
 import androidx.compose.runtime.Composition
 import androidx.compose.runtime.CompositionContext
diff --git a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/changelist/FixupList.kt b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/composer/gapbuffer/changelist/FixupList.kt
similarity index 73%
rename from compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/changelist/FixupList.kt
rename to compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/composer/gapbuffer/changelist/FixupList.kt
index f110f06dde9dd..e07ea60618fac 100644
--- a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/changelist/FixupList.kt
+++ b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/composer/gapbuffer/changelist/FixupList.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Android Open Source Project
+ * Copyright 2025 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,10 @@
  * limitations under the License.
  */
 
-package androidx.compose.runtime.changelist
+package androidx.compose.runtime.composer.gapbuffer.changelist
 
 import androidx.compose.runtime.Applier
 import androidx.compose.runtime.RememberManager
-import androidx.compose.runtime.changelist.Operation.InsertNodeFixup
-import androidx.compose.runtime.changelist.Operation.PostInsertNodeFixup
-import androidx.compose.runtime.changelist.Operation.UpdateNode
 import androidx.compose.runtime.composer.gapbuffer.Anchor
 import androidx.compose.runtime.composer.gapbuffer.SlotWriter
 import androidx.compose.runtime.runtimeCheck
@@ -60,15 +57,15 @@ internal class FixupList : OperationsDebugStringFormattable() {
     }
 
     fun createAndInsertNode(factory: () -> Any?, insertIndex: Int, groupAnchor: Anchor) {
-        operations.push(InsertNodeFixup) {
-            setObject(InsertNodeFixup.Factory, factory)
-            setInt(InsertNodeFixup.InsertIndex, insertIndex)
-            setObject(InsertNodeFixup.GroupAnchor, groupAnchor)
+        operations.push(Operation.InsertNodeFixup) {
+            setObject(Operation.InsertNodeFixup.Factory, factory)
+            setInt(Operation.InsertNodeFixup.InsertIndex, insertIndex)
+            setObject(Operation.InsertNodeFixup.GroupAnchor, groupAnchor)
         }
 
-        pendingOperations.push(PostInsertNodeFixup) {
-            setInt(PostInsertNodeFixup.InsertIndex, insertIndex)
-            setObject(PostInsertNodeFixup.GroupAnchor, groupAnchor)
+        pendingOperations.push(Operation.PostInsertNodeFixup) {
+            setInt(Operation.PostInsertNodeFixup.InsertIndex, insertIndex)
+            setObject(Operation.PostInsertNodeFixup.GroupAnchor, groupAnchor)
         }
     }
 
@@ -80,9 +77,12 @@ internal class FixupList : OperationsDebugStringFormattable() {
     }
 
     fun <V, T> updateNode(value: V, block: T.(V) -> Unit) {
-        operations.push(UpdateNode) {
-            setObject(UpdateNode.Value, value)
-            setObject(UpdateNode.Block, @Suppress("UNCHECKED_CAST") (block as Any?.(Any?) -> Unit))
+        operations.push(Operation.UpdateNode) {
+            setObject(Operation.UpdateNode.Value, value)
+            setObject(
+                Operation.UpdateNode.Block,
+                @Suppress("UNCHECKED_CAST") (block as Any?.(Any?) -> Unit),
+            )
         }
     }
 
diff --git a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/changelist/Operation.kt b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/composer/gapbuffer/changelist/Operation.kt
similarity index 99%
rename from compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/changelist/Operation.kt
rename to compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/composer/gapbuffer/changelist/Operation.kt
index 3936674cf1031..0e374deaaf4a6 100644
--- a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/changelist/Operation.kt
+++ b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/composer/gapbuffer/changelist/Operation.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.compose.runtime.changelist
+package androidx.compose.runtime.composer.gapbuffer.changelist
 
 import androidx.compose.runtime.Applier
 import androidx.compose.runtime.Composition
diff --git a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/changelist/OperationArgContainer.kt b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/composer/gapbuffer/changelist/OperationArgContainer.kt
similarity index 96%
rename from compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/changelist/OperationArgContainer.kt
rename to compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/composer/gapbuffer/changelist/OperationArgContainer.kt
index f350745b9f625..1d58090dbed90 100644
--- a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/changelist/OperationArgContainer.kt
+++ b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/composer/gapbuffer/changelist/OperationArgContainer.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.compose.runtime.changelist
+package androidx.compose.runtime.composer.gapbuffer.changelist
 
 import androidx.compose.runtime.tooling.ComposeStackTraceFrame
 
diff --git a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/changelist/Operations.kt b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/composer/gapbuffer/changelist/Operations.kt
similarity index 98%
rename from compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/changelist/Operations.kt
rename to compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/composer/gapbuffer/changelist/Operations.kt
index f78ea6fad8f78..e56ac48e14cfc 100644
--- a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/changelist/Operations.kt
+++ b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/composer/gapbuffer/changelist/Operations.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Android Open Source Project
+ * Copyright 2025 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,15 +16,15 @@
 
 @file:Suppress("NOTHING_TO_INLINE", "KotlinRedundantDiagnosticSuppress")
 
-package androidx.compose.runtime.changelist
+package androidx.compose.runtime.composer.gapbuffer.changelist
 
 import androidx.compose.runtime.Applier
 import androidx.compose.runtime.EnableDebugRuntimeChecks
 import androidx.compose.runtime.InternalComposeApi
 import androidx.compose.runtime.RememberManager
-import androidx.compose.runtime.changelist.Operation.ObjectParameter
 import androidx.compose.runtime.collection.fastCopyInto
 import androidx.compose.runtime.composer.gapbuffer.SlotWriter
+import androidx.compose.runtime.composer.gapbuffer.changelist.Operation.ObjectParameter
 import androidx.compose.runtime.debugRuntimeCheck
 import androidx.compose.runtime.requirePrecondition
 import kotlin.contracts.ExperimentalContracts
@@ -584,7 +584,7 @@ internal class Operations : OperationsDebugStringFormattable() {
         }
     }
 
-    private fun Operations.OpIterator.currentOpToDebugString(linePrefix: String): String {
+    private fun OpIterator.currentOpToDebugString(linePrefix: String): String {
         val operation = operation
         return if (operation.ints == 0 && operation.objects == 0) {
             operation.name
diff --git a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/tooling/CompositionErrorContext.kt b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/tooling/CompositionErrorContext.kt
index 4875f237323df..c6afe5c64c543 100644
--- a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/tooling/CompositionErrorContext.kt
+++ b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/tooling/CompositionErrorContext.kt
@@ -18,7 +18,7 @@ package androidx.compose.runtime.tooling
 
 import androidx.compose.runtime.CompositionLocal
 import androidx.compose.runtime.GapComposer
-import androidx.compose.runtime.changelist.OperationErrorContext
+import androidx.compose.runtime.composer.gapbuffer.changelist.OperationErrorContext
 import androidx.compose.runtime.staticCompositionLocalOf
 import kotlin.coroutines.CoroutineContext
 
diff --git a/compose/runtime/runtime/src/commonTest/kotlin/androidx/compose/runtime/changelist/TestOperations.kt b/compose/runtime/runtime/src/commonTest/kotlin/androidx/compose/runtime/changelist/TestOperations.kt
deleted file mode 100644
index ee4e33fa77516..0000000000000
--- a/compose/runtime/runtime/src/commonTest/kotlin/androidx/compose/runtime/changelist/TestOperations.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2023 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.compose.runtime.changelist
-
-import androidx.compose.runtime.changelist.Operation.TestOperation
-
-internal object TestOperations {
-    val NoArgsOperation = TestOperation()
-
-    val OneIntOperation = TestOperation(ints = 1)
-    val TwoIntsOperation = TestOperation(ints = 2)
-    val ThreeIntsOperation = TestOperation(ints = 3)
-
-    val OneObjectOperation = TestOperation(objects = 1)
-    val TwoObjectsOperation = TestOperation(objects = 2)
-    val ThreeObjectsOperation = TestOperation(objects = 3)
-
-    val MixedOperation = TestOperation(ints = 2, objects = 2)
-}
diff --git a/compose/runtime/runtime/src/commonTest/kotlin/androidx/compose/runtime/composer/gapbuffer/changelist/TestOperations.kt b/compose/runtime/runtime/src/commonTest/kotlin/androidx/compose/runtime/composer/gapbuffer/changelist/TestOperations.kt
new file mode 100644
index 0000000000000..61d9ba49672e4
--- /dev/null
+++ b/compose/runtime/runtime/src/commonTest/kotlin/androidx/compose/runtime/composer/gapbuffer/changelist/TestOperations.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2025 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.runtime.composer.gapbuffer.changelist
+
+internal object TestOperations {
+    val NoArgsOperation = Operation.TestOperation()
+
+    val OneIntOperation = Operation.TestOperation(ints = 1)
+    val TwoIntsOperation = Operation.TestOperation(ints = 2)
+    val ThreeIntsOperation = Operation.TestOperation(ints = 3)
+
+    val OneObjectOperation = Operation.TestOperation(objects = 1)
+    val TwoObjectsOperation = Operation.TestOperation(objects = 2)
+    val ThreeObjectsOperation = Operation.TestOperation(objects = 3)
+
+    val MixedOperation = Operation.TestOperation(ints = 2, objects = 2)
+}
diff --git a/compose/runtime/runtime/src/jvmAndAndroidTest/kotlin/androidx/compose/runtime/changelist/OperationDefinitionValidationTest.kt b/compose/runtime/runtime/src/jvmAndAndroidTest/kotlin/androidx/compose/runtime/changelist/OperationDefinitionValidationTest.kt
index 365b6f8cbdf8f..ce6e54fa2fa33 100644
--- a/compose/runtime/runtime/src/jvmAndAndroidTest/kotlin/androidx/compose/runtime/changelist/OperationDefinitionValidationTest.kt
+++ b/compose/runtime/runtime/src/jvmAndAndroidTest/kotlin/androidx/compose/runtime/changelist/OperationDefinitionValidationTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Android Open Source Project
+ * Copyright 2025 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package androidx.compose.runtime.changelist
+package androidx.compose.runtime.composer.gapbuffer.changelist
 
-import androidx.compose.runtime.changelist.Operation.ObjectParameter
+import androidx.compose.runtime.composer.gapbuffer.changelist.Operation.ObjectParameter
 import kotlin.reflect.KProperty1
 import kotlin.reflect.full.declaredMemberProperties
 import kotlin.test.fail
diff --git a/compose/runtime/runtime/src/jvmAndAndroidTest/kotlin/androidx/compose/runtime/changelist/OperationsTest.kt b/compose/runtime/runtime/src/jvmAndAndroidTest/kotlin/androidx/compose/runtime/changelist/OperationsTest.kt
index 7f58a7c2c3f2c..697c47a530543 100644
--- a/compose/runtime/runtime/src/jvmAndAndroidTest/kotlin/androidx/compose/runtime/changelist/OperationsTest.kt
+++ b/compose/runtime/runtime/src/jvmAndAndroidTest/kotlin/androidx/compose/runtime/changelist/OperationsTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Android Open Source Project
+ * Copyright 2025 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package androidx.compose.runtime.changelist
+package androidx.compose.runtime.composer.gapbuffer.changelist
 
 import androidx.compose.runtime.EnableDebugRuntimeChecks
-import androidx.compose.runtime.changelist.Operation.ObjectParameter
-import androidx.compose.runtime.changelist.TestOperations.MixedOperation
-import androidx.compose.runtime.changelist.TestOperations.NoArgsOperation
-import androidx.compose.runtime.changelist.TestOperations.OneIntOperation
-import androidx.compose.runtime.changelist.TestOperations.OneObjectOperation
-import androidx.compose.runtime.changelist.TestOperations.ThreeIntsOperation
-import androidx.compose.runtime.changelist.TestOperations.ThreeObjectsOperation
-import androidx.compose.runtime.changelist.TestOperations.TwoIntsOperation
-import androidx.compose.runtime.changelist.TestOperations.TwoObjectsOperation
+import androidx.compose.runtime.composer.gapbuffer.changelist.Operation.ObjectParameter
+import androidx.compose.runtime.composer.gapbuffer.changelist.TestOperations.MixedOperation
+import androidx.compose.runtime.composer.gapbuffer.changelist.TestOperations.NoArgsOperation
+import androidx.compose.runtime.composer.gapbuffer.changelist.TestOperations.OneIntOperation
+import androidx.compose.runtime.composer.gapbuffer.changelist.TestOperations.OneObjectOperation
+import androidx.compose.runtime.composer.gapbuffer.changelist.TestOperations.ThreeIntsOperation
+import androidx.compose.runtime.composer.gapbuffer.changelist.TestOperations.ThreeObjectsOperation
+import androidx.compose.runtime.composer.gapbuffer.changelist.TestOperations.TwoIntsOperation
+import androidx.compose.runtime.composer.gapbuffer.changelist.TestOperations.TwoObjectsOperation
 import kotlin.reflect.KProperty1
 import kotlin.reflect.full.declaredMembers
 import kotlin.reflect.jvm.isAccessible
diff --git a/compose/runtime/runtime/src/jvmTest/kotlin/androidx/compose/runtime/composer/gapbuffer/changelist/OperationDefinitionValidationTest.kt b/compose/runtime/runtime/src/jvmTest/kotlin/androidx/compose/runtime/composer/gapbuffer/changelist/OperationDefinitionValidationTest.kt
new file mode 100644
index 0000000000000..ce6e54fa2fa33
--- /dev/null
+++ b/compose/runtime/runtime/src/jvmTest/kotlin/androidx/compose/runtime/composer/gapbuffer/changelist/OperationDefinitionValidationTest.kt
@@ -0,0 +1,167 @@
+/*
+ * Copyright 2025 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.runtime.composer.gapbuffer.changelist
+
+import androidx.compose.runtime.composer.gapbuffer.changelist.Operation.ObjectParameter
+import kotlin.reflect.KProperty1
+import kotlin.reflect.full.declaredMemberProperties
+import kotlin.test.fail
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.Parameterized
+
+@RunWith(Parameterized::class)
+internal class OperationDefinitionValidationTest<T : Operation>(private val operation: T) {
+
+    companion object {
+        @JvmStatic
+        @Parameterized.Parameters(name = "{0}")
+        fun initParameters(): Array<Any> =
+            Operation::class.sealedSubclasses.mapNotNull { it.objectInstance }.toTypedArray()
+    }
+
+    @Test
+    fun validateOperationDefinition() {
+        val intParams = mutableListOf<Pair<String, IntParameter>>()
+        val objParams = mutableListOf<Pair<String, ObjectParameter<*>>>()
+        val errors = mutableListOf<String>()
+
+        operation::class
+            .declaredMemberProperties
+            .map { @Suppress("UNCHECKED_CAST") (it as KProperty1<T, Any?>) }
+            .forEach { property ->
+                when (val propertyValue = property.getter.invoke(operation)) {
+                    is IntParameter -> intParams += property.name to propertyValue
+                    is ObjectParameter<*> -> objParams += property.name to propertyValue
+                    else -> {
+                        println("Ignoring unexpected property $property")
+                    }
+                }
+            }
+
+        if (operation.ints < 0) {
+            errors += "The `Operation.ints` property cannot be assigned a negative value."
+        }
+
+        if (operation.objects < 0) {
+            errors += "The `Operation.objects` property cannot be assigned a negative value."
+        }
+
+        if (intParams.size != operation.ints) {
+            errors +=
+                "Operation declared a different number of int parameters than it " +
+                    "reports having. Either set ${operation.name}'s `ints` property to " +
+                    "${intParams.size} or update its parameter definitions so that there are " +
+                    "${operation.ints} IntParameter properties."
+        }
+
+        if (objParams.size != operation.objects) {
+            errors +=
+                "Operation declared a different number of object parameters than it " +
+                    "reports having. Either set ${operation.name}'s `objects` property to " +
+                    "${objParams.size} or update its parameter definitions so that there are " +
+                    "${operation.objects} ObjectParameter properties."
+        }
+
+        errors += checkNoDuplicateOffsets(intParams, objParams)
+        errors += checkValidOffsetRange(intParams, objParams)
+
+        if (errors.isNotEmpty()) {
+            fail(
+                "Operation ${operation.name} appears to be defined incorrectly. Its errors are:" +
+                    errors.joinToString(separator = "") { "\n    - $it" }
+            )
+        }
+    }
+
+    private fun checkNoDuplicateOffsets(
+        intParams: List<Pair<String, IntParameter>>,
+        objParams: List<Pair<String, ObjectParameter<*>>>,
+    ): List<String> {
+        val errors = mutableListOf<String>()
+        val duplicateIntOffsets =
+            intParams
+                .groupBy(
+                    keySelector = { (_, param) -> param },
+                    valueTransform = { (name, _) -> name },
+                )
+                .filterValues { it.size != 1 }
+
+        if (duplicateIntOffsets.isNotEmpty()) {
+            errors +=
+                "All int parameters must have unique offsets. " +
+                    "The offending pairs are: " +
+                    duplicateIntOffsets.values.joinToString {
+                        it.joinToString(prefix = "[", postfix = "]")
+                    }
+        }
+
+        val duplicateObjOffsets =
+            objParams
+                .groupBy(
+                    keySelector = { (_, param) -> param.offset },
+                    valueTransform = { (name, _) -> name },
+                )
+                .filterValues { it.size != 1 }
+
+        if (duplicateObjOffsets.isNotEmpty()) {
+            errors +=
+                "All object parameters must have unique offsets. " +
+                    "The offending pairs are: " +
+                    duplicateObjOffsets.values.joinToString {
+                        it.joinToString(prefix = "[", postfix = "]")
+                    }
+        }
+
+        return errors
+    }
+
+    private fun checkValidOffsetRange(
+        intParams: List<Pair<String, IntParameter>>,
+        objParams: List<Pair<String, ObjectParameter<*>>>,
+    ): List<String> {
+        val errors = mutableListOf<String>()
+
+        val outOfRangeInts =
+            intParams.mapNotNull { (name, param) ->
+                name
+                    .takeIf { param < 0 || param >= intParams.size }
+                    ?.let { paramName -> "$paramName (offset = ${param})" }
+            }
+        if (outOfRangeInts.isNotEmpty()) {
+            errors +=
+                "All int parameter offsets must be in the range of " +
+                    "0..${intParams.size - 1}. The offending parameters are: " +
+                    outOfRangeInts.joinToString()
+        }
+
+        val outOfRangeObjects =
+            objParams.mapNotNull { (name, param) ->
+                name
+                    .takeIf { param.offset < 0 || param.offset >= objParams.size }
+                    ?.let { paramName -> "$paramName (offset = ${param.offset})" }
+            }
+        if (outOfRangeObjects.isNotEmpty()) {
+            errors +=
+                "All object parameter offsets must be in the range of " +
+                    "0..${objParams.size - 1}. The offending parameters are: " +
+                    outOfRangeObjects.joinToString()
+        }
+
+        return errors
+    }
+}
diff --git a/compose/runtime/runtime/src/jvmTest/kotlin/androidx/compose/runtime/composer/gapbuffer/changelist/OperationsTest.kt b/compose/runtime/runtime/src/jvmTest/kotlin/androidx/compose/runtime/composer/gapbuffer/changelist/OperationsTest.kt
new file mode 100644
index 0000000000000..697c47a530543
--- /dev/null
+++ b/compose/runtime/runtime/src/jvmTest/kotlin/androidx/compose/runtime/composer/gapbuffer/changelist/OperationsTest.kt
@@ -0,0 +1,725 @@
+/*
+ * Copyright 2025 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.runtime.composer.gapbuffer.changelist
+
+import androidx.compose.runtime.EnableDebugRuntimeChecks
+import androidx.compose.runtime.composer.gapbuffer.changelist.Operation.ObjectParameter
+import androidx.compose.runtime.composer.gapbuffer.changelist.TestOperations.MixedOperation
+import androidx.compose.runtime.composer.gapbuffer.changelist.TestOperations.NoArgsOperation
+import androidx.compose.runtime.composer.gapbuffer.changelist.TestOperations.OneIntOperation
+import androidx.compose.runtime.composer.gapbuffer.changelist.TestOperations.OneObjectOperation
+import androidx.compose.runtime.composer.gapbuffer.changelist.TestOperations.ThreeIntsOperation
+import androidx.compose.runtime.composer.gapbuffer.changelist.TestOperations.ThreeObjectsOperation
+import androidx.compose.runtime.composer.gapbuffer.changelist.TestOperations.TwoIntsOperation
+import androidx.compose.runtime.composer.gapbuffer.changelist.TestOperations.TwoObjectsOperation
+import kotlin.reflect.KProperty1
+import kotlin.reflect.full.declaredMembers
+import kotlin.reflect.jvm.isAccessible
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
+import kotlin.test.fail
+
+class OperationsTest {
+
+    private val stack = Operations()
+
+    @Test
+    fun testInitialization() {
+        assertStackState(
+            message = "OpStack did not initialize in the expected state",
+            stack = stack,
+        )
+    }
+
+    @Test
+    fun testPush_withNoBlock_writesOperationWithNoArgs() {
+        stack.push(NoArgsOperation)
+        assertStackState(
+            message =
+                "OpStack was not in the expected state " +
+                    "after pushing an operation with no arguments",
+            stack = stack,
+            expectedOperations = listOf(NoArgsOperation),
+        )
+    }
+
+    @Test
+    fun testPush_withNoBlock_failsIfOperationHasArguments() {
+        if (EnableDebugRuntimeChecks) {
+            try {
+                stack.push(MixedOperation)
+                fail("Pushing an operation should fail if it has arguments")
+            } catch (_: IllegalArgumentException) {}
+        }
+    }
+
+    @Test
+    fun testPush_intArguments() {
+        stack.push(OneIntOperation) {
+            val (int1) = OneIntOperation.intParams
+            setInt(int1, 42)
+        }
+        assertStackState(
+            stack = stack,
+            expectedOperations = listOf(OneIntOperation),
+            expectedIntArgs = listOf(42),
+        )
+
+        stack.push(TwoIntsOperation) {
+            val (int1, int2) = TwoIntsOperation.intParams
+            setInt(int1, 1234)
+            setInt(int2, 5678)
+        }
+        assertStackState(
+            stack = stack,
+            expectedOperations = listOf(OneIntOperation, TwoIntsOperation),
+            expectedIntArgs = listOf(42, 1234, 5678),
+        )
+
+        stack.push(ThreeIntsOperation) {
+            val (int1, int2, int3) = ThreeIntsOperation.intParams
+            setInt(int1, 11)
+            setInt(int2, 22)
+            setInt(int3, 33)
+        }
+        assertStackState(
+            stack = stack,
+            expectedOperations = listOf(OneIntOperation, TwoIntsOperation, ThreeIntsOperation),
+            expectedIntArgs = listOf(42, 1234, 5678, 11, 22, 33),
+        )
+    }
+
+    @Test
+    fun testPush_objectArguments() {
+        stack.push(OneObjectOperation) {
+            val (obj1) = OneObjectOperation.objParams
+            setObject(obj1, null)
+        }
+        assertStackState(
+            stack = stack,
+            expectedOperations = listOf(OneObjectOperation),
+            expectedObjArgs = listOf(null),
+        )
+
+        stack.push(TwoObjectsOperation) {
+            val (obj1, obj2) = TwoObjectsOperation.objParams
+            setObject(obj1, "Hello")
+            setObject(obj2, "World")
+        }
+        assertStackState(
+            stack = stack,
+            expectedOperations = listOf(OneObjectOperation, TwoObjectsOperation),
+            expectedObjArgs = listOf(null, "Hello", "World"),
+        )
+
+        stack.push(ThreeObjectsOperation) {
+            val (obj1, obj2, obj3) = ThreeObjectsOperation.objParams
+            setObject(obj1, Unit)
+            setObject(obj2, "Another string")
+            setObject(obj3, 123.456)
+        }
+        assertStackState(
+            stack = stack,
+            expectedOperations =
+                listOf(OneObjectOperation, TwoObjectsOperation, ThreeObjectsOperation),
+            expectedObjArgs = listOf(null, "Hello", "World", Unit, "Another string", 123.456),
+        )
+    }
+
+    @Test
+    fun testPush_mixedArguments() {
+        stack.push(MixedOperation) {
+            val (int1, int2) = MixedOperation.intParams
+            val (obj1, obj2) = MixedOperation.objParams
+
+            setInt(int1, 999)
+            setInt(int2, -1)
+            setObject(obj1, "String 1")
+            setObject(obj2, "String 2")
+        }
+
+        assertStackState(
+            stack = stack,
+            expectedOperations = listOf(MixedOperation),
+            expectedIntArgs = listOf(999, -1),
+            expectedObjArgs = listOf("String 1", "String 2"),
+        )
+    }
+
+    @Test
+    fun testPush_variousOperations() {
+        pushVariousOperations(stack)
+        assertStackInVariousOperationState(stack = stack)
+    }
+
+    @Test
+    fun testPush_withResizingRequired() {
+        check(
+            stack.opCodes.size == OperationsInitialCapacity &&
+                stack.intArgs.size == OperationsInitialCapacity &&
+                stack.objectArgs.size == OperationsInitialCapacity
+        ) {
+            "OpStack did not initialize one or more of its backing arrays (opCodes, intArgs, " +
+                "or objectArgs) to `OpStack.InitialCapacity`. Please use the constant or update " +
+                "this test with the correct capacity to ensure that resizing is being tested."
+        }
+
+        val itemsToForceResize = OperationsInitialCapacity + 1
+        repeat(itemsToForceResize) { opNumber ->
+            stack.push(TwoIntsOperation) {
+                val (int1, int2) = TwoIntsOperation.intParams
+                setInt(int1, opNumber * 10 + 1)
+                setInt(int2, opNumber * 10 + 2)
+            }
+        }
+
+        repeat(itemsToForceResize) { opNumber ->
+            stack.push(TwoObjectsOperation) {
+                val (obj1, obj2) = TwoObjectsOperation.objParams
+                setObject(obj1, "op $opNumber, obj 1")
+                setObject(obj2, "op $opNumber, obj 2")
+            }
+        }
+
+        assertStackState(
+            message =
+                "Stack was not in the expected state after pushing " +
+                    "$itemsToForceResize operations, requiring that the stack resize all " +
+                    "of its internal arrays.",
+            stack = stack,
+            expectedOperations =
+                List(itemsToForceResize) { TwoIntsOperation } +
+                    List(itemsToForceResize) { TwoObjectsOperation },
+            expectedIntArgs =
+                generateSequence(0) { it + 1 }
+                    .flatMap { sequenceOf(it * 10 + 1, it * 10 + 2) }
+                    .take(itemsToForceResize * TwoIntsOperation.ints)
+                    .toList(),
+            expectedObjArgs =
+                generateSequence(0) { it + 1 }
+                    .flatMap { sequenceOf("op $it, obj 1", "op $it, obj 2") }
+                    .take(itemsToForceResize * TwoObjectsOperation.objects)
+                    .toList(),
+        )
+    }
+
+    @Test
+    fun testPush_throwsIfAnyIntArgsNotProvided() {
+        if (EnableDebugRuntimeChecks) {
+            try {
+                stack.push(TwoIntsOperation) {
+                    val (_, intArg2) = TwoIntsOperation.intParams
+                    setInt(intArg2, 42)
+                }
+                fail(
+                    "Pushing an operation that defines two parameters should fail " +
+                        "if only one of the arguments is set"
+                )
+            } catch (e: IllegalStateException) {
+                assertTrue(
+                    message =
+                        "The thrown exception does not appear to have reported the expected " +
+                            "error (its message is '${e.message}')",
+                    actual = e.message.orEmpty().contains("Not all arguments were provided"),
+                )
+            }
+        }
+    }
+
+    @Test
+    fun testPush_throwsIfAnyObjectArgsNotProvided() {
+        if (EnableDebugRuntimeChecks) {
+            try {
+                stack.push(TwoObjectsOperation) {
+                    val (_, objectArg2) = TwoObjectsOperation.objParams
+                    setObject(objectArg2, Any())
+                }
+                fail(
+                    "Pushing an operation that defines two parameters should fail " +
+                        "if only one of the arguments is set"
+                )
+            } catch (e: IllegalStateException) {
+                assertTrue(
+                    message =
+                        "The thrown exception does not appear to have reported the expected " +
+                            "error (its message is '${e.message}')",
+                    actual = e.message.orEmpty().contains("Not all arguments were provided"),
+                )
+            }
+        }
+    }
+
+    @Test
+    fun testPush_throwsIfIntArgProvidedTwice() {
+        if (EnableDebugRuntimeChecks) {
+            try {
+                stack.push(ThreeIntsOperation) {
+                    val (_, intArg2, _) = ThreeIntsOperation.intParams
+                    setInt(intArg2, 2)
+                    setInt(intArg2, 2)
+                }
+                fail("Pushing an operation should fail if an argument is set twice")
+            } catch (e: IllegalStateException) {
+                assertTrue(
+                    message =
+                        "The thrown exception does not appear to have reported the expected " +
+                            "error (its message is '${e.message}')",
+                    actual = e.message.orEmpty().contains("Already pushed argument"),
+                )
+            }
+        }
+    }
+
+    @Test
+    fun testPush_throwsIfObjectArgProvidedTwice() {
+        if (EnableDebugRuntimeChecks) {
+            try {
+                stack.push(ThreeObjectsOperation) {
+                    val (_, objectArg2, _) = ThreeObjectsOperation.objParams
+                    setObject(objectArg2, Any())
+                    setObject(objectArg2, Any())
+                }
+                fail("Pushing an operation should fail if an argument is set twice")
+            } catch (e: IllegalStateException) {
+                assertTrue(
+                    message =
+                        "The thrown exception does not appear to have reported the expected " +
+                            "error (its message is '${e.message}')",
+                    actual = e.message.orEmpty().contains("Already pushed argument"),
+                )
+            }
+        }
+    }
+
+    @Test(expected = IndexOutOfBoundsException::class)
+    fun testPop_throwsIfStackIsEmpty() {
+        stack.pop()
+    }
+
+    @Test
+    fun testPop_removesOnlyOperation() {
+        stack.push(MixedOperation) {
+            val (int1, int2) = MixedOperation.intParams
+            val (obj1, obj2) = MixedOperation.objParams
+
+            setInt(int1, 20)
+            setInt(int2, 30)
+            setObject(obj1, "obj1")
+            setObject(obj2, "obj2")
+        }
+
+        stack.pop()
+        assertStackState(
+            message = "Stack should be empty after popping the only item",
+            stack = stack,
+        )
+    }
+
+    @Test
+    fun testPop_removesMostRecentlyPushedOperation() {
+        stack.push(MixedOperation) {
+            val (int1, int2) = MixedOperation.intParams
+            val (obj1, obj2) = MixedOperation.objParams
+
+            setInt(int1, 20)
+            setInt(int2, 30)
+            setObject(obj1, "obj1")
+            setObject(obj2, "obj2")
+        }
+
+        stack.pop()
+        assertStackState(
+            message = "Stack should be empty after popping the only item",
+            stack = stack,
+        )
+    }
+
+    @Test(expected = IndexOutOfBoundsException::class)
+    fun testPopInto_throwsIfStackIsEmpty() {
+        stack.pop()
+    }
+
+    @Test
+    fun testPopInto_copiesAndRemovesOperationToNewTarget() {
+        repeat(40) { opNumber ->
+            stack.push(ThreeObjectsOperation) {
+                val (obj1, obj2, obj3) = ThreeObjectsOperation.objParams
+                setObject(obj1, "${opNumber}A")
+                setObject(obj2, "${opNumber}B")
+                setObject(obj3, "${opNumber}C")
+            }
+        }
+
+        val destinationStack = Operations()
+        repeat(20) { opNumber ->
+            destinationStack.push(ThreeIntsOperation) {
+                val (int1, int2, int3) = ThreeIntsOperation.intParams
+                setInt(int1, opNumber * 10)
+                setInt(int2, opNumber * 20)
+                setInt(int3, opNumber * 30)
+            }
+        }
+
+        assertStackState(
+            message = "Source stack did not initialize to the expected state",
+            stack = stack,
+            expectedOperations = List(40) { ThreeObjectsOperation },
+            expectedObjArgs =
+                generateSequence(0) { it + 1 }
+                    .flatMap { sequenceOf("${it}A", "${it}B", "${it}C") }
+                    .take(40 * ThreeObjectsOperation.objects)
+                    .toList(),
+        )
+
+        assertStackState(
+            message = "Destination stack did not initialize to the expected state",
+            stack = destinationStack,
+            expectedOperations = List(20) { ThreeIntsOperation },
+            expectedIntArgs =
+                generateSequence(0) { it + 1 }
+                    .flatMap { sequenceOf(it * 10, it * 20, it * 30) }
+                    .take(20 * ThreeIntsOperation.ints)
+                    .toList(),
+        )
+
+        stack.popInto(destinationStack)
+
+        assertStackState(
+            message = "The last pushed operation was not removed from the source stack as expected",
+            stack = stack,
+            expectedOperations = List(39) { ThreeObjectsOperation },
+            expectedObjArgs =
+                generateSequence(0) { it + 1 }
+                    .flatMap { sequenceOf("${it}A", "${it}B", "${it}C") }
+                    .take(39 * ThreeObjectsOperation.objects)
+                    .toList(),
+        )
+
+        assertStackState(
+            message = "The popped item was not added to the destination stack as expected",
+            stack = destinationStack,
+            expectedOperations = List(20) { ThreeIntsOperation } + ThreeObjectsOperation,
+            expectedIntArgs =
+                generateSequence(0) { it + 1 }
+                    .flatMap { sequenceOf(it * 10, it * 20, it * 30) }
+                    .take(20 * ThreeIntsOperation.ints)
+                    .toList(),
+            expectedObjArgs = listOf("39A", "39B", "39C"),
+        )
+    }
+
+    @Test
+    fun testClear_resetsToInitialState() {
+        val operationCount = OperationsInitialCapacity * 4
+        repeat(operationCount) { opNumber ->
+            stack.push(MixedOperation) {
+                val (int1, int2) = MixedOperation.intParams
+                val (obj1, obj2) = MixedOperation.objParams
+
+                setInt(int1, opNumber)
+                setInt(int2, -opNumber)
+                setObject(obj1, "obj1:$opNumber")
+                setObject(obj2, "obj2:$opNumber")
+            }
+        }
+
+        assertStackState(
+            message = "Stack was not seeded into the expected state",
+            stack = stack,
+            expectedOperations = List(operationCount) { MixedOperation },
+            expectedIntArgs =
+                generateSequence(0) { it + 1 }
+                    .flatMap { sequenceOf(it, -it) }
+                    .take(operationCount * MixedOperation.ints)
+                    .toList(),
+            expectedObjArgs =
+                generateSequence(0) { it + 1 }
+                    .flatMap { sequenceOf("obj1:$it", "obj2:$it") }
+                    .take(operationCount * MixedOperation.objects)
+                    .toList(),
+        )
+
+        stack.clear()
+        assertStackState(
+            message = "Stack did not properly reset after calling clear()",
+            stack = stack,
+        )
+    }
+
+    @Test
+    fun testDrain_iteratesThroughAllElements_inPushOrder_andClearsStack() {
+        pushVariousOperations(stack)
+
+        val capturedOperations = mutableListOf<Operation>()
+        val capturedInts = mutableListOf<Int>()
+        val capturedObjects = mutableListOf<Any?>()
+        stack.drain {
+            capturedOperations += operation
+            repeat(operation.ints) { offset -> capturedInts += getInt(offset) }
+            repeat(operation.objects) { offset ->
+                capturedObjects += getObject(ObjectParameter<Any?>(offset))
+            }
+        }
+
+        assertEquals(
+            message = "The stack's operations were not received in the expected order.",
+            expected =
+                listOf<Operation>(
+                    MixedOperation,
+                    NoArgsOperation,
+                    TwoIntsOperation,
+                    ThreeObjectsOperation,
+                    NoArgsOperation,
+                ),
+            actual = capturedOperations,
+        )
+
+        assertEquals(
+            message = "The stack's int arguments were not received in the expected order.",
+            expected = listOf(999, -1, 0xABCDEF, 0x123456),
+            actual = capturedInts,
+        )
+
+        assertEquals(
+            message = "The stack's object arguments were not received in the expected order.",
+            expected = listOf("String 1", "String 2", 1.0, Unit, null),
+            actual = capturedObjects,
+        )
+
+        assertStackState(message = "Stack should be empty after calling drain()", stack = stack)
+    }
+
+    @Test
+    fun testForEach_iteratesThroughOperations_inPushOrder() {
+        pushVariousOperations(stack)
+
+        val capturedOperations = mutableListOf<Operation>()
+        val capturedInts = mutableListOf<Int>()
+        val capturedObjects = mutableListOf<Any?>()
+        stack.forEach {
+            capturedOperations += operation
+            repeat(operation.ints) { offset -> capturedInts += getInt(offset) }
+            repeat(operation.objects) { offset ->
+                capturedObjects += getObject(ObjectParameter<Any?>(offset))
+            }
+        }
+
+        assertEquals(
+            message = "The stack's operations were not received in the expected order.",
+            expected =
+                listOf<Operation>(
+                    MixedOperation,
+                    NoArgsOperation,
+                    TwoIntsOperation,
+                    ThreeObjectsOperation,
+                    NoArgsOperation,
+                ),
+            actual = capturedOperations,
+        )
+
+        assertEquals(
+            message = "The stack's int arguments were not received in the expected order.",
+            expected = listOf(999, -1, 0xABCDEF, 0x123456),
+            actual = capturedInts,
+        )
+
+        assertEquals(
+            message = "The stack's object arguments were not received in the expected order.",
+            expected = listOf("String 1", "String 2", 1.0, Unit, null),
+            actual = capturedObjects,
+        )
+
+        assertStackInVariousOperationState(
+            message = "Stack should not be modified after iterating",
+            stack = stack,
+        )
+    }
+
+    private fun pushVariousOperations(stack: Operations) {
+        stack.apply {
+            push(MixedOperation) {
+                val (int1, int2) = MixedOperation.intParams
+                val (obj1, obj2) = MixedOperation.objParams
+
+                setInt(int1, 999)
+                setInt(int2, -1)
+                setObject(obj1, "String 1")
+                setObject(obj2, "String 2")
+            }
+
+            push(NoArgsOperation)
+
+            push(TwoIntsOperation) {
+                val (int1, int2) = TwoIntsOperation.intParams
+
+                setInt(int1, 0xABCDEF)
+                setInt(int2, 0x123456)
+            }
+
+            push(ThreeObjectsOperation) {
+                val (obj1, obj2, obj3) = ThreeObjectsOperation.objParams
+
+                setObject(obj1, 1.0)
+                setObject(obj2, Unit)
+                setObject(obj3, null)
+            }
+
+            push(NoArgsOperation)
+        }
+    }
+
+    private fun assertStackInVariousOperationState(message: String = "", stack: Operations) {
+        assertStackState(
+            message = message,
+            stack = stack,
+            expectedOperations =
+                listOf(
+                    MixedOperation,
+                    NoArgsOperation,
+                    TwoIntsOperation,
+                    ThreeObjectsOperation,
+                    NoArgsOperation,
+                ),
+            expectedIntArgs = listOf(999, -1, 0xABCDEF, 0x123456),
+            expectedObjArgs = listOf("String 1", "String 2", 1.0, Unit, null),
+        )
+    }
+
+    private fun assertStackState(
+        message: String = "",
+        stack: Operations,
+        expectedOperations: List<Operation> = emptyList(),
+        expectedIntArgs: List<Int> = emptyList(),
+        expectedObjArgs: List<Any?> = emptyList(),
+    ) {
+        val errors = mutableListOf<String>()
+
+        val size = stack.size
+        val isEmpty = stack.isEmpty()
+        val isNotEmpty = stack.isNotEmpty()
+        if (size != expectedOperations.size) {
+            errors +=
+                "Stack did not report correct size " +
+                    "(expected ${expectedOperations.size}, was $size)"
+        }
+
+        if (isEmpty != expectedOperations.isEmpty()) {
+            errors +=
+                "isEmpty() did not return expected value " +
+                    "(expected ${expectedOperations.isEmpty()}, was $isEmpty)"
+        }
+
+        if (isNotEmpty != expectedOperations.isNotEmpty()) {
+            errors +=
+                "isNotEmpty() did not return expected value " +
+                    "(expected ${expectedOperations.isNotEmpty()}, was $isNotEmpty)"
+        }
+
+        val actualOpCodes = stack.opCodes
+        if (!actualOpCodes.asIterable().startsWith(expectedOperations)) {
+            errors +=
+                "opCodes array did not match expected operations " +
+                    "(expected [${expectedOperations.joinToString()}], was " +
+                    "[${actualOpCodes.joinToString()}])"
+        }
+
+        val actualIntArgs = stack.intArgs
+        if (!actualIntArgs.asIterable().startsWith(expectedIntArgs)) {
+            errors +=
+                "intArgs array did not match expected operations " +
+                    "(expected [${expectedIntArgs.joinToString()}], was " +
+                    "[${actualIntArgs.joinToString()}])"
+        }
+
+        val actualObjectArgs = stack.objectArgs
+        if (!actualObjectArgs.asIterable().startsWith(expectedObjArgs, null)) {
+            errors +=
+                "objectArgs array did not match expected operations " +
+                    "(expected [${expectedObjArgs.joinToString()}], was " +
+                    "[${actualObjectArgs.joinToString()}])"
+        }
+
+        if (errors.isNotEmpty()) {
+            fail(
+                message.takeIf { it.isNotBlank() }?.let { "$it\n" }.orEmpty() +
+                    "Failed with the following validation errors:" +
+                    errors.joinToString { "\n    - $it" }
+            )
+        }
+    }
+
+    private fun <T> Iterable<T>.startsWith(other: Iterable<T>): Boolean {
+        val thisIterator = iterator()
+        val otherIterator = other.iterator()
+
+        while (otherIterator.hasNext()) {
+            if (!thisIterator.hasNext() || thisIterator.next() != otherIterator.next()) {
+                return false
+            }
+        }
+
+        return true
+    }
+
+    private fun <T> Iterable<T>.startsWith(other: Iterable<T>, endFill: T): Boolean {
+        val thisIterator = iterator()
+        val otherIterator = other.iterator()
+
+        while (otherIterator.hasNext()) {
+            if (!thisIterator.hasNext() || thisIterator.next() != otherIterator.next()) {
+                return false
+            }
+        }
+
+        while (thisIterator.hasNext()) {
+            if (thisIterator.next() != endFill) {
+                return false
+            }
+        }
+
+        return true
+    }
+
+    @Suppress("EXTENSION_SHADOWED_BY_MEMBER")
+    private val Operations.opCodes: Array<Operation?>
+        get() = readPropertyReflectively("opCodes")
+
+    @Suppress("EXTENSION_SHADOWED_BY_MEMBER")
+    private val Operations.intArgs: IntArray
+        get() = readPropertyReflectively("intArgs")
+
+    @Suppress("EXTENSION_SHADOWED_BY_MEMBER")
+    private val Operations.objectArgs: Array<Any?>
+        get() = readPropertyReflectively("objectArgs")
+
+    private inline fun <reified T : Any, reified R> T.readPropertyReflectively(
+        propertyName: String
+    ): R {
+        val property =
+            this::class
+                .declaredMembers
+                .mapNotNull {
+                    @Suppress("UNCHECKED_CAST")
+                    it as? KProperty1<T, R>
+                }
+                .single { it.name == propertyName }
+
+        property.isAccessible = true
+        return property.get(this)
+    }
+}

From 5d09d27b45924540e52579524e7c6011babf7169 Mon Sep 17 00:00:00 2001
From: Michal Idzkowski <idzkowski@google.com>
Date: Thu, 15 Jan 2026 09:41:33 -0500
Subject: [PATCH 07/12] Adds Projected-testing XR library

Bug: 474095550
Test: Presubmit
Relnote: n/a
Change-Id: I9fba6e9e2b1d748b68e2617c192dad2a3d13d225
---
 docs-tip-of-tree/build.gradle                 |  1 +
 settings.gradle                               |  1 +
 .../projected-testing/api/current.txt         |  1 +
 .../projected-testing/api/res-current.txt     |  0
 .../api/restricted_current.txt                |  1 +
 xr/projected/projected-testing/build.gradle   | 44 +++++++++++++++++++
 6 files changed, 48 insertions(+)
 create mode 100644 xr/projected/projected-testing/api/current.txt
 create mode 100644 xr/projected/projected-testing/api/res-current.txt
 create mode 100644 xr/projected/projected-testing/api/restricted_current.txt
 create mode 100644 xr/projected/projected-testing/build.gradle

diff --git a/docs-tip-of-tree/build.gradle b/docs-tip-of-tree/build.gradle
index b66ffac86a65b..85abf07f7f065 100644
--- a/docs-tip-of-tree/build.gradle
+++ b/docs-tip-of-tree/build.gradle
@@ -418,6 +418,7 @@ dependencies {
     docs(project(":work:work-testing"))
     docs(project(":xr:projected:projected"))
     docs(project(":xr:projected:projected-binding"))
+    docs(project(":xr:projected:projected-testing"))
     docs(project(":xr:arcore:arcore"))
     docs(project(":xr:arcore:arcore-guava"))
     docs(project(":xr:arcore:arcore-openxr"))
diff --git a/settings.gradle b/settings.gradle
index 2f2b448cab994..348586cd93947 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1242,6 +1242,7 @@ includeProject(":xr:glimmer:test-utils", [BuildType.XR, BuildType.COMPOSE])
 includeProject(":xr:projected:projected", [BuildType.XR])
 includeProject(":xr:projected:integration-tests:testapp", [BuildType.XR])
 includeProject(":xr:projected:projected-binding", [BuildType.XR])
+includeProject(":xr:projected:projected-testing", [BuildType.XR])
 includeProject(":xr:runtime:runtime", [BuildType.XR])
 includeProject(":xr:runtime:runtime-manifest", [BuildType.XR])
 includeProject(":xr:runtime:runtime-rxjava3", [BuildType.XR])
diff --git a/xr/projected/projected-testing/api/current.txt b/xr/projected/projected-testing/api/current.txt
new file mode 100644
index 0000000000000..e6f50d0d0fd11
--- /dev/null
+++ b/xr/projected/projected-testing/api/current.txt
@@ -0,0 +1 @@
+// Signature format: 4.0
diff --git a/xr/projected/projected-testing/api/res-current.txt b/xr/projected/projected-testing/api/res-current.txt
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/xr/projected/projected-testing/api/restricted_current.txt b/xr/projected/projected-testing/api/restricted_current.txt
new file mode 100644
index 0000000000000..e6f50d0d0fd11
--- /dev/null
+++ b/xr/projected/projected-testing/api/restricted_current.txt
@@ -0,0 +1 @@
+// Signature format: 4.0
diff --git a/xr/projected/projected-testing/build.gradle b/xr/projected/projected-testing/build.gradle
new file mode 100644
index 0000000000000..62efbdd988838
--- /dev/null
+++ b/xr/projected/projected-testing/build.gradle
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2026 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * This file was created using the `create_project.py` script located in the
+ * `<AndroidX root>/development/project-creator` directory.
+ *
+ * Please use that script when creating a new project, rather than copying an existing project and
+ * modifying its settings.
+ */
+import androidx.build.SoftwareType
+
+plugins {
+    id("AndroidXPlugin")
+    id("com.android.library")
+}
+
+dependencies {
+    // Add dependencies here
+}
+
+android {
+    namespace = "androidx.xr.projected.testing"
+}
+
+androidx {
+    name = "XR Projected Testing"
+    type = SoftwareType.PUBLISHED_TEST_LIBRARY
+    inceptionYear = "2026"
+    description = "Libraries to aid in unit testing Projected clients."
+}

From 5a6410a561cdf50859f003a3f37424537f806ab5 Mon Sep 17 00:00:00 2001
From: Rahul Ravikumar <rahulrav@google.com>
Date: Wed, 14 Jan 2026 15:29:04 -0800
Subject: [PATCH 08/12] Keep the version of tracing-perfetto used by
 compose-runtime-tracing in sync with the version being provisioned by
 Benchmark.

* The app expected `1.0.0`, but benchmark provided `1.0.1`.
* This situation should get better once we switch to using Tracing 2.0.0.

Test: TrivialPerfettoSdkBenchmark now passes.
Fixes: 464447859
Change-Id: Id8543b170b5c41e118f26f5fa903502be48dcaa1
---
 .../main/java/androidx/benchmark/perfetto/PerfettoCapture.kt | 5 ++++-
 compose/runtime/runtime-tracing/build.gradle                 | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/benchmark/benchmark-common/src/main/java/androidx/benchmark/perfetto/PerfettoCapture.kt b/benchmark/benchmark-common/src/main/java/androidx/benchmark/perfetto/PerfettoCapture.kt
index fad023a405526..8f7209d2b5476 100644
--- a/benchmark/benchmark-common/src/main/java/androidx/benchmark/perfetto/PerfettoCapture.kt
+++ b/benchmark/benchmark-common/src/main/java/androidx/benchmark/perfetto/PerfettoCapture.kt
@@ -18,16 +18,17 @@ package androidx.benchmark.perfetto
 
 import android.os.Build
 import android.util.JsonReader
+import android.util.Log
 import androidx.annotation.CheckResult
 import androidx.annotation.RequiresApi
 import androidx.annotation.RestrictTo
+import androidx.benchmark.BenchmarkState
 import androidx.benchmark.Outputs
 import androidx.benchmark.Shell
 import androidx.benchmark.ShellFile
 import androidx.benchmark.UserFile
 import androidx.benchmark.UserInfo
 import androidx.benchmark.inMemoryTrace
-import androidx.benchmark.perfetto.PerfettoCapture.PerfettoSdkConfig.InitialProcessState
 import androidx.benchmark.perfetto.PerfettoHelper.Companion.isAbiSupported
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.tracing.perfetto.handshake.PerfettoSdkHandshake
@@ -124,6 +125,7 @@ public class PerfettoCapture(
             PerfettoSdkHandshake(
                 targetPackage = targetPackage,
                 parseJsonMap = { jsonString: String ->
+                    Log.d(BenchmarkState.TAG, "Handshake Result: $jsonString")
                     sequence {
                             JsonReader(StringReader(jsonString)).use { reader ->
                                 reader.beginObject()
@@ -136,6 +138,7 @@ public class PerfettoCapture(
                         .toMap()
                 },
                 executeShellCommand = { cmd ->
+                    Log.d(BenchmarkState.TAG, "Executing Command: $cmd")
                     val (stdout, stderr) = Shell.executeScriptCaptureStdoutStderr(cmd)
                     listOf(stdout, stderr)
                         .filter { it.isNotBlank() }
diff --git a/compose/runtime/runtime-tracing/build.gradle b/compose/runtime/runtime-tracing/build.gradle
index 8305ef2bdd796..5b8e334efbfb5 100644
--- a/compose/runtime/runtime-tracing/build.gradle
+++ b/compose/runtime/runtime-tracing/build.gradle
@@ -36,7 +36,8 @@ android {
 dependencies {
     api("androidx.annotation:annotation:1.8.1")
     implementation("androidx.compose.runtime:runtime:1.3.3")
-    implementation("androidx.tracing:tracing-perfetto:1.0.0")
+    // Keep the versions of tracing-perfetto used by Benchmark and Runtime Tracing in sync.
+    implementation("androidx.tracing:tracing-perfetto:1.0.1")
     implementation("androidx.startup:startup-runtime:1.1.1")
     androidTestImplementation(libs.testExtJunit)
     androidTestImplementation(libs.testRunner)

From eff64a23b6f2c348ddbcbea2073508f87db17a6a Mon Sep 17 00:00:00 2001
From: Rahul Ravikumar <rahulrav@google.com>
Date: Thu, 15 Jan 2026 13:08:10 -0800
Subject: [PATCH 09/12] Stop dropping trace packets.

* This is not safe to do given we might end up dropping a trace packet when ending a trace section.
* We fallback to allocations here to gracefully recover.

Test: Ignored the dropped event tests. All other unit tests pass.
Change-Id: Iefa0cebf7d2ad34d02ba53881da48b4d80e5d9fa
---
 .../kotlin/androidx/tracing/wire/TracingTest.kt            | 2 ++
 tracing/tracing/api/restricted_current.txt                 | 2 +-
 .../commonMain/kotlin/androidx/tracing/EventMetadata.kt    | 4 ++--
 .../tracing/src/commonMain/kotlin/androidx/tracing/Pool.kt | 7 +++++--
 .../src/commonMain/kotlin/androidx/tracing/ProtoPool.kt    | 2 +-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/tracing/tracing-wire/src/desktopTest/kotlin/androidx/tracing/wire/TracingTest.kt b/tracing/tracing-wire/src/desktopTest/kotlin/androidx/tracing/wire/TracingTest.kt
index ceabeb99c29f3..57609c5d193d1 100644
--- a/tracing/tracing-wire/src/desktopTest/kotlin/androidx/tracing/wire/TracingTest.kt
+++ b/tracing/tracing-wire/src/desktopTest/kotlin/androidx/tracing/wire/TracingTest.kt
@@ -23,6 +23,7 @@ import androidx.tracing.TRACE_PACKET_POOL_ARRAY_POOL_SIZE
 import androidx.tracing.TraceDriver
 import androidx.tracing.TraceSink
 import androidx.tracing.Tracer
+import kotlin.test.Ignore
 import kotlin.test.Test
 import kotlin.test.assertContains
 import kotlin.test.assertContentEquals
@@ -241,6 +242,7 @@ class TracingTest {
     }
 
     @Test
+    @Ignore("We no longer drop trace packets like we used to.")
     @Suppress("DEPRECATION")
     internal fun testDroppedPackets() {
         val dispatcher = StandardTestDispatcher()
diff --git a/tracing/tracing/api/restricted_current.txt b/tracing/tracing/api/restricted_current.txt
index fb6e6682ac4fb..d551426e95347 100644
--- a/tracing/tracing/api/restricted_current.txt
+++ b/tracing/tracing/api/restricted_current.txt
@@ -130,7 +130,7 @@ package androidx.tracing {
 
   @kotlin.PublishedApi internal final class ProtoPool {
     ctor public ProtoPool(boolean isDebug);
-    method public androidx.tracing.PooledTracePacketArray? obtainTracePacketArray();
+    method public androidx.tracing.PooledTracePacketArray obtainTracePacketArray();
     method public long poolableCount();
   }
 
diff --git a/tracing/tracing/src/commonMain/kotlin/androidx/tracing/EventMetadata.kt b/tracing/tracing/src/commonMain/kotlin/androidx/tracing/EventMetadata.kt
index 2e27d1971c87d..3ea860e485622 100644
--- a/tracing/tracing/src/commonMain/kotlin/androidx/tracing/EventMetadata.kt
+++ b/tracing/tracing/src/commonMain/kotlin/androidx/tracing/EventMetadata.kt
@@ -40,8 +40,8 @@ public abstract class EventMetadata internal constructor() {
     /**
      * Adds additional categories to the [TraceEvent].
      *
-     * This is useful in the when an application is interested in a subset of [TraceEvent]s that
-     * belong to well known categories. These are typically small identifiers useful for namespacing
+     * This is useful when an application is interested in a subset of [TraceEvent]s that belong to
+     * well known categories. These are typically small identifiers useful for namespacing
      * [TraceEvent]s.
      */
     public abstract fun addCategory(name: String)
diff --git a/tracing/tracing/src/commonMain/kotlin/androidx/tracing/Pool.kt b/tracing/tracing/src/commonMain/kotlin/androidx/tracing/Pool.kt
index 8a271f98fca5a..0a87befb927c2 100644
--- a/tracing/tracing/src/commonMain/kotlin/androidx/tracing/Pool.kt
+++ b/tracing/tracing/src/commonMain/kotlin/androidx/tracing/Pool.kt
@@ -47,8 +47,11 @@ internal class Pool<T>(
     }
 
     /** Obtain an instance of the object from the pool if possible. */
-    internal fun obtain(): T? {
-        val element = scrapPool.removeFirstOrNull()
+    internal fun obtain(): T {
+        // Fallback to allocations when the scrap pool is empty.
+        // It's not safe to drop trace packets the way given we might drop the packet which
+        // represents ending the trace section. This will result in unmatched begin and ends.
+        val element = scrapPool.removeFirstOrNull() ?: factory(this)
         if (isDebug && element != null) {
             counter?.incrementAndGet()
         }
diff --git a/tracing/tracing/src/commonMain/kotlin/androidx/tracing/ProtoPool.kt b/tracing/tracing/src/commonMain/kotlin/androidx/tracing/ProtoPool.kt
index fbd534ef03069..cd99de1602a29 100644
--- a/tracing/tracing/src/commonMain/kotlin/androidx/tracing/ProtoPool.kt
+++ b/tracing/tracing/src/commonMain/kotlin/androidx/tracing/ProtoPool.kt
@@ -43,7 +43,7 @@ internal class ProtoPool(internal val isDebug: Boolean) {
             )
         }
 
-    fun obtainTracePacketArray(): PooledTracePacketArray? {
+    fun obtainTracePacketArray(): PooledTracePacketArray {
         return tracePacketArrayPool.obtain()
     }
 

From 1e94acb6d41eb73e79ed157273be8a4f20e6a9cb Mon Sep 17 00:00:00 2001
From: Alec Garcia <alecgarcia@google.com>
Date: Thu, 15 Jan 2026 13:56:21 -0800
Subject: [PATCH 10/12] Add alecgarcia@ to security-state OWNERS

Change-Id: I299590bde7e22c144abb79eb2f6377488df3cf53
---
 security/security-state/OWNERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/security/security-state/OWNERS b/security/security-state/OWNERS
index 68166b1f86711..3105c00f6fd8c 100644
--- a/security/security-state/OWNERS
+++ b/security/security-state/OWNERS
@@ -3,3 +3,4 @@ musashi@google.com
 maunik@google.com
 alxu@google.com
 willcoster@google.com
+alecgarcia@google.com

From cbe576a4d11f1a7c6969138ebc13510ade27f31e Mon Sep 17 00:00:00 2001
From: EthanWu <ethanphwu@google.com>
Date: Mon, 5 Jan 2026 09:59:49 +0800
Subject: [PATCH 11/12] Fix(XrExtensions): Use isEqualTo for object comparison
 after package migration

This commit updates XrExtensions' object comparison logic following the
package name migration.

Due to `com.android.extensions.xr.*` objects now acting as wrappers for
`android.extensions.xr.*` objects, `isSameInstanceAs` is no longer
reliable. Two distinct wrapper instances can represent the same underlying
object.

Comparison must now use `isEqualTo` (which calls the wrapped object's
`equals()` method) to correctly determine if two wrapper objects refer to the same underlying entity.

Bug: 475752776
Test: Presubmit

Change-Id: Ia258fb005d494941227beadaa100d65d4b3ab1a5
---
 .../java/androidx/xr/scenecore/spatial/core/MediaUtilsTest.java | 2 +-
 .../spatial/rendering/SpatialEnvironmentFeatureImplTest.kt      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xr/scenecore/scenecore-spatial-core/src/test/java/androidx/xr/scenecore/spatial/core/MediaUtilsTest.java b/xr/scenecore/scenecore-spatial-core/src/test/java/androidx/xr/scenecore/spatial/core/MediaUtilsTest.java
index a51ae1be817c4..df4276823a446 100644
--- a/xr/scenecore/scenecore-spatial-core/src/test/java/androidx/xr/scenecore/spatial/core/MediaUtilsTest.java
+++ b/xr/scenecore/scenecore-spatial-core/src/test/java/androidx/xr/scenecore/spatial/core/MediaUtilsTest.java
@@ -50,7 +50,7 @@ public void convertPointSourceParams_returnsExtensionsParams() {
         com.android.extensions.xr.media.PointSourceParams result =
                 MediaUtils.convertPointSourceParamsToExtensions(rtParams);
 
-        assertThat(result.getNode()).isSameInstanceAs(expected);
+        assertThat(result.getNode()).isEqualTo(expected);
     }
 
     @Test
diff --git a/xr/scenecore/scenecore-spatial-rendering/src/test/java/androidx/xr/scenecore/spatial/rendering/SpatialEnvironmentFeatureImplTest.kt b/xr/scenecore/scenecore-spatial-rendering/src/test/java/androidx/xr/scenecore/spatial/rendering/SpatialEnvironmentFeatureImplTest.kt
index 0efc5e367208a..7c15c43b00d7e 100644
--- a/xr/scenecore/scenecore-spatial-rendering/src/test/java/androidx/xr/scenecore/spatial/rendering/SpatialEnvironmentFeatureImplTest.kt
+++ b/xr/scenecore/scenecore-spatial-rendering/src/test/java/androidx/xr/scenecore/spatial/rendering/SpatialEnvironmentFeatureImplTest.kt
@@ -514,7 +514,7 @@ class SpatialEnvironmentFeatureImplTest {
         runUiThreadTasks()
         val secondEnvNode = ShadowXrExtensions.extract(xrExtensions).getEnvironmentNode(activity)
 
-        assertThat(secondEnvNode).isSameInstanceAs(firstEnvNode)
+        assertThat(secondEnvNode).isEqualTo(firstEnvNode)
     }
 
     @Test

From 6006321f7d30cd13ac52ec4e2a6e6bac37cbc232 Mon Sep 17 00:00:00 2001
From: EthanWu <ethanphwu@google.com>
Date: Mon, 5 Jan 2026 09:48:06 +0800
Subject: [PATCH 12/12] Fix: mBuilder was null due to not being initialized in
 AudioTrackExtensionsWrapperImplTest.

Fixed an issue where mBuilder was not initialized, causing it to be null.
This was discovered after a test case threw a null exception following an update to the XrExtensions fake runtime.

Bug: 475746834
Test: Presubmit

Change-Id: Ia60f31cea551f6c23ec798ae7895db1f459fb7f5
---
 .../spatial/core/AudioTrackExtensionsWrapperImplTest.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xr/scenecore/scenecore-spatial-core/src/test/java/androidx/xr/scenecore/spatial/core/AudioTrackExtensionsWrapperImplTest.java b/xr/scenecore/scenecore-spatial-core/src/test/java/androidx/xr/scenecore/spatial/core/AudioTrackExtensionsWrapperImplTest.java
index c75942f0151ec..bcdc31be55de5 100644
--- a/xr/scenecore/scenecore-spatial-core/src/test/java/androidx/xr/scenecore/spatial/core/AudioTrackExtensionsWrapperImplTest.java
+++ b/xr/scenecore/scenecore-spatial-core/src/test/java/androidx/xr/scenecore/spatial/core/AudioTrackExtensionsWrapperImplTest.java
@@ -39,7 +39,6 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
@@ -53,7 +52,7 @@ public class AudioTrackExtensionsWrapperImplTest {
 
     private EntityManager mEntityManager;
 
-    @Mock private AudioTrack.Builder mBuilder;
+    private AudioTrack.Builder mBuilder;
 
     @Before
     public void setUp() {
@@ -68,6 +67,7 @@ public void setUp() {
         ShadowAudioTrackExtensions.extract(mAudioTrackExtensions).setSoundFieldAttributes(null);
 
         mEntityManager = new EntityManager();
+        mBuilder = mock(AudioTrack.Builder.class);
     }
 
     @Test