diff --git a/appcompat/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatTextViewKotlinTests.kt b/appcompat/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatTextViewKotlinTests.kt
new file mode 100644
index 0000000..4795fc1
--- /dev/null
+++ b/appcompat/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatTextViewKotlinTests.kt
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2024 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.appcompat.widget
+
+import android.graphics.Typeface
+import android.widget.TextView
+import androidx.appcompat.test.R
+import androidx.test.filters.SdkSuppress
+import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.runBlocking
+import org.junit.Test
+
+// Note: the fact that this extends AppCompatBaseViewTest means that it will duplicate some tests
+// from AppCompatTextViewTest; however, it is few enough relatively lightweight tests that it
+// should be fine.
+class AppCompatTextViewKotlinTests :
+    AppCompatBaseViewTest<AppCompatTextViewActivity, AppCompatTextView>(
+        AppCompatTextViewActivity::class.java
+    ) {
+
+    @Test
+    fun setFontVariationSettings_sameSettings_doesNotCreateMultipleTypefaces() = runBlocking {
+        val textView1: AppCompatTextView =
+            mActivity.findViewById(R.id.textview_fontVariation_textView)
+        val textView2: AppCompatTextView =
+            mActivity.findViewById(R.id.textview_fontVariation_textView_2)
+        assertThat(textView1.typeface).isSameInstanceAs(textView2.typeface)
+    }
+
+    @Test
+    @SdkSuppress(minSdkVersion = 34)
+    fun getPaint_setTypeface_worksWith_setFontVariationSettings() =
+        runBlocking(Dispatchers.Main) {
+            // This is based on code that an app used that violates the contract of getPaint()
+            // (i.e., that you shouldn't change the values), but that we want to provide best-effort
+            // support for.
+            val textView: AppCompatTextView =
+                mActivity.findViewById(R.id.textview_fontresource_fontfamily_string_direct)
+            // We do the same thing to a normal TextView to ensure we're accurately mimicking
+            // platform behavior, which can be unintuitive (for example, setting the Typeface on
+            // Paint will *not* change the result of TextView's getTypeface(), despite it having
+            // changed).
+            val plainTextView = TextView(mActivity)
+            assertThat(textView.paint.typeface.systemFontFamilyName).isEqualTo("sans-serif")
+            assertThat(textView.typeface!!.systemFontFamilyName).isEqualTo("sans-serif")
+
+            // This is the thing the app did that caused the problem
+            textView.paint.typeface = Typeface.create("cursive", Typeface.NORMAL)
+            plainTextView.paint.typeface = Typeface.create("cursive", Typeface.NORMAL)
+
+            assertThat(textView.paint.typeface.systemFontFamilyName).isEqualTo("cursive")
+            assertThat(textView.typeface!!.systemFontFamilyName)
+                .isEqualTo(plainTextView.typeface!!.systemFontFamilyName)
+
+            // Perform the set, which needs to detect that it happened
+            assertThat(textView.setFontVariationSettings("'wght' 200")).isTrue()
+
+            assertThat(textView.paint.typeface.systemFontFamilyName).isEqualTo("cursive")
+            assertThat(textView.typeface!!.systemFontFamilyName)
+                .isEqualTo(plainTextView.typeface!!.systemFontFamilyName)
+        }
+}
diff --git a/appcompat/appcompat/src/androidTest/res/layout/appcompat_textview_activity.xml b/appcompat/appcompat/src/androidTest/res/layout/appcompat_textview_activity.xml
index 6b88361..0c571d6 100644
--- a/appcompat/appcompat/src/androidTest/res/layout/appcompat_textview_activity.xml
+++ b/appcompat/appcompat/src/androidTest/res/layout/appcompat_textview_activity.xml
@@ -387,6 +387,14 @@
             app:fontVariationSettings="'wght' 200"/>
 
         <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/textview_fontVariation_textView_2"
+            android:text="B"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/variable_font"
+            app:fontVariationSettings="'wght' 200"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/textview_fontVariation_textAppearance"
             android:text="A"
             android:layout_width="match_parent"
diff --git a/benchmark/baseline-profile-gradle-plugin/lint-baseline.xml b/benchmark/baseline-profile-gradle-plugin/lint-baseline.xml
index 65975e0..d8fe4cd 100644
--- a/benchmark/baseline-profile-gradle-plugin/lint-baseline.xml
+++ b/benchmark/baseline-profile-gradle-plugin/lint-baseline.xml
@@ -4,69 +4,6 @@
     <issue
         id="GradleProjectIsolation"
         message="Use providers.gradleProperty instead of getProperties"
-        errorLine1="        project.properties[&quot;androidx.benchmark.test.maxagpversion&quot;]?.let { str ->"
-        errorLine2="                ~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/androidx/baselineprofile/gradle/utils/AgpPlugin.kt"/>
-    </issue>
-
-    <issue
-        id="GradleProjectIsolation"
-        message="Use providers.gradleProperty instead of getProperties"
-        errorLine1="        it in project.properties &amp;&amp; project.properties[it].toString().toBoolean()"
-        errorLine2="                      ~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/androidx/baselineprofile/gradle/utils/AgpPlugin.kt"/>
-    </issue>
-
-    <issue
-        id="GradleProjectIsolation"
-        message="Use providers.gradleProperty instead of getProperties"
-        errorLine1="        it in project.properties &amp;&amp; project.properties[it].toString().toBoolean()"
-        errorLine2="                                            ~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/androidx/baselineprofile/gradle/utils/AgpPlugin.kt"/>
-    </issue>
-
-    <issue
-        id="GradleProjectIsolation"
-        message="Use providers.gradleProperty instead of getProperties"
-        errorLine1="        project.properties.containsKey(PROP_SKIP_GENERATION)"
-        errorLine2="                ~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/androidx/baselineprofile/gradle/producer/BaselineProfileProducerPlugin.kt"/>
-    </issue>
-
-    <issue
-        id="GradleProjectIsolation"
-        message="Use providers.gradleProperty instead of getProperties"
-        errorLine1="        project.properties.containsKey(PROP_FORCE_ONLY_CONNECTED_DEVICES)"
-        errorLine2="                ~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/androidx/baselineprofile/gradle/producer/BaselineProfileProducerPlugin.kt"/>
-    </issue>
-
-    <issue
-        id="GradleProjectIsolation"
-        message="Use providers.gradleProperty instead of getProperties"
-        errorLine1="        !project.properties.containsKey(PROP_DONT_DISABLE_RULES)"
-        errorLine2="                 ~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/androidx/baselineprofile/gradle/producer/BaselineProfileProducerPlugin.kt"/>
-    </issue>
-
-    <issue
-        id="GradleProjectIsolation"
-        message="Use providers.gradleProperty instead of getProperties"
-        errorLine1="        !project.properties.containsKey(PROP_SEND_TARGET_PACKAGE_NAME)"
-        errorLine2="                 ~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/androidx/baselineprofile/gradle/producer/BaselineProfileProducerPlugin.kt"/>
-    </issue>
-
-    <issue
-        id="GradleProjectIsolation"
-        message="Use providers.gradleProperty instead of getProperties"
         errorLine1="                    project.properties.filterKeys { k ->"
         errorLine2="                            ~~~~~~~~~~">
         <location
diff --git a/benchmark/baseline-profile-gradle-plugin/src/main/kotlin/androidx/baselineprofile/gradle/producer/BaselineProfileProducerPlugin.kt b/benchmark/baseline-profile-gradle-plugin/src/main/kotlin/androidx/baselineprofile/gradle/producer/BaselineProfileProducerPlugin.kt
index 239eff6..aa184ec 100644
--- a/benchmark/baseline-profile-gradle-plugin/src/main/kotlin/androidx/baselineprofile/gradle/producer/BaselineProfileProducerPlugin.kt
+++ b/benchmark/baseline-profile-gradle-plugin/src/main/kotlin/androidx/baselineprofile/gradle/producer/BaselineProfileProducerPlugin.kt
@@ -79,16 +79,16 @@
     private val baselineProfileExtension = BaselineProfileProducerExtension.register(project)
     private val configurationManager = ConfigurationManager(project)
     private val shouldSkipGeneration by lazy {
-        project.properties.containsKey(PROP_SKIP_GENERATION)
+        project.providers.gradleProperty(PROP_SKIP_GENERATION).isPresent
     }
     private val forceOnlyConnectedDevices: Boolean by lazy {
-        project.properties.containsKey(PROP_FORCE_ONLY_CONNECTED_DEVICES)
+        project.providers.gradleProperty(PROP_FORCE_ONLY_CONNECTED_DEVICES).isPresent
     }
     private val addEnabledRulesInstrumentationArgument by lazy {
-        !project.properties.containsKey(PROP_DONT_DISABLE_RULES)
+        !project.providers.gradleProperty(PROP_DONT_DISABLE_RULES).isPresent
     }
     private val addTargetPackageNameInstrumentationArgument by lazy {
-        !project.properties.containsKey(PROP_SEND_TARGET_PACKAGE_NAME)
+        !project.providers.gradleProperty(PROP_SEND_TARGET_PACKAGE_NAME).isPresent
     }
 
     // This maps all the extended build types to the original ones. Note that release does not
diff --git a/benchmark/baseline-profile-gradle-plugin/src/main/kotlin/androidx/baselineprofile/gradle/utils/AgpPlugin.kt b/benchmark/baseline-profile-gradle-plugin/src/main/kotlin/androidx/baselineprofile/gradle/utils/AgpPlugin.kt
index cbd7fa7..29f7c75 100644
--- a/benchmark/baseline-profile-gradle-plugin/src/main/kotlin/androidx/baselineprofile/gradle/utils/AgpPlugin.kt
+++ b/benchmark/baseline-profile-gradle-plugin/src/main/kotlin/androidx/baselineprofile/gradle/utils/AgpPlugin.kt
@@ -51,8 +51,9 @@
 
     // Properties that can be specified by cmd line using -P<property_name> when invoking gradle.
     val testMaxAgpVersion by lazy {
-        project.properties["androidx.benchmark.test.maxagpversion"]?.let { str ->
-            val parts = str.toString().split(".").map { it.toInt() }
+        project.providers.gradleProperty("androidx.benchmark.test.maxagpversion").orNull?.let { str
+            ->
+            val parts = str.split(".").map { it.toInt() }
             return@lazy AndroidPluginVersion(parts[0], parts[1], parts[2])
         } ?: return@lazy null
     }
diff --git a/benchmark/benchmark-darwin-gradle-plugin/lint-baseline.xml b/benchmark/benchmark-darwin-gradle-plugin/lint-baseline.xml
index 9ce75c2..42b07bb 100644
--- a/benchmark/benchmark-darwin-gradle-plugin/lint-baseline.xml
+++ b/benchmark/benchmark-darwin-gradle-plugin/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
+<issues format="6" by="lint 8.7.0-alpha02" type="baseline" client="gradle" dependencies="false" name="AGP (8.7.0-alpha02)" variant="all" version="8.7.0-alpha02">
 
     <issue
         id="GradleProjectIsolation"
@@ -11,6 +11,15 @@
     </issue>
 
     <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="                            project.rootProject.projectDir, // frameworks/support"
+        errorLine2="                                    ~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/androidx/benchmark/darwin/gradle/DarwinBenchmarkPlugin.kt"/>
+    </issue>
+
+    <issue
         id="WithTypeWithoutConfigureEach"
         message="Avoid passing a closure to withType, use withType().configureEach instead"
         errorLine1="        project.plugins.withType(KotlinMultiplatformPluginWrapper::class.java) {"
diff --git a/benchmark/benchmark-junit4/proguard-rules.pro b/benchmark/benchmark-junit4/proguard-rules.pro
index 544c831..621d897 100644
--- a/benchmark/benchmark-junit4/proguard-rules.pro
+++ b/benchmark/benchmark-junit4/proguard-rules.pro
@@ -18,6 +18,7 @@
 
 ## needed for listeners instantiated by reflection (e.g. InstrumentationResultsRunListener)
 -keepclasseswithmembers class * extends androidx.test.internal.runner.listener.InstrumentationRunListener { *; }
+-keepclasseswithmembers class * extends org.junit.runner.notification.RunListener { *; }
 
 ## Needed due to b/328649293 - shouldn't be needed since they're ref'd by manifest
 ## May need to leave these in place long term to account for old gradle versions
diff --git a/benchmark/gradle-plugin/lint-baseline.xml b/benchmark/gradle-plugin/lint-baseline.xml
index 4363bf5..8c91fdc 100644
--- a/benchmark/gradle-plugin/lint-baseline.xml
+++ b/benchmark/gradle-plugin/lint-baseline.xml
@@ -3,27 +3,36 @@
 
     <issue
         id="GradleProjectIsolation"
-        message="Use providers.gradleProperty instead of findProperty"
-        errorLine1="            if (!project.findProperty(ADDITIONAL_TEST_OUTPUT_KEY).toString().toBoolean()) {"
-        errorLine2="                         ~~~~~~~~~~~~">
+        message="Avoid using method getRootProject"
+        errorLine1="        if (!project.rootProject.tasks.exists(&quot;lockClocks&quot;)) {"
+        errorLine2="                     ~~~~~~~~~~~">
         <location
             file="src/main/kotlin/androidx/benchmark/gradle/BenchmarkPlugin.kt"/>
     </issue>
 
     <issue
         id="GradleProjectIsolation"
-        message="Use providers.gradleProperty instead of findProperty"
-        errorLine1="                    project.findProperty(&quot;androidx.benchmark.lockClocks.cores&quot;)?.toString() ?: &quot;&quot;"
-        errorLine2="                            ~~~~~~~~~~~~">
+        message="Avoid using method getRootProject"
+        errorLine1="            project.rootProject.tasks.register(&quot;lockClocks&quot;, LockClocksTask::class.java).configure {"
+        errorLine2="                    ~~~~~~~~~~~">
         <location
             file="src/main/kotlin/androidx/benchmark/gradle/BenchmarkPlugin.kt"/>
     </issue>
 
     <issue
         id="GradleProjectIsolation"
-        message="Use providers.gradleProperty instead of getProperties"
-        errorLine1="                if (!project.properties[ADDITIONAL_TEST_OUTPUT_KEY].toString().toBoolean()) {"
-        errorLine2="                             ~~~~~~~~~~">
+        message="Avoid using method getRootProject"
+        errorLine1="        if (!project.rootProject.tasks.exists(&quot;unlockClocks&quot;)) {"
+        errorLine2="                     ~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/androidx/benchmark/gradle/BenchmarkPlugin.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="            project.rootProject.tasks"
+        errorLine2="                    ~~~~~~~~~~~">
         <location
             file="src/main/kotlin/androidx/benchmark/gradle/BenchmarkPlugin.kt"/>
     </issue>
diff --git a/benchmark/gradle-plugin/src/main/kotlin/androidx/benchmark/gradle/BenchmarkPlugin.kt b/benchmark/gradle-plugin/src/main/kotlin/androidx/benchmark/gradle/BenchmarkPlugin.kt
index a7bd8e3..8b2eb89 100644
--- a/benchmark/gradle-plugin/src/main/kotlin/androidx/benchmark/gradle/BenchmarkPlugin.kt
+++ b/benchmark/gradle-plugin/src/main/kotlin/androidx/benchmark/gradle/BenchmarkPlugin.kt
@@ -101,14 +101,19 @@
         extension.buildTypes.named(testBuildType).configure { it.isDefault = true }
 
         if (
-            !project.rootProject.hasProperty("android.injected.invoked.from.ide") &&
+            !project.providers.gradleProperty("android.injected.invoked.from.ide").isPresent &&
                 !testInstrumentationArgs.containsKey("androidx.benchmark.output.enable")
         ) {
             // NOTE: This argument is checked by ResultWriter to enable CI reports.
             defaultConfig.testInstrumentationRunnerArguments["androidx.benchmark.output.enable"] =
                 "true"
 
-            if (!project.findProperty(ADDITIONAL_TEST_OUTPUT_KEY).toString().toBoolean()) {
+            if (
+                !project.providers
+                    .gradleProperty(ADDITIONAL_TEST_OUTPUT_KEY)
+                    .getOrElse("false")
+                    .toBoolean()
+            ) {
                 defaultConfig.testInstrumentationRunnerArguments["no-isolated-storage"] = "1"
             }
         }
@@ -119,7 +124,9 @@
             project.rootProject.tasks.register("lockClocks", LockClocksTask::class.java).configure {
                 it.adbPath.set(adbPathProvider)
                 it.coresArg.set(
-                    project.findProperty("androidx.benchmark.lockClocks.cores")?.toString() ?: ""
+                    project.providers
+                        .gradleProperty("androidx.benchmark.lockClocks.cores")
+                        .orElse("")
                 )
             }
         }
@@ -159,7 +166,12 @@
                     project.layout.buildDirectory.dir(
                         "outputs/connected_android_test_additional_output"
                     )
-                if (!project.properties[ADDITIONAL_TEST_OUTPUT_KEY].toString().toBoolean()) {
+                if (
+                    !project.providers
+                        .gradleProperty(ADDITIONAL_TEST_OUTPUT_KEY)
+                        .getOrElse("false")
+                        .toBoolean()
+                ) {
                     // Only enable pulling benchmark data through this plugin on older versions of
                     // AGP that do not yet enable this flag.
                     project.tasks
diff --git a/buildSrc-tests/lint-baseline.xml b/buildSrc-tests/lint-baseline.xml
index 235650f..656e12c 100644
--- a/buildSrc-tests/lint-baseline.xml
+++ b/buildSrc-tests/lint-baseline.xml
@@ -138,6 +138,69 @@
 
     <issue
         id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="            val extensions = project.rootProject.extensions"
+        errorLine2="                                     ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/dependencyTracker/AffectedModuleDetector.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="                val compilerProject = project.rootProject.resolveProject(&quot;:compose&quot;)"
+        errorLine2="                                              ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/AndroidXComposeImplPlugin.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="            project.rootProject.tasks.named(zipComposeMetricsTaskName).configure { zipTask ->"
+        errorLine2="                    ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/AndroidXComposeImplPlugin.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="            project.rootProject.tasks.named(zipComposeReportsTaskName).configure { zipTask ->"
+        errorLine2="                    ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/AndroidXComposeImplPlugin.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="    return project.rootProject.layout.buildDirectory"
+        errorLine2="                   ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/AndroidXComposeImplPlugin.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="    return project.rootProject.layout.buildDirectory"
+        errorLine2="                   ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/AndroidXComposeImplPlugin.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="    return File(rootProject.projectDir, &quot;../../external&quot;).canonicalFile"
+        errorLine2="                ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*3}/androidx/build/AndroidXConfig.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
         message="Use providers.gradleProperty instead of getProperties"
         errorLine1="    for (propertyName in project.properties.keys) {"
         errorLine2="                                 ~~~~~~~~~~">
@@ -147,11 +210,146 @@
 
     <issue
         id="GradleProjectIsolation"
-        message="Use providers.gradleProperty instead of getProperties"
-        errorLine1="        if (properties.containsKey(&quot;android.injected.invoked.from.ide&quot;)) {"
-        errorLine2="            ~~~~~~~~~~">
+        message="Avoid using method getRootProject"
+        errorLine1="                        AndroidXPlaygroundRootImplPlugin.projectOrArtifact(rootProject, this)"
+        errorLine2="                                                                           ~~~~~~~~~~~">
         <location
-            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/AndroidXRootImplPlugin.kt"/>
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/AndroidXImplPlugin.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="        project.rootProject.tasks.named(&quot;createModuleInfo&quot;).configure {"
+        errorLine2="                ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/AndroidXImplPlugin.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method findProject"
+        errorLine1="                    allProjectsExist || findProject(otherGradlePath) != null"
+        errorLine2="                                        ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/AndroidXImplPlugin.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="                    project.rootProject.rootDir == project.getSupportRootFolder()"
+        errorLine2="                            ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/AndroidXImplPlugin.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="    rootProject.extensions.findByType&lt;NodeJsRootExtension>()?.version = getVersionByName(&quot;node&quot;)"
+        errorLine2="    ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/AndroidXMultiplatformExtension.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="    rootProject.extensions.findByType(YarnRootExtension::class.java)?.let {"
+        errorLine2="    ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/AndroidXMultiplatformExtension.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="        rootProject.tasks.register(&quot;createYarnRcFile&quot;, CreateYarnRcFileTask::class.java) {"
+        errorLine2="        ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/AndroidXMultiplatformExtension.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="            it.yarnrcFile.set(rootProject.layout.buildDirectory.file(&quot;js/.yarnrc&quot;))"
+        errorLine2="                              ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/AndroidXMultiplatformExtension.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="    rootProject.tasks.withType&lt;KotlinNpmInstallTask>().configureEach {"
+        errorLine2="    ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/AndroidXMultiplatformExtension.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method findProject"
+        errorLine1="            val requested = rootProject.findProject(path)"
+        errorLine2="                                        ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/AndroidXPlaygroundRootImplPlugin.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="                project.rootProject.tasks.named(NAME).configure { it.dependsOn(task) }"
+        errorLine2="                        ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/AndroidXPlaygroundRootImplPlugin.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="    rootProject.layout.buildDirectory.dir(&quot;test-xml-configs&quot;)"
+        errorLine2="    ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*3}/androidx/build/BuildServerConfiguration.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="    rootProject.layout.buildDirectory.dir(&quot;privacysandbox-files&quot;)"
+        errorLine2="    ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*3}/androidx/build/BuildServerConfiguration.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="    val actualRootProject = if (project.isRoot) project else project.rootProject"
+        errorLine2="                                                                     ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*3}/androidx/build/BuildServerConfiguration.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="    rootProject.tasks.named(CREATE_AGGREGATE_BUILD_INFO_FILES_TASK).configure {"
+        errorLine2="    ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/buildInfo/CreateAggregateLibraryBuildInfoFileTask.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="    get() = this == rootProject"
+        errorLine2="                    ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*3}/androidx/build/gradle/Extensions.kt"/>
     </issue>
 
     <issue
@@ -174,6 +372,15 @@
 
     <issue
         id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="                    rootProject.tasks.named(GLOBAL_TASK_NAME).configure { task ->"
+        errorLine2="                    ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/FilteredAnchorTask.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
         message="Use providers.gradleProperty instead of getProperties"
         errorLine1="            task.pathPrefix = properties[PROP_PATH_PREFIX] as String"
         errorLine2="                              ~~~~~~~~~~">
@@ -191,6 +398,213 @@
     </issue>
 
     <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="            it.parameters.workingDir.set(rootProject.layout.projectDirectory)"
+        errorLine2="                                         ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/gitclient/GitClient.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getParent"
+        errorLine1="                    ${project.parent}."
+        errorLine2="                              ~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/java/JavaCompileInputs.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="        val rootBaseDir = if (compilerDaemonDisabled) projectDir else rootProject.projectDir"
+        errorLine2="                                                                      ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/KonanPrebuiltsSetup.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method findProject"
+        errorLine1="    return project.rootProject.findProject(path)"
+        errorLine2="                               ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/LintConfiguration.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="    return project.rootProject.findProject(path)"
+        errorLine2="                   ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/LintConfiguration.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method findProject"
+        errorLine1="        project.rootProject.findProject(&quot;:lint:lint-gradle&quot;)?.let {"
+        errorLine2="                            ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/LintConfiguration.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="        project.rootProject.findProject(&quot;:lint:lint-gradle&quot;)?.let {"
+        errorLine2="                ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/LintConfiguration.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="        val tasksByOutput = project.rootProject.findAllTasksByOutput()"
+        errorLine2="                                    ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/ListTaskOutputsTask.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method findProject"
+        errorLine1="            project.findProject(projectPath)?.plugins?.let { plugins ->"
+        errorLine2="                    ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/MavenUploadHelper.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="        project.rootProject.gradle.sharedServices.registerIfAbsent("
+        errorLine2="                ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/ProjectParser.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="                regenerate(project.rootProject, groupId, artifactId, artifactVersion, location)"
+        errorLine2="                                   ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/metalava/RegenerateOldApisTask.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="            regenerate(project.rootProject, groupId, artifactId, version, location)"
+        errorLine2="                               ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/metalava/RegenerateOldApisTask.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="            project.rootProject.maybeRegister("
+        errorLine2="                    ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/Release.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="                        project.rootProject.getRepositoryDirectory()"
+        errorLine2="                                ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/Release.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="        return project.rootProject.maybeRegister("
+        errorLine2="                       ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/Release.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="        val localPropsFile = rootProject.projectDir.resolve(&quot;local.properties&quot;)"
+        errorLine2="                             ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*3}/androidx/build/SdkHelper.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="        project.rootProject.rootDir.toRelativeString(project.projectDir)"
+        errorLine2="                ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*3}/androidx/build/SdkResourceGenerator.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="        (project.rootProject.extensions.extraProperties).let { it.get(&quot;supportRootFolder&quot;) as File }"
+        errorLine2="                 ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/studio/StudioTask.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="    rootProject.tasks"
+        errorLine2="    ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/testConfiguration/TestSuiteConfiguration.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="    rootProject.tasks.named&lt;ModuleInfoGenerator>(&quot;createModuleInfo&quot;).configure {"
+        errorLine2="    ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/testConfiguration/TestSuiteConfiguration.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getParent"
+        errorLine1="    val parentProject = project.parent!!"
+        errorLine2="                                ~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/testConfiguration/TestSuiteConfiguration.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="        project.rootProject.tasks.findByName(FINALIZE_TEST_CONFIGS_WITH_APKS_TASK)!!.dependsOn(task)"
+        errorLine2="                ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/testConfiguration/TestSuiteConfiguration.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="    rootProject.tasks.named&lt;ModuleInfoGenerator>(&quot;createModuleInfo&quot;).configure {"
+        errorLine2="    ~~~~~~~~~~~">
+        <location
+            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/testConfiguration/TestSuiteConfiguration.kt"/>
+    </issue>
+
+    <issue
         id="InternalAgpApiUsage"
         message="Avoid using internal Android Gradle Plugin APIs"
         errorLine1="import com.android.build.gradle.internal.lint.AndroidLintAnalysisTask"
@@ -382,8 +796,8 @@
     <issue
         id="WithPluginClasspathUsage"
         message="Avoid usage of GradleRunner#withPluginClasspath, which is broken. Instead use something like https://github.com/autonomousapps/dependency-analysis-gradle-plugin/tree/main/testkit#gradle-testkit-support-plugin"
-        errorLine1="            .withPluginClasspath()"
-        errorLine2="             ~~~~~~~~~~~~~~~~~~~">
+        errorLine1="                .withPluginClasspath()"
+        errorLine2="                 ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/test/java/androidx/build/buildInfo/CreateLibraryBuildInfoFileTaskTest.kt"/>
     </issue>
diff --git a/buildSrc/private/src/main/kotlin/androidx/build/AndroidXRootImplPlugin.kt b/buildSrc/private/src/main/kotlin/androidx/build/AndroidXRootImplPlugin.kt
index e777875..ba8881f 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/AndroidXRootImplPlugin.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/AndroidXRootImplPlugin.kt
@@ -61,7 +61,7 @@
 
         // If we're running inside Studio, validate the Android Gradle Plugin version.
         val expectedAgpVersion = System.getenv("EXPECTED_AGP_VERSION")
-        if (properties.containsKey("android.injected.invoked.from.ide")) {
+        if (providers.gradleProperty("android.injected.invoked.from.ide").isPresent) {
             if (expectedAgpVersion != ANDROID_GRADLE_PLUGIN_VERSION) {
                 throw GradleException(
                     """
diff --git a/buildSrc/private/src/main/kotlin/androidx/build/FilteredAnchorTask.kt b/buildSrc/private/src/main/kotlin/androidx/build/FilteredAnchorTask.kt
index f632090..73aca82 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/FilteredAnchorTask.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/FilteredAnchorTask.kt
@@ -62,7 +62,10 @@
  * match the requested path prefix and task name.
  */
 internal fun Project.addFilterableTasks(vararg taskProviders: TaskProvider<*>?) {
-    if (hasProperty(PROP_PATH_PREFIX) && hasProperty(PROP_TASK_NAME)) {
+    if (
+        providers.gradleProperty(PROP_PATH_PREFIX).isPresent &&
+            providers.gradleProperty(PROP_TASK_NAME).isPresent
+    ) {
         val pathPrefixes = (properties[PROP_PATH_PREFIX] as String).split(",")
         if (pathPrefixes.any { pathPrefix -> relativePathForFiltering().startsWith(pathPrefix) }) {
             val taskName = properties[PROP_TASK_NAME] as String
@@ -84,7 +87,10 @@
  * -Pandroidx.taskName=checkApi -Pandroidx.pathPrefix=core/core/
  */
 internal fun Project.maybeRegisterFilterableTask() {
-    if (hasProperty(PROP_TASK_NAME) && hasProperty(PROP_PATH_PREFIX)) {
+    if (
+        providers.gradleProperty(PROP_TASK_NAME).isPresent &&
+            providers.gradleProperty(PROP_PATH_PREFIX).isPresent
+    ) {
         tasks.register(GLOBAL_TASK_NAME, FilteredAnchorTask::class.java) { task ->
             task.pathPrefix = properties[PROP_PATH_PREFIX] as String
             task.taskName = properties[PROP_TASK_NAME] as String
diff --git a/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/adapter/CameraControlAdapter.kt b/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/adapter/CameraControlAdapter.kt
index b6e55c4..eace746 100644
--- a/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/adapter/CameraControlAdapter.kt
+++ b/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/adapter/CameraControlAdapter.kt
@@ -30,7 +30,6 @@
 import androidx.camera.camera2.pipe.integration.impl.StillCaptureRequestControl
 import androidx.camera.camera2.pipe.integration.impl.TorchControl
 import androidx.camera.camera2.pipe.integration.impl.UseCaseCamera
-import androidx.camera.camera2.pipe.integration.impl.UseCaseThreads
 import androidx.camera.camera2.pipe.integration.impl.ZoomControl
 import androidx.camera.camera2.pipe.integration.interop.Camera2CameraControl
 import androidx.camera.camera2.pipe.integration.interop.CaptureRequestOptions
@@ -49,8 +48,8 @@
 import androidx.camera.core.impl.utils.futures.Futures
 import com.google.common.util.concurrent.ListenableFuture
 import javax.inject.Inject
+import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.async
 
 /**
  * Adapt the [CameraControlInternal] interface to [CameraPipe].
@@ -71,7 +70,6 @@
     private val focusMeteringControl: FocusMeteringControl,
     private val stillCaptureRequestControl: StillCaptureRequestControl,
     private val torchControl: TorchControl,
-    private val threads: UseCaseThreads,
     private val zoomControl: ZoomControl,
     private val zslControl: ZslControl,
     public val camera2cameraControl: Camera2CameraControl,
@@ -112,11 +110,10 @@
 
     override fun cancelFocusAndMetering(): ListenableFuture<Void> {
         return Futures.nonCancellationPropagating(
-            threads.sequentialScope
-                .async {
-                    focusMeteringControl.cancelFocusAndMeteringAsync().join()
+            CompletableDeferred<Void?>()
+                .also {
                     // Convert to null once the task is done, ignore the results.
-                    return@async null
+                    focusMeteringControl.cancelFocusAndMeteringAsync().propagateTo(it) { null }
                 }
                 .asListenableFuture()
         )
diff --git a/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/adapter/CoroutineAdapters.kt b/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/adapter/CoroutineAdapters.kt
index 76d7012..5353105 100644
--- a/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/adapter/CoroutineAdapters.kt
+++ b/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/adapter/CoroutineAdapters.kt
@@ -74,21 +74,48 @@
     return CallbackToFutureAdapter.getFuture(resolver)
 }
 
+/**
+ * Propagates the result of this to `destination` parameter when this deferred is completed.
+ *
+ * Cancelling the destination is no-op returned from this function does not cancel the `Deferred`
+ * returned by `block`.
+ */
 public fun <T> Deferred<T>.propagateTo(destination: CompletableDeferred<T>) {
-    invokeOnCompletion { propagateOnceTo(destination, it) }
+    invokeOnCompletion { propagateCompletion(destination, it) }
 }
 
-@OptIn(ExperimentalCoroutinesApi::class)
-public fun <T> Deferred<T>.propagateOnceTo(
-    destination: CompletableDeferred<T>,
-    throwable: Throwable?,
+/**
+ * Propagates the result of this to `destination` parameter when this deferred is completed.
+ *
+ * Cancelling the destination is no-op returned from this function does not cancel the `Deferred`
+ * returned by `block`.
+ *
+ * @param destination The destination [CompletableDeferred] to which result is propagated to.
+ * @param transform Transformation function to convert the result during propagation.
+ */
+public fun <T, R> Deferred<T>.propagateTo(
+    destination: CompletableDeferred<R>,
+    transform: (T) -> R,
 ) {
-    if (throwable != null) {
-        if (throwable is CancellationException) {
-            destination.cancel(throwable)
-        } else {
-            destination.completeExceptionally(throwable)
-        }
+    invokeOnCompletion { propagateCompletion(destination, it, transform) }
+}
+
+/**
+ * Propagates the result of this to `destination` parameter immediately.
+ *
+ * This function assumes that [Deferred.invokeOnCompletion] has already been invoked.
+ *
+ * @param destination The destination `Deferred` to which result is propagated to.
+ * @param completionCause The `Throwable` cause of completion that was passed in
+ *   `Deferred.invokeOnCompletion`.
+ */
+@OptIn(ExperimentalCoroutinesApi::class)
+public fun <T> Deferred<T>.propagateCompletion(
+    destination: CompletableDeferred<T>,
+    completionCause: Throwable?,
+) {
+    if (completionCause != null) {
+        destination.completeFailing(completionCause)
     } else {
         // Ignore exceptions - This should never throw in this situation.
         destination.complete(getCompleted())
@@ -96,6 +123,46 @@
 }
 
 /**
+ * Propagates the result of this to `destination` parameter immediately.
+ *
+ * This function assumes that [Deferred.invokeOnCompletion] has already been invoked.
+ *
+ * @param destination The destination `Deferred` to which result is propagated to.
+ * @param completionCause The `Throwable` cause of completion that was passed in
+ *   `Deferred.invokeOnCompletion`.
+ * @param transform Transformation function to convert the result during propagation.
+ */
+@OptIn(ExperimentalCoroutinesApi::class)
+public fun <T, R> Deferred<T>.propagateCompletion(
+    destination: CompletableDeferred<R>,
+    completionCause: Throwable?,
+    transform: (T) -> R,
+) {
+    if (completionCause != null) {
+        destination.completeFailing(completionCause)
+    } else {
+        // Ignore exceptions - This should never throw in this situation.
+        destination.complete(transform(getCompleted()))
+    }
+}
+
+/**
+ * Completes this `Deferred` as failure based on the provided `cause`.
+ *
+ * @param cause If it's an instance of [CancellationException], [Deferred.cancel] is invoked for
+ *   this, otherwise, [CompletableDeferred.completeExceptionally] is invoked.
+ */
+public fun <T> CompletableDeferred<T>.completeFailing(
+    cause: Throwable,
+) {
+    if (cause is CancellationException) {
+        cancel(cause)
+    } else {
+        completeExceptionally(cause)
+    }
+}
+
+/**
  * Waits for [Deferred.await] to be completed until the given timeout.
  *
  * @return true if `Deferred.await` had completed, false otherwise.
diff --git a/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/impl/MeteringRepeating.kt b/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/impl/MeteringRepeating.kt
index 82da040..2080cb8 100644
--- a/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/impl/MeteringRepeating.kt
+++ b/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/impl/MeteringRepeating.kt
@@ -45,6 +45,7 @@
 import androidx.camera.core.impl.UseCaseConfigFactory
 import androidx.camera.core.impl.UseCaseConfigFactory.CaptureType
 import androidx.camera.core.impl.utils.executor.CameraXExecutors
+import androidx.camera.core.internal.TargetConfig.OPTION_TARGET_NAME
 import kotlin.math.min
 
 private val DEFAULT_PREVIEW_SIZE = Size(0, 0)
@@ -203,6 +204,7 @@
                     OPTION_SESSION_CONFIG_UNPACKER,
                     CameraUseCaseAdapter.DefaultSessionOptionsUnpacker
                 )
+                insertOption(OPTION_TARGET_NAME, "MeteringRepeating")
                 insertOption(OPTION_CAPTURE_TYPE, CaptureType.METERING_REPEATING)
             }
 
diff --git a/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/impl/StillCaptureRequestControl.kt b/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/impl/StillCaptureRequestControl.kt
index 7ffef5d..94f03ea 100644
--- a/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/impl/StillCaptureRequestControl.kt
+++ b/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/impl/StillCaptureRequestControl.kt
@@ -19,7 +19,7 @@
 import androidx.annotation.GuardedBy
 import androidx.camera.camera2.pipe.core.Log.debug
 import androidx.camera.camera2.pipe.integration.adapter.asListenableFuture
-import androidx.camera.camera2.pipe.integration.adapter.propagateOnceTo
+import androidx.camera.camera2.pipe.integration.adapter.propagateCompletion
 import androidx.camera.camera2.pipe.integration.config.CameraScope
 import androidx.camera.core.ImageCapture
 import androidx.camera.core.ImageCaptureException
@@ -197,7 +197,7 @@
                     }
                 }
             } else {
-                propagateOnceTo(submittedRequest.result, cause)
+                propagateCompletion(submittedRequest.result, cause)
             }
         }
     }
diff --git a/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/impl/UseCaseManager.kt b/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/impl/UseCaseManager.kt
index 54adf25..cedc7c4 100644
--- a/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/impl/UseCaseManager.kt
+++ b/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/impl/UseCaseManager.kt
@@ -17,6 +17,7 @@
 package androidx.camera.camera2.pipe.integration.impl
 
 import android.content.Context
+import android.graphics.ImageFormat
 import android.hardware.camera2.CameraCharacteristics
 import android.hardware.camera2.CameraDevice.TEMPLATE_PREVIEW
 import android.hardware.camera2.CaptureRequest
@@ -55,23 +56,30 @@
 import androidx.camera.camera2.pipe.integration.config.UseCaseCameraComponent
 import androidx.camera.camera2.pipe.integration.config.UseCaseCameraConfig
 import androidx.camera.camera2.pipe.integration.config.UseCaseGraphConfig
+import androidx.camera.camera2.pipe.integration.internal.DynamicRangeResolver
 import androidx.camera.camera2.pipe.integration.interop.Camera2CameraControl
 import androidx.camera.camera2.pipe.integration.interop.ExperimentalCamera2Interop
 import androidx.camera.core.DynamicRange
+import androidx.camera.core.ImageCapture
 import androidx.camera.core.MirrorMode
+import androidx.camera.core.Preview
 import androidx.camera.core.UseCase
+import androidx.camera.core.impl.AttachedSurfaceInfo
 import androidx.camera.core.impl.CameraControlInternal
 import androidx.camera.core.impl.CameraInfoInternal
 import androidx.camera.core.impl.CameraInternal
 import androidx.camera.core.impl.CameraMode
 import androidx.camera.core.impl.CaptureConfig
 import androidx.camera.core.impl.DeferrableSurface
-import androidx.camera.core.impl.PreviewConfig
+import androidx.camera.core.impl.MutableOptionsBundle
 import androidx.camera.core.impl.SessionConfig
 import androidx.camera.core.impl.SessionConfig.OutputConfig.SURFACE_GROUP_ID_NONE
 import androidx.camera.core.impl.SessionConfig.ValidatingBuilder
 import androidx.camera.core.impl.SessionProcessor
+import androidx.camera.core.impl.SurfaceConfig
 import androidx.camera.core.impl.stabilization.StabilizationMode
+import androidx.camera.core.streamsharing.StreamSharing
+import androidx.camera.core.streamsharing.StreamSharingConfig
 import javax.inject.Inject
 import javax.inject.Provider
 import kotlinx.coroutines.Deferred
@@ -171,6 +179,8 @@
         )
     }
 
+    private val dynamicRangeResolver = DynamicRangeResolver(cameraProperties.metadata)
+
     @Volatile private var _activeComponent: UseCaseCameraComponent? = null
     public val camera: UseCaseCamera?
         get() = _activeComponent?.getUseCaseCamera()
@@ -602,7 +612,7 @@
             return activeSurfaces > 0 &&
                 with(attachedUseCases.withoutMetering()) {
                     (onlyVideoCapture() || requireMeteringRepeating()) &&
-                        supportMeteringCombination()
+                        isMeteringCombinationSupported()
                 }
         }
         return false
@@ -624,7 +634,7 @@
             return activeSurfaces == 0 ||
                 with(attachedUseCases.withoutMetering()) {
                     !(onlyVideoCapture() || requireMeteringRepeating()) ||
-                        !supportMeteringCombination()
+                        !isMeteringCombinationSupported()
                 }
         }
         return false
@@ -664,46 +674,133 @@
             }
     }
 
-    private fun Collection<UseCase>.supportMeteringCombination(): Boolean {
-        val useCases = this.toMutableList().apply { add(meteringRepeating) }
+    private fun Collection<UseCase>.isMeteringCombinationSupported(): Boolean {
         if (meteringRepeating.attachedSurfaceResolution == null) {
             meteringRepeating.setupSession()
         }
-        return isCombinationSupported(useCases).also {
-            Log.debug { "Combination of $useCases is supported: $it" }
+
+        val attachedSurfaceInfoList = getAttachedSurfaceInfoList()
+
+        if (attachedSurfaceInfoList.isEmpty()) {
+            return false
         }
+
+        val sessionSurfacesConfigs = getSessionSurfacesConfigs()
+
+        return supportedSurfaceCombination
+            .checkSupported(
+                SupportedSurfaceCombination.FeatureSettings(
+                    CameraMode.DEFAULT,
+                    getRequiredMaxBitDepth(attachedSurfaceInfoList),
+                    isPreviewStabilizationOn(),
+                    isUltraHdrOn()
+                ),
+                mutableListOf<SurfaceConfig>().apply {
+                    addAll(sessionSurfacesConfigs)
+                    add(createMeteringRepeatingSurfaceConfig())
+                }
+            )
+            .also {
+                Log.debug {
+                    "Combination of $sessionSurfacesConfigs + $meteringRepeating is supported: $it"
+                }
+            }
     }
 
-    private fun isCombinationSupported(currentUseCases: Collection<UseCase>): Boolean {
-        val surfaceConfigs =
-            currentUseCases.map { useCase ->
-                // TODO: Test with correct Camera Mode when concurrent mode / ultra high resolution
-                // is
-                //  implemented.
-                supportedSurfaceCombination.transformSurfaceConfig(
-                    CameraMode.DEFAULT,
-                    useCase.imageFormat,
-                    useCase.attachedSurfaceResolution!!
+    private fun getRequiredMaxBitDepth(attachedSurfaceInfoList: List<AttachedSurfaceInfo>): Int {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            dynamicRangeResolver
+                .resolveAndValidateDynamicRanges(
+                    attachedSurfaceInfoList,
+                    listOf(meteringRepeating.currentConfig),
+                    listOf(0)
+                )
+                .forEach { (_, u) ->
+                    if (u.bitDepth == DynamicRange.BIT_DEPTH_10_BIT) {
+                        return DynamicRange.BIT_DEPTH_10_BIT
+                    }
+                }
+        }
+
+        return DynamicRange.BIT_DEPTH_8_BIT
+    }
+
+    private fun Collection<UseCase>.getAttachedSurfaceInfoList(): List<AttachedSurfaceInfo> =
+        mutableListOf<AttachedSurfaceInfo>().apply {
+            this@getAttachedSurfaceInfoList.forEach { useCase ->
+                val surfaceResolution = useCase.attachedSurfaceResolution
+                val streamSpec = useCase.attachedStreamSpec
+
+                // When collecting the info, the UseCases might be unbound to make these info
+                // become null.
+                if (surfaceResolution == null || streamSpec == null) {
+                    Log.warn { "Invalid surface resolution or stream spec is found." }
+                    clear()
+                    return@apply
+                }
+
+                val surfaceConfig =
+                    supportedSurfaceCombination.transformSurfaceConfig(
+                        // TODO: Test with correct Camera Mode when concurrent mode / ultra high
+                        // resolution is implemented.
+                        CameraMode.DEFAULT,
+                        useCase.currentConfig.inputFormat,
+                        surfaceResolution
+                    )
+                add(
+                    AttachedSurfaceInfo.create(
+                        surfaceConfig,
+                        useCase.currentConfig.inputFormat,
+                        surfaceResolution,
+                        streamSpec.dynamicRange,
+                        useCase.getCaptureTypes(),
+                        streamSpec.implementationOptions ?: MutableOptionsBundle.create(),
+                        useCase.currentConfig.getTargetFrameRate(null)
+                    )
                 )
             }
+        }
 
-        var isPreviewStabilizationOn = false
-        for (useCase in currentUseCases) {
-            if (useCase.currentConfig is PreviewConfig) {
-                isPreviewStabilizationOn =
-                    useCase.currentConfig.previewStabilizationMode == StabilizationMode.ON
+    private fun UseCase.getCaptureTypes() =
+        if (this is StreamSharing) {
+            (currentConfig as StreamSharingConfig).captureTypes
+        } else {
+            listOf(currentConfig.captureType)
+        }
+
+    private fun Collection<UseCase>.isPreviewStabilizationOn() =
+        filterIsInstance<Preview>().firstOrNull()?.currentConfig?.previewStabilizationMode ==
+            StabilizationMode.ON
+
+    private fun Collection<UseCase>.isUltraHdrOn() =
+        filterIsInstance<ImageCapture>().firstOrNull()?.currentConfig?.inputFormat ==
+            ImageFormat.JPEG_R
+
+    private fun Collection<UseCase>.getSessionSurfacesConfigs(): List<SurfaceConfig> =
+        mutableListOf<SurfaceConfig>().apply {
+            this@getSessionSurfacesConfigs.forEach { useCase ->
+                useCase.sessionConfig.surfaces.forEach { deferrableSurface ->
+                    add(
+                        supportedSurfaceCombination.transformSurfaceConfig(
+                            // TODO: Test with correct Camera Mode when concurrent mode / ultra high
+                            // resolution is implemented.
+                            CameraMode.DEFAULT,
+                            useCase.currentConfig.inputFormat,
+                            deferrableSurface.prescribedSize
+                        )
+                    )
+                }
             }
         }
 
-        return supportedSurfaceCombination.checkSupported(
-            SupportedSurfaceCombination.FeatureSettings(
-                CameraMode.DEFAULT,
-                DynamicRange.BIT_DEPTH_8_BIT,
-                isPreviewStabilizationOn
-            ),
-            surfaceConfigs
+    private fun createMeteringRepeatingSurfaceConfig() =
+        supportedSurfaceCombination.transformSurfaceConfig(
+            // TODO: Test with correct Camera Mode when concurrent mode / ultra high resolution is
+            // implemented.
+            CameraMode.DEFAULT,
+            meteringRepeating.imageFormat,
+            meteringRepeating.attachedSurfaceResolution!!
         )
-    }
 
     private fun Collection<UseCase>.surfaceCount(): Int =
         ValidatingBuilder().let { validatingBuilder ->
diff --git a/camera/camera-camera2-pipe-integration/src/test/java/androidx/camera/camera2/pipe/integration/adapter/CoroutineAdapterTest.kt b/camera/camera-camera2-pipe-integration/src/test/java/androidx/camera/camera2/pipe/integration/adapter/CoroutineAdapterTest.kt
index 9b27a11..28b47b6 100644
--- a/camera/camera-camera2-pipe-integration/src/test/java/androidx/camera/camera2/pipe/integration/adapter/CoroutineAdapterTest.kt
+++ b/camera/camera-camera2-pipe-integration/src/test/java/androidx/camera/camera2/pipe/integration/adapter/CoroutineAdapterTest.kt
@@ -46,6 +46,23 @@
     }
 
     @Test
+    fun propagateTransformedCompleteResult(): Unit = runBlocking {
+        // Arrange.
+        val resultValue = 123
+        val resultValueTransformed = resultValue.toString()
+
+        val sourceDeferred = CompletableDeferred<Int>()
+        val resultDeferred = CompletableDeferred<String>()
+        sourceDeferred.propagateTo(resultDeferred) { res -> res.toString() }
+
+        // Act.
+        sourceDeferred.complete(resultValue)
+
+        // Assert.
+        assertThat(resultDeferred.await()).isEqualTo(resultValueTransformed)
+    }
+
+    @Test
     fun propagateCancelResult() {
         // Arrange.
         val sourceDeferred = CompletableDeferred<Unit>()
@@ -59,6 +76,20 @@
         assertThat(resultDeferred.isCancelled).isTrue()
     }
 
+    @Test
+    fun propagateCancelResult_whenTransformFunctionIsUsed() {
+        // Arrange.
+        val sourceDeferred = CompletableDeferred<Unit>()
+        val resultDeferred = CompletableDeferred<Unit>()
+        sourceDeferred.propagateTo(resultDeferred) { res -> res.toString() }
+
+        // Act.
+        sourceDeferred.cancel()
+
+        // Assert.
+        assertThat(resultDeferred.isCancelled).isTrue()
+    }
+
     @OptIn(ExperimentalCoroutinesApi::class)
     @Test
     fun propagateExceptionResult() {
@@ -74,4 +105,20 @@
         // Assert.
         assertThat(resultDeferred.getCompletionExceptionOrNull()).isSameInstanceAs(testThrowable)
     }
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    @Test
+    fun propagateExceptionResult_whenTransformFunctionIsUsed() {
+        // Arrange.
+        val sourceDeferred = CompletableDeferred<Unit>()
+        val resultDeferred = CompletableDeferred<Unit>()
+        sourceDeferred.propagateTo(resultDeferred) { res -> res.toString() }
+        val testThrowable = Throwable()
+
+        // Act.
+        sourceDeferred.completeExceptionally(testThrowable)
+
+        // Assert.
+        assertThat(resultDeferred.getCompletionExceptionOrNull()).isSameInstanceAs(testThrowable)
+    }
 }
diff --git a/camera/camera-camera2-pipe-integration/src/test/java/androidx/camera/camera2/pipe/integration/impl/UseCaseManagerTest.kt b/camera/camera-camera2-pipe-integration/src/test/java/androidx/camera/camera2/pipe/integration/impl/UseCaseManagerTest.kt
index 37d015b..89e2eb6 100644
--- a/camera/camera-camera2-pipe-integration/src/test/java/androidx/camera/camera2/pipe/integration/impl/UseCaseManagerTest.kt
+++ b/camera/camera-camera2-pipe-integration/src/test/java/androidx/camera/camera2/pipe/integration/impl/UseCaseManagerTest.kt
@@ -228,6 +228,67 @@
     }
 
     @Test
+    fun meteringRepeatingEnabled_whenPreviewEnabledWithNoSurfaceProvider() = runTest {
+        // Arrange
+        initializeUseCaseThreads(this)
+        val useCaseManager = createUseCaseManager()
+        val preview = createPreview(/* withSurfaceProvider= */ false)
+        val imageCapture = createImageCapture()
+        useCaseManager.attach(listOf(preview, imageCapture))
+
+        // Act
+        useCaseManager.activate(preview)
+        useCaseManager.activate(imageCapture)
+
+        // Assert
+        val enabledUseCaseClasses =
+            useCaseManager.getRunningUseCasesForTest().map { it::class.java }
+        assertThat(enabledUseCaseClasses)
+            .containsExactly(
+                Preview::class.java,
+                ImageCapture::class.java,
+                MeteringRepeating::class.java
+            )
+    }
+
+    @Test
+    fun meteringRepeatingNotEnabled_whenImageAnalysisAndPreviewWithNoSurfaceProvider() = runTest {
+        // Arrange
+        initializeUseCaseThreads(this)
+        val useCaseManager = createUseCaseManager()
+        val preview = createPreview(/* withSurfaceProvider= */ false)
+        val imageAnalysis =
+            ImageAnalysis.Builder().build().apply {
+                setAnalyzer(useCaseThreads.backgroundExecutor) { image -> image.close() }
+            }
+        useCaseManager.attach(listOf(preview, imageAnalysis))
+
+        // Act
+        useCaseManager.activate(preview)
+        useCaseManager.activate(imageAnalysis)
+
+        // Assert
+        val enabledUseCases = useCaseManager.getRunningUseCasesForTest()
+        assertThat(enabledUseCases).containsExactly(preview, imageAnalysis)
+    }
+
+    @Test
+    fun meteringRepeatingNotEnabled_whenOnlyPreviewWithNoSurfaceProvider() = runTest {
+        // Arrange
+        initializeUseCaseThreads(this)
+        val useCaseManager = createUseCaseManager()
+        val preview = createPreview(/* withSurfaceProvider= */ false)
+        useCaseManager.attach(listOf(preview))
+
+        // Act
+        useCaseManager.activate(preview)
+
+        // Assert
+        val enabledUseCases = useCaseManager.getRunningUseCasesForTest()
+        assertThat(enabledUseCases).containsExactly(preview)
+    }
+
+    @Test
     fun meteringRepeatingEnabled_whenOnlyImageCaptureEnabled() = runTest {
         // Arrange
         initializeUseCaseThreads(this)
@@ -736,16 +797,18 @@
                 useCaseList.add(it)
             }
 
-    private fun createPreview(): Preview =
+    private fun createPreview(withSurfaceProvider: Boolean = true): Preview =
         Preview.Builder()
             .setCaptureOptionUnpacker(CameraUseCaseAdapter.DefaultCaptureOptionsUnpacker.INSTANCE)
             .setSessionOptionUnpacker(CameraUseCaseAdapter.DefaultSessionOptionsUnpacker)
             .build()
             .apply {
-                setSurfaceProvider(
-                    CameraXExecutors.mainThreadExecutor(),
-                    SurfaceTextureProvider.createSurfaceTextureProvider()
-                )
+                if (withSurfaceProvider) {
+                    setSurfaceProvider(
+                        CameraXExecutors.mainThreadExecutor(),
+                        SurfaceTextureProvider.createSurfaceTextureProvider()
+                    )
+                }
             }
             .also {
                 it.simulateActivation()
diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/CameraBackend.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/CameraBackend.kt
index 9ed683c..5d5ee33 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/CameraBackend.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/CameraBackend.kt
@@ -40,7 +40,7 @@
         }
 
         public class CameraAvailable(public val cameraId: CameraId) : CameraStatus() {
-            override fun toString(): String = "CameraAvailable(camera=$cameraId"
+            override fun toString(): String = "CameraAvailable(camera=$cameraId)"
         }
     }
 }
diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2CameraController.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2CameraController.kt
index 16a26fd..efe9f68 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2CameraController.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2CameraController.kt
@@ -176,7 +176,7 @@
                 ControllerState.ERROR ->
                     if (
                         cameraStatus is CameraStatus.CameraAvailable &&
-                            lastCameraError == CameraError.ERROR_CAMERA_DEVICE
+                            lastCameraError != CameraError.ERROR_GRAPH_CONFIG
                     ) {
                         shouldRestart = true
                     }
diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Exceptions.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Exceptions.kt
index 8039abf..f7532e5 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Exceptions.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Exceptions.kt
@@ -55,9 +55,19 @@
     } catch (e: Exception) {
         Log.warn { "Unexpected error: " + e.message }
         when (e) {
+            is CameraAccessException -> {
+                cameraErrorListener.onCameraError(
+                    cameraId,
+                    CameraError.from(e),
+                    // CameraAccessException indicates the task failed because the camera is
+                    // unavailable, such as when the camera is in use or disconnected. Such errors
+                    // can be recovered when the camera becomes available.
+                    willAttemptRetry = true,
+                )
+                return null
+            }
             is IllegalArgumentException,
             is IllegalStateException,
-            is CameraAccessException,
             is SecurityException,
             is UnsupportedOperationException,
             is NullPointerException -> {
diff --git a/camera/camera-core/src/main/java/androidx/camera/core/CameraProvider.kt b/camera/camera-core/src/main/java/androidx/camera/core/CameraProvider.kt
index a0557a5..94fa6ae 100644
--- a/camera/camera-core/src/main/java/androidx/camera/core/CameraProvider.kt
+++ b/camera/camera-core/src/main/java/androidx/camera/core/CameraProvider.kt
@@ -18,7 +18,6 @@
 import androidx.annotation.RestrictTo
 import androidx.annotation.RestrictTo.Scope
 import androidx.lifecycle.LifecycleOwner
-import com.google.common.util.concurrent.ListenableFuture
 
 /**
  * A [CameraProvider] provides basic access to a set of cameras such as querying for camera
@@ -92,12 +91,4 @@
     public fun getCameraInfo(cameraSelector: CameraSelector): CameraInfo {
         throw UnsupportedOperationException("The camera provider is not implemented properly.")
     }
-
-    /**
-     * Shuts down the camera provider.
-     *
-     * @return A [ListenableFuture] representing the shutdown status. Cancellation of this future is
-     *   a no-op.
-     */
-    @RestrictTo(Scope.LIBRARY_GROUP) public fun shutdownAsync(): ListenableFuture<Void>
 }
diff --git a/camera/camera-lifecycle/src/main/java/androidx/camera/lifecycle/LifecycleCameraProviderImpl.kt b/camera/camera-lifecycle/src/main/java/androidx/camera/lifecycle/LifecycleCameraProviderImpl.kt
index bb2d4f4..667a60f 100644
--- a/camera/camera-lifecycle/src/main/java/androidx/camera/lifecycle/LifecycleCameraProviderImpl.kt
+++ b/camera/camera-lifecycle/src/main/java/androidx/camera/lifecycle/LifecycleCameraProviderImpl.kt
@@ -143,7 +143,7 @@
             }
         }
 
-    override fun shutdownAsync(): ListenableFuture<Void> {
+    internal fun shutdownAsync(): ListenableFuture<Void> {
         Threads.runOnMainSync {
             unbindAll()
             lifecycleCameraRepository.clear()
diff --git a/camera/camera-lifecycle/src/main/java/androidx/camera/lifecycle/ProcessCameraProvider.kt b/camera/camera-lifecycle/src/main/java/androidx/camera/lifecycle/ProcessCameraProvider.kt
index 9814e90..e40f3ed 100644
--- a/camera/camera-lifecycle/src/main/java/androidx/camera/lifecycle/ProcessCameraProvider.kt
+++ b/camera/camera-lifecycle/src/main/java/androidx/camera/lifecycle/ProcessCameraProvider.kt
@@ -114,9 +114,8 @@
         return lifecycleCameraProvider.getCameraInfo(cameraSelector)
     }
 
-    // TODO: Remove the annotation when LifecycleCameraProvider is ready to be public.
     @VisibleForTesting
-    override fun shutdownAsync(): ListenableFuture<Void> {
+    public fun shutdownAsync(): ListenableFuture<Void> {
         return lifecycleCameraProvider.shutdownAsync()
     }
 
diff --git a/camera/integration-tests/avsynctestapp/build.gradle b/camera/integration-tests/avsynctestapp/build.gradle
index ebd2c4e..5f9a182 100644
--- a/camera/integration-tests/avsynctestapp/build.gradle
+++ b/camera/integration-tests/avsynctestapp/build.gradle
@@ -66,7 +66,7 @@
     // Align dependencies in debugRuntimeClasspath and debugAndroidTestRuntimeClasspath.
     androidTestImplementation("androidx.annotation:annotation-experimental:1.4.1")
     androidTestImplementation(project(":annotation:annotation"))
-    androidTestImplementation("androidx.lifecycle:lifecycle-common:2.8.3")
+    androidTestImplementation(project(":lifecycle:lifecycle-common"))
 
     // Testing framework
     testImplementation(libs.kotlinCoroutinesTest)
diff --git a/camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/ResolutionSelectorDeviceTest.kt b/camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/ResolutionSelectorDeviceTest.kt
new file mode 100644
index 0000000..9e9562c
--- /dev/null
+++ b/camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/ResolutionSelectorDeviceTest.kt
@@ -0,0 +1,692 @@
+/*
+ * Copyright 2024 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.camera.integration.core
+
+import android.Manifest
+import android.content.Context
+import android.graphics.ImageFormat
+import android.graphics.Point
+import android.graphics.SurfaceTexture
+import android.hardware.camera2.CameraCharacteristics
+import android.hardware.camera2.CameraCharacteristics.CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES
+import android.util.Log
+import android.util.Range
+import android.util.Rational
+import android.util.Size
+import androidx.camera.camera2.Camera2Config
+import androidx.camera.camera2.internal.DisplayInfoManager
+import androidx.camera.camera2.pipe.integration.CameraPipeConfig
+import androidx.camera.core.AspectRatio.RATIO_16_9
+import androidx.camera.core.AspectRatio.RATIO_4_3
+import androidx.camera.core.Camera
+import androidx.camera.core.CameraSelector
+import androidx.camera.core.CameraXConfig
+import androidx.camera.core.ImageAnalysis
+import androidx.camera.core.ImageCapture
+import androidx.camera.core.Preview
+import androidx.camera.core.UseCase
+import androidx.camera.core.impl.CameraInfoInternal
+import androidx.camera.core.impl.ImageFormatConstants
+import androidx.camera.core.impl.ImageOutputConfig
+import androidx.camera.core.impl.Quirk
+import androidx.camera.core.impl.RestrictedCameraControl
+import androidx.camera.core.impl.utils.AspectRatioUtil
+import androidx.camera.core.impl.utils.AspectRatioUtil.ASPECT_RATIO_16_9
+import androidx.camera.core.impl.utils.AspectRatioUtil.ASPECT_RATIO_4_3
+import androidx.camera.core.impl.utils.AspectRatioUtil.hasMatchingAspectRatio
+import androidx.camera.core.impl.utils.CompareSizesByArea
+import androidx.camera.core.internal.utils.SizeUtil
+import androidx.camera.core.internal.utils.SizeUtil.RESOLUTION_1080P
+import androidx.camera.core.resolutionselector.AspectRatioStrategy
+import androidx.camera.core.resolutionselector.AspectRatioStrategy.FALLBACK_RULE_AUTO
+import androidx.camera.core.resolutionselector.ResolutionFilter
+import androidx.camera.core.resolutionselector.ResolutionSelector
+import androidx.camera.core.resolutionselector.ResolutionSelector.PREFER_CAPTURE_RATE_OVER_HIGHER_RESOLUTION
+import androidx.camera.core.resolutionselector.ResolutionSelector.PREFER_HIGHER_RESOLUTION_OVER_CAPTURE_RATE
+import androidx.camera.core.resolutionselector.ResolutionStrategy
+import androidx.camera.core.resolutionselector.ResolutionStrategy.FALLBACK_RULE_CLOSEST_HIGHER_THEN_LOWER
+import androidx.camera.lifecycle.ProcessCameraProvider
+import androidx.camera.testing.impl.CameraPipeConfigTestRule
+import androidx.camera.testing.impl.CameraUtil
+import androidx.camera.testing.impl.fakes.FakeLifecycleOwner
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.filters.LargeTest
+import androidx.test.filters.SdkSuppress
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.rule.GrantPermissionRule
+import androidx.testutils.fail
+import com.google.common.truth.Truth.assertThat
+import java.util.concurrent.TimeUnit
+import org.junit.After
+import org.junit.Assume.assumeFalse
+import org.junit.Assume.assumeTrue
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.Parameterized
+
+/**
+ * ResolutionSelector related test on the real device.
+ *
+ * Make the ResolutionSelectorDeviceTest focus on the generic ResolutionSelector selection results
+ * for all the normal devices. Skips the tests when the devices have any of the quirks that might
+ * affect the selected resolution.
+ */
+@LargeTest
+@RunWith(Parameterized::class)
+@SdkSuppress(minSdkVersion = 21)
+class ResolutionSelectorDeviceTest(
+    private val implName: String,
+    private var cameraSelector: CameraSelector,
+    private val cameraConfig: CameraXConfig,
+) {
+    @get:Rule
+    val cameraPipeConfigTestRule =
+        CameraPipeConfigTestRule(
+            active = implName.contains(CameraPipeConfig::class.simpleName!!),
+        )
+
+    @get:Rule
+    val cameraRule =
+        CameraUtil.grantCameraPermissionAndPreTestAndPostTest(
+            CameraUtil.PreTestCameraIdList(cameraConfig)
+        )
+
+    @get:Rule
+    val permissionRule: GrantPermissionRule =
+        GrantPermissionRule.grant(Manifest.permission.RECORD_AUDIO)
+
+    private val useCaseFormatMap =
+        mapOf(
+            Pair(Preview::class.java, ImageFormatConstants.INTERNAL_DEFINED_IMAGE_FORMAT_PRIVATE),
+            Pair(ImageCapture::class.java, ImageFormat.JPEG),
+            Pair(ImageAnalysis::class.java, ImageFormat.YUV_420_888)
+        )
+
+    companion object {
+        @JvmStatic
+        @Parameterized.Parameters(name = "{0}")
+        fun data() =
+            listOf(
+                arrayOf(
+                    "back+" + Camera2Config::class.simpleName,
+                    CameraSelector.DEFAULT_BACK_CAMERA,
+                    Camera2Config.defaultConfig(),
+                ),
+                arrayOf(
+                    "front+" + Camera2Config::class.simpleName,
+                    CameraSelector.DEFAULT_FRONT_CAMERA,
+                    Camera2Config.defaultConfig(),
+                ),
+                arrayOf(
+                    "back+" + CameraPipeConfig::class.simpleName,
+                    CameraSelector.DEFAULT_BACK_CAMERA,
+                    CameraPipeConfig.defaultConfig(),
+                ),
+                arrayOf(
+                    "front+" + CameraPipeConfig::class.simpleName,
+                    CameraSelector.DEFAULT_FRONT_CAMERA,
+                    CameraPipeConfig.defaultConfig(),
+                ),
+            )
+    }
+
+    private val instrumentation = InstrumentationRegistry.getInstrumentation()
+    private val context: Context = ApplicationProvider.getApplicationContext()
+    private lateinit var cameraProvider: ProcessCameraProvider
+    private lateinit var lifecycleOwner: FakeLifecycleOwner
+    private lateinit var camera: Camera
+    private lateinit var cameraInfoInternal: CameraInfoInternal
+
+    @Before
+    fun initializeCameraX() {
+        assumeTrue(CameraUtil.hasCameraWithLensFacing(cameraSelector.lensFacing!!))
+        ProcessCameraProvider.configureInstance(cameraConfig)
+        cameraProvider = ProcessCameraProvider.getInstance(context)[10, TimeUnit.SECONDS]
+
+        instrumentation.runOnMainSync {
+            lifecycleOwner = FakeLifecycleOwner()
+            lifecycleOwner.startAndResume()
+
+            camera = cameraProvider.bindToLifecycle(lifecycleOwner, cameraSelector)
+            cameraInfoInternal = camera.cameraInfo as CameraInfoInternal
+        }
+
+        assumeNotAspectRatioQuirkDevice()
+        assumeNotOutputSizeQuirkDevice()
+    }
+
+    @After
+    fun shutdownCameraX() {
+        if (::cameraProvider.isInitialized) {
+            cameraProvider.shutdownAsync()[10, TimeUnit.SECONDS]
+        }
+    }
+
+    @Test
+    fun canSelect4x3ResolutionForPreviewImageCaptureAndImageAnalysis() {
+        canSelectTargetAspectRatioResolutionForPreviewImageCaptureAndImageAnalysis(RATIO_4_3)
+    }
+
+    @Test
+    fun canSelect16x9ResolutionForPreviewImageCaptureAndImageAnalysis() {
+        canSelectTargetAspectRatioResolutionForPreviewImageCaptureAndImageAnalysis(RATIO_16_9)
+    }
+
+    private fun canSelectTargetAspectRatioResolutionForPreviewImageCaptureAndImageAnalysis(
+        targetAspectRatio: Int
+    ) {
+        val preview = createUseCaseWithResolutionSelector(Preview::class.java, targetAspectRatio)
+        val imageCapture =
+            createUseCaseWithResolutionSelector(ImageCapture::class.java, targetAspectRatio)
+        val imageAnalysis =
+            createUseCaseWithResolutionSelector(ImageAnalysis::class.java, targetAspectRatio)
+        instrumentation.runOnMainSync {
+            cameraProvider.bindToLifecycle(
+                lifecycleOwner,
+                cameraSelector,
+                preview,
+                imageCapture,
+                imageAnalysis
+            )
+        }
+        assertThat(isResolutionAspectRatioBestMatched(preview, targetAspectRatio)).isTrue()
+        assertThat(isResolutionAspectRatioBestMatched(imageCapture, targetAspectRatio)).isTrue()
+        assertThat(isResolutionAspectRatioBestMatched(imageAnalysis, targetAspectRatio)).isTrue()
+    }
+
+    private fun isResolutionAspectRatioBestMatched(
+        useCase: UseCase,
+        targetAspectRatio: Int
+    ): Boolean {
+        val isMatched =
+            hasMatchingAspectRatio(
+                useCase.attachedSurfaceResolution!!,
+                aspectRatioToRational(targetAspectRatio)
+            )
+
+        if (isMatched) {
+            return true
+        }
+
+        // PRIV/PREVIEW + YUV/PREVIEW + JPEG/MAXIMUM will be used to select resolutions for the
+        // combination of Preview + ImageAnalysis + ImageCapture
+        val closestAspectRatioSizes =
+            if (useCase is Preview || useCase is ImageAnalysis) {
+                getClosestAspectRatioSizesUnderPreviewSize(targetAspectRatio, useCase.javaClass)
+            } else {
+                getClosestAspectRatioSizes(targetAspectRatio, useCase.javaClass)
+            }
+
+        Log.d(
+            "ResolutionSelectorDeviceTest",
+            "The selected resolution (${useCase.attachedSurfaceResolution!!}) does not exactly" +
+                " match the target aspect ratio. It is selected from the closest aspect ratio" +
+                " sizes: $closestAspectRatioSizes"
+        )
+
+        return closestAspectRatioSizes.contains(useCase.attachedSurfaceResolution!!)
+    }
+
+    @Test
+    fun canSelect4x3ResolutionForPreviewByResolutionStrategy() =
+        canSelectResolutionByResolutionStrategy(Preview::class.java, RATIO_4_3)
+
+    @Test
+    fun canSelect16x9ResolutionForPreviewByResolutionStrategy() =
+        canSelectResolutionByResolutionStrategy(Preview::class.java, RATIO_16_9)
+
+    @Test
+    fun canSelect4x3ResolutionForImageCaptureByResolutionStrategy() =
+        canSelectResolutionByResolutionStrategy(ImageCapture::class.java, RATIO_4_3)
+
+    @Test
+    fun canSelect16x9ResolutionForImageCaptureByResolutionStrategy() =
+        canSelectResolutionByResolutionStrategy(ImageCapture::class.java, RATIO_16_9)
+
+    @Test
+    fun canSelect4x3ResolutionForImageAnalysisByResolutionStrategy() =
+        canSelectResolutionByResolutionStrategy(ImageAnalysis::class.java, RATIO_4_3)
+
+    @Test
+    fun canSelect16x9ResolutionForImageAnalysisByResolutionStrategy() =
+        canSelectResolutionByResolutionStrategy(ImageAnalysis::class.java, RATIO_16_9)
+
+    private fun <T : UseCase> canSelectResolutionByResolutionStrategy(
+        useCaseClass: Class<T>,
+        ratio: Int
+    ) {
+        // Filters the output sizes matching the target aspect ratio
+        cameraInfoInternal
+            .getSupportedResolutions(useCaseFormatMap[useCaseClass]!!)
+            .filter { size -> hasMatchingAspectRatio(size, aspectRatioToRational(ratio)) }
+            .let {
+                // Picks the item in the middle of the list to run the test
+                it.elementAtOrNull(it.size / 2)?.let { boundSize ->
+                    {
+                        val useCase =
+                            createUseCaseWithResolutionSelector(
+                                useCaseClass,
+                                aspectRatio = ratio,
+                                aspectRatioStrategyFallbackRule = FALLBACK_RULE_AUTO,
+                                boundSize = boundSize,
+                                resolutionStrategyFallbackRule =
+                                    FALLBACK_RULE_CLOSEST_HIGHER_THEN_LOWER
+                            )
+                        instrumentation.runOnMainSync {
+                            cameraProvider.unbindAll()
+                            cameraProvider.bindToLifecycle(lifecycleOwner, cameraSelector, useCase)
+                        }
+                        assertThat(useCase.attachedSurfaceResolution).isEqualTo(boundSize)
+                    }
+                }
+            }
+    }
+
+    @Test
+    fun canSelectAnyResolutionForPreviewByResolutionFilter() =
+        canSelectAnyResolutionByResolutionFilter(
+            Preview::class.java,
+            // For Preview, need to override resolution strategy so that the output sizes larger
+            // than PREVIEW size can be selected.
+            cameraInfoInternal
+                .getSupportedResolutions(useCaseFormatMap[Preview::class.java]!!)
+                .maxWithOrNull(CompareSizesByArea())
+        )
+
+    @Test
+    fun canSelectAnyHighResolutionForPreviewByResolutionFilter() =
+        canSelectAnyHighResolutionByResolutionFilter(
+            Preview::class.java,
+            // For Preview, need to override resolution strategy so that the output sizes larger
+            // than PREVIEW size can be selected.
+            cameraInfoInternal
+                .getSupportedHighResolutions(useCaseFormatMap[Preview::class.java]!!)
+                .maxWithOrNull(CompareSizesByArea())
+        )
+
+    @Test
+    fun canSelectAnyResolutionForImageCaptureByResolutionFilter() =
+        canSelectAnyResolutionByResolutionFilter(ImageCapture::class.java)
+
+    @Test
+    fun canSelectAnyHighResolutionForImageCaptureByResolutionFilter() =
+        canSelectAnyHighResolutionByResolutionFilter(ImageCapture::class.java)
+
+    @Test
+    fun canSelectAnyResolutionForImageAnalysisByResolutionFilter() =
+        canSelectAnyResolutionByResolutionFilter(ImageAnalysis::class.java)
+
+    @Test
+    fun canSelectAnyHighResolutionForImageAnalysisByResolutionFilter() =
+        canSelectAnyHighResolutionByResolutionFilter(ImageAnalysis::class.java)
+
+    private fun <T : UseCase> canSelectAnyResolutionByResolutionFilter(
+        useCaseClass: Class<T>,
+        boundSize: Size? = null,
+        resolutionStrategyFallbackRule: Int = FALLBACK_RULE_CLOSEST_HIGHER_THEN_LOWER
+    ) =
+        canSelectAnyResolutionByResolutionFilter(
+            useCaseClass,
+            cameraInfoInternal.getSupportedResolutions(useCaseFormatMap[useCaseClass]!!),
+            boundSize,
+            resolutionStrategyFallbackRule
+        )
+
+    private fun <T : UseCase> canSelectAnyHighResolutionByResolutionFilter(
+        useCaseClass: Class<T>,
+        boundSize: Size? = null,
+        resolutionStrategyFallbackRule: Int = FALLBACK_RULE_CLOSEST_HIGHER_THEN_LOWER
+    ) =
+        canSelectAnyResolutionByResolutionFilter(
+            useCaseClass,
+            cameraInfoInternal.getSupportedHighResolutions(useCaseFormatMap[useCaseClass]!!),
+            boundSize,
+            resolutionStrategyFallbackRule,
+            PREFER_HIGHER_RESOLUTION_OVER_CAPTURE_RATE
+        )
+
+    private fun <T : UseCase> canSelectAnyResolutionByResolutionFilter(
+        useCaseClass: Class<T>,
+        outputSizes: List<Size>,
+        boundSize: Size? = null,
+        resolutionStrategyFallbackRule: Int = FALLBACK_RULE_CLOSEST_HIGHER_THEN_LOWER,
+        allowedResolutionMode: Int = PREFER_CAPTURE_RATE_OVER_HIGHER_RESOLUTION
+    ) {
+        outputSizes.forEach { targetResolution ->
+            val useCase =
+                createUseCaseWithResolutionSelector(
+                    useCaseClass,
+                    boundSize = boundSize,
+                    resolutionStrategyFallbackRule = resolutionStrategyFallbackRule,
+                    resolutionFilter = { _, _ -> mutableListOf(targetResolution) },
+                    allowedResolutionMode = allowedResolutionMode
+                )
+            instrumentation.runOnMainSync {
+                cameraProvider.unbindAll()
+                cameraProvider.bindToLifecycle(lifecycleOwner, cameraSelector, useCase)
+            }
+            assertThat(useCase.attachedSurfaceResolution).isEqualTo(targetResolution)
+        }
+    }
+
+    @Test
+    fun canSelectResolutionForSixtyFpsPreview() {
+        assumeTrue(isSixtyFpsSupported())
+
+        val preview = Preview.Builder().setTargetFrameRate(Range.create(60, 60)).build()
+        val imageCapture = ImageCapture.Builder().build()
+
+        instrumentation.runOnMainSync {
+            cameraProvider.bindToLifecycle(lifecycleOwner, cameraSelector, preview, imageCapture)
+        }
+
+        assertThat(getMaxFrameRate(preview.attachedSurfaceResolution!!)).isEqualTo(60)
+    }
+
+    private fun isSixtyFpsSupported() =
+        CameraUtil.getCameraCharacteristics(cameraSelector.lensFacing!!)
+            ?.get(CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES)
+            ?.any { range -> range.upper == 60 } ?: false
+
+    private fun getMaxFrameRate(size: Size) =
+        (1_000_000_000.0 /
+                CameraUtil.getCameraCharacteristics(cameraSelector.lensFacing!!)!!.get(
+                        CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP
+                    )!!
+                    .getOutputMinFrameDuration(SurfaceTexture::class.java, size) + 0.5)
+            .toInt()
+
+    private fun <T : UseCase> createUseCaseWithResolutionSelector(
+        useCaseClass: Class<T>,
+        aspectRatio: Int? = null,
+        aspectRatioStrategyFallbackRule: Int = FALLBACK_RULE_AUTO,
+        boundSize: Size? = null,
+        resolutionStrategyFallbackRule: Int = FALLBACK_RULE_CLOSEST_HIGHER_THEN_LOWER,
+        resolutionFilter: ResolutionFilter? = null,
+        allowedResolutionMode: Int = PREFER_CAPTURE_RATE_OVER_HIGHER_RESOLUTION
+    ): UseCase {
+        val builder =
+            when (useCaseClass) {
+                Preview::class.java -> Preview.Builder()
+                ImageCapture::class.java -> ImageCapture.Builder()
+                ImageAnalysis::class.java -> ImageAnalysis.Builder()
+                else -> throw IllegalArgumentException("Unsupported class type!!")
+            }
+
+        (builder as ImageOutputConfig.Builder<*>).setResolutionSelector(
+            createResolutionSelector(
+                aspectRatio,
+                aspectRatioStrategyFallbackRule,
+                boundSize,
+                resolutionStrategyFallbackRule,
+                resolutionFilter,
+                allowedResolutionMode
+            )
+        )
+
+        return builder.build()
+    }
+
+    private fun createResolutionSelector(
+        aspectRatio: Int? = null,
+        aspectRatioFallbackRule: Int = FALLBACK_RULE_AUTO,
+        boundSize: Size? = null,
+        resolutionFallbackRule: Int = FALLBACK_RULE_CLOSEST_HIGHER_THEN_LOWER,
+        resolutionFilter: ResolutionFilter? = null,
+        allowedResolutionMode: Int = PREFER_CAPTURE_RATE_OVER_HIGHER_RESOLUTION
+    ) =
+        ResolutionSelector.Builder()
+            .apply {
+                aspectRatio?.let {
+                    setAspectRatioStrategy(
+                        AspectRatioStrategy(aspectRatio, aspectRatioFallbackRule)
+                    )
+                }
+                boundSize?.let {
+                    setResolutionStrategy(ResolutionStrategy(boundSize, resolutionFallbackRule))
+                }
+                resolutionFilter?.let { setResolutionFilter(resolutionFilter) }
+                setAllowedResolutionMode(allowedResolutionMode)
+            }
+            .build()
+
+    private fun aspectRatioToRational(ratio: Int) =
+        if (ratio == RATIO_16_9) {
+            ASPECT_RATIO_16_9
+        } else {
+            ASPECT_RATIO_4_3
+        }
+
+    private fun <T : UseCase> getClosestAspectRatioSizesUnderPreviewSize(
+        targetAspectRatio: Int,
+        useCaseClass: Class<T>
+    ): List<Size> {
+        val outputSizes =
+            cameraInfoInternal.getSupportedResolutions(useCaseFormatMap[useCaseClass]!!)
+        return outputSizes
+            .getSmallerThanOrEqualToPreviewScaleSizeSublist()
+            .getClosestAspectRatioSublist(targetAspectRatio)
+    }
+
+    private fun <T : UseCase> getClosestAspectRatioSizes(
+        targetAspectRatio: Int,
+        useCaseClass: Class<T>
+    ): List<Size> {
+        val outputSizes =
+            cameraInfoInternal.getSupportedResolutions(useCaseFormatMap[useCaseClass]!!)
+        return outputSizes.getClosestAspectRatioSublist(targetAspectRatio)
+    }
+
+    private fun List<Size>.getSmallerThanOrEqualToPreviewScaleSizeSublist() = filter { size ->
+        SizeUtil.getArea(size) <= SizeUtil.getArea(getPreviewScaleSize())
+    }
+
+    @Suppress("DEPRECATION")
+    private fun getPreviewScaleSize(): Size {
+        val point = Point()
+        DisplayInfoManager.getInstance(context).getMaxSizeDisplay(false).getRealSize(point)
+        val displaySize = Size(point.x, point.y)
+        return if (SizeUtil.isSmallerByArea(RESOLUTION_1080P, displaySize)) {
+            RESOLUTION_1080P
+        } else {
+            displaySize
+        }
+    }
+
+    private fun List<Size>.getClosestAspectRatioSublist(targetAspectRatio: Int): List<Size> {
+        val sensorRect = (camera.cameraControl as RestrictedCameraControl).sensorRect
+        val aspectRatios = getResolutionListGroupingAspectRatioKeys(this)
+        val sortedAspectRatios =
+            aspectRatios.sortedWith(
+                AspectRatioUtil.CompareAspectRatiosByMappingAreaInFullFovAspectRatioSpace(
+                    aspectRatioToRational(targetAspectRatio),
+                    Rational(sensorRect.width(), sensorRect.height())
+                )
+            )
+        val groupedRatioToSizesMap = groupSizesByAspectRatio(this)
+
+        for (ratio in sortedAspectRatios) {
+            groupedRatioToSizesMap[ratio]?.let {
+                if (it.isNotEmpty()) {
+                    return it
+                }
+            }
+        }
+
+        fail("There should have one non-empty size list returned.")
+    }
+
+    /**
+     * Returns the grouping aspect ratio keys of the input resolution list.
+     *
+     * Some sizes might be mod16 case. When grouping, those sizes will be grouped into an existing
+     * aspect ratio group if the aspect ratio can match by the mod16 rule.
+     */
+    private fun getResolutionListGroupingAspectRatioKeys(
+        resolutionCandidateList: List<Size>
+    ): List<Rational> {
+        val aspectRatios = mutableListOf<Rational>()
+
+        // Adds the default 4:3 and 16:9 items first to avoid their mod16 sizes to create
+        // additional items.
+        aspectRatios.add(ASPECT_RATIO_4_3)
+        aspectRatios.add(ASPECT_RATIO_16_9)
+
+        // Tries to find the aspect ratio which the target size belongs to.
+        for (size in resolutionCandidateList) {
+            val newRatio = Rational(size.width, size.height)
+            val aspectRatioFound = aspectRatios.contains(newRatio)
+
+            // The checking size might be a mod16 size which can be mapped to an existing aspect
+            // ratio group.
+            if (!aspectRatioFound) {
+                var hasMatchingAspectRatio = false
+                for (aspectRatio in aspectRatios) {
+                    if (hasMatchingAspectRatio(size, aspectRatio)) {
+                        hasMatchingAspectRatio = true
+                        break
+                    }
+                }
+                if (!hasMatchingAspectRatio) {
+                    aspectRatios.add(newRatio)
+                }
+            }
+        }
+
+        return aspectRatios
+    }
+
+    /** Groups the input sizes into an aspect ratio to size list map. */
+    private fun groupSizesByAspectRatio(sizes: List<Size>): Map<Rational, MutableList<Size>> {
+        val aspectRatioSizeListMap = mutableMapOf<Rational, MutableList<Size>>()
+        val aspectRatioKeys = getResolutionListGroupingAspectRatioKeys(sizes)
+
+        for (aspectRatio in aspectRatioKeys) {
+            aspectRatioSizeListMap[aspectRatio] = mutableListOf()
+        }
+
+        for (outputSize in sizes) {
+            for (key in aspectRatioSizeListMap.keys) {
+                // Put the size into all groups that is matched in mod16 condition since a size
+                // may match multiple aspect ratio in mod16 algorithm.
+                if (hasMatchingAspectRatio(outputSize, key)) {
+                    aspectRatioSizeListMap[key]!!.add(outputSize)
+                }
+            }
+        }
+
+        return aspectRatioSizeListMap
+    }
+
+    // Skips the tests when the devices have any of the quirks that might affect the selected
+    // resolution.
+    private fun assumeNotAspectRatioQuirkDevice() {
+        assumeFalse(hasAspectRatioLegacyApi21Quirk())
+        assumeFalse(hasNexus4AndroidLTargetAspectRatioQuirk())
+        assumeFalse(hasExtraCroppingQuirk())
+    }
+
+    // Checks whether it is the device for AspectRatioLegacyApi21Quirk
+    private fun hasAspectRatioLegacyApi21Quirk(): Boolean {
+        val quirks = cameraInfoInternal.cameraQuirks
+
+        return if (implName == CameraPipeConfig::class.simpleName) {
+            quirks.contains(
+                androidx.camera.camera2.pipe.integration.compat.quirk
+                        .AspectRatioLegacyApi21Quirk::class
+                    .java
+            )
+        } else {
+            quirks.contains(
+                androidx.camera.camera2.internal.compat.quirk.AspectRatioLegacyApi21Quirk::class
+                    .java
+            )
+        }
+    }
+
+    // Checks whether it is the device for Nexus4AndroidLTargetAspectRatioQuirk
+    private fun hasNexus4AndroidLTargetAspectRatioQuirk() =
+        if (implName == CameraPipeConfig::class.simpleName) {
+            hasDeviceQuirk(
+                androidx.camera.camera2.pipe.integration.compat.quirk
+                        .Nexus4AndroidLTargetAspectRatioQuirk::class
+                    .java
+            )
+        } else {
+            hasDeviceQuirk(
+                androidx.camera.camera2.internal.compat.quirk
+                        .Nexus4AndroidLTargetAspectRatioQuirk::class
+                    .java
+            )
+        }
+
+    // Checks whether it is the device for ExtraCroppingQuirk
+    private fun hasExtraCroppingQuirk() =
+        if (implName == CameraPipeConfig::class.simpleName) {
+            hasDeviceQuirk(
+                androidx.camera.camera2.pipe.integration.compat.quirk.ExtraCroppingQuirk::class.java
+            )
+        } else {
+            hasDeviceQuirk(
+                androidx.camera.camera2.internal.compat.quirk.ExtraCroppingQuirk::class.java
+            )
+        }
+
+    // Skips the tests when the devices have any of the quirks that might affect the selected
+    // resolution.
+    private fun assumeNotOutputSizeQuirkDevice() {
+        assumeFalse(hasExcludedSupportedSizesQuirk())
+        assumeFalse(hasExtraSupportedOutputSizeQuirk())
+    }
+
+    private fun hasExcludedSupportedSizesQuirk() =
+        if (implName == CameraPipeConfig::class.simpleName) {
+            hasDeviceQuirk(
+                androidx.camera.camera2.pipe.integration.compat.quirk
+                        .ExcludedSupportedSizesQuirk::class
+                    .java
+            )
+        } else {
+            hasDeviceQuirk(
+                androidx.camera.camera2.internal.compat.quirk.ExcludedSupportedSizesQuirk::class
+                    .java
+            )
+        }
+
+    private fun hasExtraSupportedOutputSizeQuirk() =
+        if (implName == CameraPipeConfig::class.simpleName) {
+            hasDeviceQuirk(
+                androidx.camera.camera2.pipe.integration.compat.quirk
+                        .ExtraSupportedOutputSizeQuirk::class
+                    .java
+            )
+        } else {
+            hasDeviceQuirk(
+                androidx.camera.camera2.internal.compat.quirk.ExtraSupportedOutputSizeQuirk::class
+                    .java
+            )
+        }
+
+    private fun <T : Quirk?> hasDeviceQuirk(quirkClass: Class<T>) =
+        if (implName == CameraPipeConfig::class.simpleName) {
+            androidx.camera.camera2.pipe.integration.compat.quirk.DeviceQuirks.get(quirkClass)
+        } else {
+            androidx.camera.camera2.internal.compat.quirk.DeviceQuirks.get(quirkClass)
+        } != null
+}
diff --git a/car/app/app/api/1.7.0-beta02.txt b/car/app/app/api/1.7.0-beta02.txt
index 63d6309..2bc33d2 100644
--- a/car/app/app/api/1.7.0-beta02.txt
+++ b/car/app/app/api/1.7.0-beta02.txt
@@ -903,6 +903,16 @@
     field public static final String KEY_ROOT_HINT_MEDIA_SESSION_API = "androidx.car.app.mediaextensions.KEY_ROOT_HINT_MEDIA_SESSION_API";
   }
 
+  public class MediaIntentExtras {
+    field public static final String ACTION_MEDIA_TEMPLATE_V2 = "androidx.car.app.mediaextensions.action.MEDIA_TEMPLATE_V2";
+    field public static final String EXTRA_KEY_MEDIA_COMPONENT = "android.car.intent.extra.MEDIA_COMPONENT";
+    field public static final String EXTRA_KEY_MEDIA_ID = "androidx.car.app.mediaextensions.extra.KEY_MEDIA_ID";
+    field public static final String EXTRA_KEY_SEARCH_ACTION = "androidx.car.app.mediaextensions.extra.KEY_SEARCH_ACTION";
+    field public static final String EXTRA_KEY_SEARCH_QUERY = "android.car.media.extra.SEARCH_QUERY";
+    field public static final int EXTRA_VALUE_NO_SEARCH_ACTION = 0; // 0x0
+    field public static final int EXTRA_VALUE_PLAY_FIRST_ITEM_FROM_SEARCH = 1; // 0x1
+  }
+
   public final class MetadataExtras {
     field public static final String KEY_CONTENT_FORMAT_TINTABLE_LARGE_ICON_URI = "androidx.car.app.mediaextensions.KEY_CONTENT_FORMAT_TINTABLE_LARGE_ICON_URI";
     field public static final String KEY_CONTENT_FORMAT_TINTABLE_SMALL_ICON_URI = "androidx.car.app.mediaextensions.KEY_CONTENT_FORMAT_TINTABLE_SMALL_ICON_URI";
@@ -1804,13 +1814,9 @@
     field public static final String CONTENT_ID = "TAB_CONTENTS_CONTENT_ID";
   }
 
-  @SuppressCompatibility @androidx.car.app.annotations.ExperimentalCarApi public static final class TabContents.Api8Builder {
-    ctor public TabContents.Api8Builder(androidx.car.app.model.Template);
-    method public androidx.car.app.model.TabContents build();
-  }
-
   public static final class TabContents.Builder {
     ctor public TabContents.Builder(androidx.car.app.model.Template);
+    ctor @SuppressCompatibility @androidx.car.app.annotations.ExperimentalCarApi public TabContents.Builder(androidx.car.app.model.Template, boolean);
     method public androidx.car.app.model.TabContents build();
   }
 
diff --git a/car/app/app/api/current.ignore b/car/app/app/api/current.ignore
new file mode 100644
index 0000000..0ba421d
--- /dev/null
+++ b/car/app/app/api/current.ignore
@@ -0,0 +1,3 @@
+// Baseline format: 1.0
+AddedClass: androidx.car.app.mediaextensions.MediaIntentExtras:
+    Added class androidx.car.app.mediaextensions.MediaIntentExtras
diff --git a/car/app/app/api/current.txt b/car/app/app/api/current.txt
index 63d6309..2bc33d2 100644
--- a/car/app/app/api/current.txt
+++ b/car/app/app/api/current.txt
@@ -903,6 +903,16 @@
     field public static final String KEY_ROOT_HINT_MEDIA_SESSION_API = "androidx.car.app.mediaextensions.KEY_ROOT_HINT_MEDIA_SESSION_API";
   }
 
+  public class MediaIntentExtras {
+    field public static final String ACTION_MEDIA_TEMPLATE_V2 = "androidx.car.app.mediaextensions.action.MEDIA_TEMPLATE_V2";
+    field public static final String EXTRA_KEY_MEDIA_COMPONENT = "android.car.intent.extra.MEDIA_COMPONENT";
+    field public static final String EXTRA_KEY_MEDIA_ID = "androidx.car.app.mediaextensions.extra.KEY_MEDIA_ID";
+    field public static final String EXTRA_KEY_SEARCH_ACTION = "androidx.car.app.mediaextensions.extra.KEY_SEARCH_ACTION";
+    field public static final String EXTRA_KEY_SEARCH_QUERY = "android.car.media.extra.SEARCH_QUERY";
+    field public static final int EXTRA_VALUE_NO_SEARCH_ACTION = 0; // 0x0
+    field public static final int EXTRA_VALUE_PLAY_FIRST_ITEM_FROM_SEARCH = 1; // 0x1
+  }
+
   public final class MetadataExtras {
     field public static final String KEY_CONTENT_FORMAT_TINTABLE_LARGE_ICON_URI = "androidx.car.app.mediaextensions.KEY_CONTENT_FORMAT_TINTABLE_LARGE_ICON_URI";
     field public static final String KEY_CONTENT_FORMAT_TINTABLE_SMALL_ICON_URI = "androidx.car.app.mediaextensions.KEY_CONTENT_FORMAT_TINTABLE_SMALL_ICON_URI";
@@ -1804,13 +1814,9 @@
     field public static final String CONTENT_ID = "TAB_CONTENTS_CONTENT_ID";
   }
 
-  @SuppressCompatibility @androidx.car.app.annotations.ExperimentalCarApi public static final class TabContents.Api8Builder {
-    ctor public TabContents.Api8Builder(androidx.car.app.model.Template);
-    method public androidx.car.app.model.TabContents build();
-  }
-
   public static final class TabContents.Builder {
     ctor public TabContents.Builder(androidx.car.app.model.Template);
+    ctor @SuppressCompatibility @androidx.car.app.annotations.ExperimentalCarApi public TabContents.Builder(androidx.car.app.model.Template, boolean);
     method public androidx.car.app.model.TabContents build();
   }
 
diff --git a/car/app/app/api/restricted_1.7.0-beta02.txt b/car/app/app/api/restricted_1.7.0-beta02.txt
index 63d6309..2bc33d2 100644
--- a/car/app/app/api/restricted_1.7.0-beta02.txt
+++ b/car/app/app/api/restricted_1.7.0-beta02.txt
@@ -903,6 +903,16 @@
     field public static final String KEY_ROOT_HINT_MEDIA_SESSION_API = "androidx.car.app.mediaextensions.KEY_ROOT_HINT_MEDIA_SESSION_API";
   }
 
+  public class MediaIntentExtras {
+    field public static final String ACTION_MEDIA_TEMPLATE_V2 = "androidx.car.app.mediaextensions.action.MEDIA_TEMPLATE_V2";
+    field public static final String EXTRA_KEY_MEDIA_COMPONENT = "android.car.intent.extra.MEDIA_COMPONENT";
+    field public static final String EXTRA_KEY_MEDIA_ID = "androidx.car.app.mediaextensions.extra.KEY_MEDIA_ID";
+    field public static final String EXTRA_KEY_SEARCH_ACTION = "androidx.car.app.mediaextensions.extra.KEY_SEARCH_ACTION";
+    field public static final String EXTRA_KEY_SEARCH_QUERY = "android.car.media.extra.SEARCH_QUERY";
+    field public static final int EXTRA_VALUE_NO_SEARCH_ACTION = 0; // 0x0
+    field public static final int EXTRA_VALUE_PLAY_FIRST_ITEM_FROM_SEARCH = 1; // 0x1
+  }
+
   public final class MetadataExtras {
     field public static final String KEY_CONTENT_FORMAT_TINTABLE_LARGE_ICON_URI = "androidx.car.app.mediaextensions.KEY_CONTENT_FORMAT_TINTABLE_LARGE_ICON_URI";
     field public static final String KEY_CONTENT_FORMAT_TINTABLE_SMALL_ICON_URI = "androidx.car.app.mediaextensions.KEY_CONTENT_FORMAT_TINTABLE_SMALL_ICON_URI";
@@ -1804,13 +1814,9 @@
     field public static final String CONTENT_ID = "TAB_CONTENTS_CONTENT_ID";
   }
 
-  @SuppressCompatibility @androidx.car.app.annotations.ExperimentalCarApi public static final class TabContents.Api8Builder {
-    ctor public TabContents.Api8Builder(androidx.car.app.model.Template);
-    method public androidx.car.app.model.TabContents build();
-  }
-
   public static final class TabContents.Builder {
     ctor public TabContents.Builder(androidx.car.app.model.Template);
+    ctor @SuppressCompatibility @androidx.car.app.annotations.ExperimentalCarApi public TabContents.Builder(androidx.car.app.model.Template, boolean);
     method public androidx.car.app.model.TabContents build();
   }
 
diff --git a/car/app/app/api/restricted_current.ignore b/car/app/app/api/restricted_current.ignore
new file mode 100644
index 0000000..0ba421d
--- /dev/null
+++ b/car/app/app/api/restricted_current.ignore
@@ -0,0 +1,3 @@
+// Baseline format: 1.0
+AddedClass: androidx.car.app.mediaextensions.MediaIntentExtras:
+    Added class androidx.car.app.mediaextensions.MediaIntentExtras
diff --git a/car/app/app/api/restricted_current.txt b/car/app/app/api/restricted_current.txt
index 63d6309..2bc33d2 100644
--- a/car/app/app/api/restricted_current.txt
+++ b/car/app/app/api/restricted_current.txt
@@ -903,6 +903,16 @@
     field public static final String KEY_ROOT_HINT_MEDIA_SESSION_API = "androidx.car.app.mediaextensions.KEY_ROOT_HINT_MEDIA_SESSION_API";
   }
 
+  public class MediaIntentExtras {
+    field public static final String ACTION_MEDIA_TEMPLATE_V2 = "androidx.car.app.mediaextensions.action.MEDIA_TEMPLATE_V2";
+    field public static final String EXTRA_KEY_MEDIA_COMPONENT = "android.car.intent.extra.MEDIA_COMPONENT";
+    field public static final String EXTRA_KEY_MEDIA_ID = "androidx.car.app.mediaextensions.extra.KEY_MEDIA_ID";
+    field public static final String EXTRA_KEY_SEARCH_ACTION = "androidx.car.app.mediaextensions.extra.KEY_SEARCH_ACTION";
+    field public static final String EXTRA_KEY_SEARCH_QUERY = "android.car.media.extra.SEARCH_QUERY";
+    field public static final int EXTRA_VALUE_NO_SEARCH_ACTION = 0; // 0x0
+    field public static final int EXTRA_VALUE_PLAY_FIRST_ITEM_FROM_SEARCH = 1; // 0x1
+  }
+
   public final class MetadataExtras {
     field public static final String KEY_CONTENT_FORMAT_TINTABLE_LARGE_ICON_URI = "androidx.car.app.mediaextensions.KEY_CONTENT_FORMAT_TINTABLE_LARGE_ICON_URI";
     field public static final String KEY_CONTENT_FORMAT_TINTABLE_SMALL_ICON_URI = "androidx.car.app.mediaextensions.KEY_CONTENT_FORMAT_TINTABLE_SMALL_ICON_URI";
@@ -1804,13 +1814,9 @@
     field public static final String CONTENT_ID = "TAB_CONTENTS_CONTENT_ID";
   }
 
-  @SuppressCompatibility @androidx.car.app.annotations.ExperimentalCarApi public static final class TabContents.Api8Builder {
-    ctor public TabContents.Api8Builder(androidx.car.app.model.Template);
-    method public androidx.car.app.model.TabContents build();
-  }
-
   public static final class TabContents.Builder {
     ctor public TabContents.Builder(androidx.car.app.model.Template);
+    ctor @SuppressCompatibility @androidx.car.app.annotations.ExperimentalCarApi public TabContents.Builder(androidx.car.app.model.Template, boolean);
     method public androidx.car.app.model.TabContents build();
   }
 
diff --git a/car/app/app/src/main/java/androidx/car/app/mediaextensions/MediaIntentExtras.java b/car/app/app/src/main/java/androidx/car/app/mediaextensions/MediaIntentExtras.java
new file mode 100644
index 0000000..88bcb08
--- /dev/null
+++ b/car/app/app/src/main/java/androidx/car/app/mediaextensions/MediaIntentExtras.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2024 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.car.app.mediaextensions;
+
+/**
+ * Defines constants for action and extra keys for CarMediaApp.
+ */
+public class MediaIntentExtras {
+
+    // Do not instantiate
+    private MediaIntentExtras() {
+    }
+
+    /**
+     * Activity Action: Provide media playing through a media template app. The usage is the same as
+     * <a href="https://developer.android.com/reference/android/car/media/CarMediaIntents#ACTION_MEDIA_TEMPLATE">ACTION_MEDIA_TEMPLATE</a>
+     * A V2 is provided so that the media apps can know whether the system they run on supports the
+     * new parameters.
+     * <p> Input: these optional extras
+     * <ul>
+     * <li> {@link #EXTRA_KEY_MEDIA_COMPONENT} </li>
+     * <li> {@link #EXTRA_KEY_MEDIA_ID} </li>
+     * <li> {@link #EXTRA_KEY_SEARCH_QUERY} </li>
+     * <li> {@link #EXTRA_KEY_SEARCH_ACTION} </li>
+     * </ul>
+     * If no extra is specified, the current media source is opened.
+     */
+    public static final String ACTION_MEDIA_TEMPLATE_V2 =
+            "androidx.car.app.mediaextensions.action.MEDIA_TEMPLATE_V2";
+
+    /**
+     * {@link Bundle} key used as a string extra field with {@link #ACTION_MEDIA_TEMPLATE_V2} to
+     * specify the MediaBrowserService that user wants to start the media on.
+     * <p>TYPE: String.
+     * The value of this extra is the same as the
+     * <a href="https://developer.android.com/reference/android/car/media/CarMediaIntents#EXTRA_MEDIA_COMPONENT">EXTRA_MEDIA_COMPONENT</a>
+     * for easy access for 3P developers.
+     */
+    @SuppressWarnings("ActionValue")
+    public static final String EXTRA_KEY_MEDIA_COMPONENT =
+            "android.car.intent.extra.MEDIA_COMPONENT";
+
+    /**
+     * {@link Bundle} key used as a string extra field with {@link #ACTION_MEDIA_TEMPLATE_V2} to
+     * specify the media item that should be displayed in the browse view. Must match the ids used
+     * in the MediaBrowserServiceCompat api.
+     * <p>TYPE: String.
+     */
+    public static final String EXTRA_KEY_MEDIA_ID =
+            "androidx.car.app.mediaextensions.extra.KEY_MEDIA_ID";
+
+    /**
+     * {@link Bundle} key used as a string extra field with {@link #ACTION_MEDIA_TEMPLATE_V2} to
+     * specify the search query to send either to the current MediaBrowserService or the one
+     * specified with {@link #EXTRA_KEY_MEDIA_COMPONENT}.
+     * <p>TYPE: String.
+     * The value of this extra is the same as the
+     * <a href="https://developer.android.com/reference/android/car/media/CarMediaIntents#EXTRA_SEARCH_QUERY">EXTRA_SEARCH_QUERY</a>
+     * for easy access for 3P developers.
+     */
+    @SuppressWarnings("ActionValue")
+    public static final String EXTRA_KEY_SEARCH_QUERY =
+            "android.car.media.extra.SEARCH_QUERY";
+
+    /**
+     * {@link Bundle} key used as an int extra field with {@link #ACTION_MEDIA_TEMPLATE_V2} to
+     * specify the action for the Media Center to do after the search query is loaded.
+     * <p>TYPE: int.
+     * The value will be one of the following:
+     * {@link #EXTRA_VALUE_NO_SEARCH_ACTION},
+     * {@link #EXTRA_VALUE_PLAY_FIRST_ITEM_FROM_SEARCH},
+     * This extra should only be used together with {@link #EXTRA_KEY_SEARCH_QUERY}. If this extra
+     * is not specified, then no further action will be taken after the search results are loaded.
+     */
+    public static final String EXTRA_KEY_SEARCH_ACTION =
+            "androidx.car.app.mediaextensions.extra.KEY_SEARCH_ACTION";
+
+    /**
+     * The extra value to indicate that no further action will be taken after the search results are
+     * loaded from a search query. Used with {@link #EXTRA_KEY_SEARCH_QUERY}.
+     */
+    public static final int EXTRA_VALUE_NO_SEARCH_ACTION = 0;
+
+    /**
+     * The extra value to indicate that the first playable item will automatically be played from
+     * the displayed search results after a search query is done. Used with
+     * {@link #EXTRA_KEY_SEARCH_QUERY}.
+     */
+    public static final int EXTRA_VALUE_PLAY_FIRST_ITEM_FROM_SEARCH = 1;
+}
diff --git a/car/app/app/src/main/java/androidx/car/app/model/TabContents.java b/car/app/app/src/main/java/androidx/car/app/model/TabContents.java
index c9e3593..073334e 100644
--- a/car/app/app/src/main/java/androidx/car/app/model/TabContents.java
+++ b/car/app/app/src/main/java/androidx/car/app/model/TabContents.java
@@ -92,11 +92,6 @@
         mTemplate = builder.mTemplate;
     }
 
-    @ExperimentalCarApi
-    TabContents(TabContents.Api8Builder builder) {
-        mTemplate = builder.mTemplate;
-    }
-
     /** Constructs an empty instance, used by serialization code. */
     private TabContents() {
         mTemplate = null;
@@ -131,7 +126,7 @@
          *     <li>{@code SearchTemplate}
          * </ul>
          *
-         * <p>From Car API 7 onward, the following templates types are supported as content in
+         * <p>From Car API 7 onward, the following template type is supported as content in
          * addition to all previously supported template types:
          * <ul>
          *     <li>{@code NavigationTemplate}
@@ -144,45 +139,45 @@
             TabContentsConstraints.API_7.validateOrThrow(requireNonNull(template));
             mTemplate = template;
         }
-    }
-
-    /** A builder of {@link TabContents} which supports templates added in API 8. */
-    @ExperimentalCarApi
-    public static final class Api8Builder {
-        @NonNull
-        Template mTemplate;
 
         /**
-         * Constructs the {@link TabContents} defined by this builder.
-         */
-        @NonNull
-        public TabContents build() {
-            return new TabContents(this);
-        }
-
-        /**
-         * Creates a {@link TabContents.Api8Builder} instance using the given {@link Template} to
-         * display as contents.
+         * Creates a {@link TabContents.Builder} instance using the given {@link Template} to
+         * display as contents. Additional template types are enabled if enableApi8 is set to true.
          *
          * <p>There should be no title, Header {@link Action} or {@link ActionStrip} set on the
          * template. The host will ignore these.
          *
-         * <p>From Car API 8, the following template types are supported as content:
+         * <p>From Car API 6 onward, the following template types are supported as content:
          * <ul>
          *     <li>{@code ListTemplate}
          *     <li>{@code PaneTemplate}
          *     <li>{@code GridTemplate}
          *     <li>{@code MessageTemplate}
          *     <li>{@code SearchTemplate}
+         * </ul>
+         *
+         * <p>From Car API 7 onward, the following template type is supported as content in
+         * addition to all previously supported template types:
+         * <ul>
          *     <li>{@code NavigationTemplate}
+         * </ul>
+         *
+         * <p>From Car API 8 onward, the following template type is supported as content in
+         * addition to all previously supported template types:
+         * <ul>
          *     <li>{@code SectionedItemTemplate}
          * </ul>
          *
          * @throws NullPointerException     if {@code template} is null
          * @throws IllegalArgumentException if {@code template} does not meet the requirements
          */
-        public Api8Builder(@NonNull Template template) {
-            TabContentsConstraints.API_8.validateOrThrow(requireNonNull(template));
+        @ExperimentalCarApi
+        public Builder(@NonNull Template template, boolean enableApi8) {
+            if (enableApi8) {
+                TabContentsConstraints.API_8.validateOrThrow(requireNonNull(template));
+            } else {
+                TabContentsConstraints.API_7.validateOrThrow(requireNonNull(template));
+            }
             mTemplate = template;
         }
     }
diff --git a/car/app/app/src/test/java/androidx/car/app/model/TabContentsTest.java b/car/app/app/src/test/java/androidx/car/app/model/TabContentsTest.java
index 1d3949b..b9b3b30 100644
--- a/car/app/app/src/test/java/androidx/car/app/model/TabContentsTest.java
+++ b/car/app/app/src/test/java/androidx/car/app/model/TabContentsTest.java
@@ -106,7 +106,7 @@
                         new Header.Builder().setTitle("title").build()
                 ).build();
 
-        TabContents tabContents = new TabContents.Api8Builder(template).build();
+        TabContents tabContents = new TabContents.Builder(template, /* enableApi8= */ true).build();
 
         assertEquals(template, tabContents.getTemplate());
     }
diff --git a/collection/collection/build.gradle b/collection/collection/build.gradle
index ff66423..7833819 100644
--- a/collection/collection/build.gradle
+++ b/collection/collection/build.gradle
@@ -53,7 +53,7 @@
         commonMain {
             dependencies {
                 api(libs.kotlinStdlib)
-                api("androidx.annotation:annotation:1.9.0-alpha02")
+                api(project(":annotation:annotation"))
             }
         }
 
diff --git a/collection/collection/src/commonMain/kotlin/androidx/collection/DoubleList.kt b/collection/collection/src/commonMain/kotlin/androidx/collection/DoubleList.kt
index 5da46d1..5b23890 100644
--- a/collection/collection/src/commonMain/kotlin/androidx/collection/DoubleList.kt
+++ b/collection/collection/src/commonMain/kotlin/androidx/collection/DoubleList.kt
@@ -290,7 +290,7 @@
      */
     public operator fun get(@IntRange(from = 0) index: Int): Double {
         if (index !in 0 until _size) {
-            throwIndexOutOfBoundsException("")
+            throwIndexOutOfBoundsException("Index must be between 0 and size")
         }
         return content[index]
     }
@@ -301,7 +301,7 @@
      */
     public fun elementAt(@IntRange(from = 0) index: Int): Double {
         if (index !in 0 until _size) {
-            throwIndexOutOfBoundsException("")
+            throwIndexOutOfBoundsException("Index must be between 0 and size")
         }
         return content[index]
     }
@@ -576,7 +576,7 @@
      */
     public fun add(@IntRange(from = 0) index: Int, element: Double) {
         if (index !in 0.._size) {
-            throwIndexOutOfBoundsException("")
+            throwIndexOutOfBoundsException("Index must be between 0 and size")
         }
         ensureCapacity(_size + 1)
         val content = content
@@ -777,7 +777,7 @@
      */
     public fun removeAt(@IntRange(from = 0) index: Int): Double {
         if (index !in 0 until _size) {
-            throwIndexOutOfBoundsException("")
+            throwIndexOutOfBoundsException("Index must be between 0 and size")
         }
         val content = content
         val item = content[index]
@@ -801,10 +801,10 @@
      */
     public fun removeRange(@IntRange(from = 0) start: Int, @IntRange(from = 0) end: Int) {
         if (start !in 0.._size || end !in 0.._size) {
-            throwIndexOutOfBoundsException("")
+            throwIndexOutOfBoundsException("Index must be between 0 and size")
         }
         if (end < start) {
-            throwIllegalArgumentException("")
+            throwIllegalArgumentException("The end index must be < start index")
         }
         if (end != start) {
             if (end < _size) {
@@ -861,7 +861,7 @@
      */
     public operator fun set(@IntRange(from = 0) index: Int, element: Double): Double {
         if (index !in 0 until _size) {
-            throwIndexOutOfBoundsException("")
+            throwIndexOutOfBoundsException("Index must be between 0 and size")
         }
         val content = content
         val old = content[index]
diff --git a/collection/collection/src/commonMain/kotlin/androidx/collection/FloatList.kt b/collection/collection/src/commonMain/kotlin/androidx/collection/FloatList.kt
index f8fa448..3bf1ac3 100644
--- a/collection/collection/src/commonMain/kotlin/androidx/collection/FloatList.kt
+++ b/collection/collection/src/commonMain/kotlin/androidx/collection/FloatList.kt
@@ -288,7 +288,7 @@
      */
     public operator fun get(@IntRange(from = 0) index: Int): Float {
         if (index !in 0 until _size) {
-            throwIndexOutOfBoundsException("")
+            throwIndexOutOfBoundsException("Index must be between 0 and size")
         }
         return content[index]
     }
@@ -299,7 +299,7 @@
      */
     public fun elementAt(@IntRange(from = 0) index: Int): Float {
         if (index !in 0 until _size) {
-            throwIndexOutOfBoundsException("")
+            throwIndexOutOfBoundsException("Index must be between 0 and size")
         }
         return content[index]
     }
@@ -573,7 +573,7 @@
      */
     public fun add(@IntRange(from = 0) index: Int, element: Float) {
         if (index !in 0.._size) {
-            throwIndexOutOfBoundsException("")
+            throwIndexOutOfBoundsException("Index must be between 0 and size")
         }
         ensureCapacity(_size + 1)
         val content = content
@@ -774,7 +774,7 @@
      */
     public fun removeAt(@IntRange(from = 0) index: Int): Float {
         if (index !in 0 until _size) {
-            throwIndexOutOfBoundsException("")
+            throwIndexOutOfBoundsException("Index must be between 0 and size")
         }
         val content = content
         val item = content[index]
@@ -798,10 +798,10 @@
      */
     public fun removeRange(@IntRange(from = 0) start: Int, @IntRange(from = 0) end: Int) {
         if (start !in 0.._size || end !in 0.._size) {
-            throwIndexOutOfBoundsException("")
+            throwIndexOutOfBoundsException("Index must be between 0 and size")
         }
         if (end < start) {
-            throwIllegalArgumentException("")
+            throwIllegalArgumentException("The end index must be < start index")
         }
         if (end != start) {
             if (end < _size) {
@@ -858,7 +858,7 @@
      */
     public operator fun set(@IntRange(from = 0) index: Int, element: Float): Float {
         if (index !in 0 until _size) {
-            throwIndexOutOfBoundsException("")
+            throwIndexOutOfBoundsException("Index must be between 0 and size")
         }
         val content = content
         val old = content[index]
diff --git a/collection/collection/src/commonMain/kotlin/androidx/collection/IntList.kt b/collection/collection/src/commonMain/kotlin/androidx/collection/IntList.kt
index 37f2510..a4e6036 100644
--- a/collection/collection/src/commonMain/kotlin/androidx/collection/IntList.kt
+++ b/collection/collection/src/commonMain/kotlin/androidx/collection/IntList.kt
@@ -288,7 +288,7 @@
      */
     public operator fun get(@IntRange(from = 0) index: Int): Int {
         if (index !in 0 until _size) {
-            throwIndexOutOfBoundsException("")
+            throwIndexOutOfBoundsException("Index must be between 0 and size")
         }
         return content[index]
     }
@@ -299,7 +299,7 @@
      */
     public fun elementAt(@IntRange(from = 0) index: Int): Int {
         if (index !in 0 until _size) {
-            throwIndexOutOfBoundsException("")
+            throwIndexOutOfBoundsException("Index must be between 0 and size")
         }
         return content[index]
     }
@@ -570,7 +570,7 @@
      */
     public fun add(@IntRange(from = 0) index: Int, element: Int) {
         if (index !in 0.._size) {
-            throwIndexOutOfBoundsException("")
+            throwIndexOutOfBoundsException("Index must be between 0 and size")
         }
         ensureCapacity(_size + 1)
         val content = content
@@ -768,7 +768,7 @@
      */
     public fun removeAt(@IntRange(from = 0) index: Int): Int {
         if (index !in 0 until _size) {
-            throwIndexOutOfBoundsException("")
+            throwIndexOutOfBoundsException("Index must be between 0 and size")
         }
         val content = content
         val item = content[index]
@@ -792,10 +792,10 @@
      */
     public fun removeRange(@IntRange(from = 0) start: Int, @IntRange(from = 0) end: Int) {
         if (start !in 0.._size || end !in 0.._size) {
-            throwIndexOutOfBoundsException("")
+            throwIndexOutOfBoundsException("Index must be between 0 and size")
         }
         if (end < start) {
-            throwIllegalArgumentException("")
+            throwIllegalArgumentException("The end index must be < start index")
         }
         if (end != start) {
             if (end < _size) {
@@ -852,7 +852,7 @@
      */
     public operator fun set(@IntRange(from = 0) index: Int, element: Int): Int {
         if (index !in 0 until _size) {
-            throwIndexOutOfBoundsException("")
+            throwIndexOutOfBoundsException("Index must be between 0 and size")
         }
         val content = content
         val old = content[index]
diff --git a/collection/collection/src/commonMain/kotlin/androidx/collection/LongList.kt b/collection/collection/src/commonMain/kotlin/androidx/collection/LongList.kt
index 522220b..8f4a32e 100644
--- a/collection/collection/src/commonMain/kotlin/androidx/collection/LongList.kt
+++ b/collection/collection/src/commonMain/kotlin/androidx/collection/LongList.kt
@@ -288,7 +288,7 @@
      */
     public operator fun get(@IntRange(from = 0) index: Int): Long {
         if (index !in 0 until _size) {
-            throwIndexOutOfBoundsException("")
+            throwIndexOutOfBoundsException("Index must be between 0 and size")
         }
         return content[index]
     }
@@ -299,7 +299,7 @@
      */
     public fun elementAt(@IntRange(from = 0) index: Int): Long {
         if (index !in 0 until _size) {
-            throwIndexOutOfBoundsException("")
+            throwIndexOutOfBoundsException("Index must be between 0 and size")
         }
         return content[index]
     }
@@ -571,7 +571,7 @@
      */
     public fun add(@IntRange(from = 0) index: Int, element: Long) {
         if (index !in 0.._size) {
-            throwIndexOutOfBoundsException("")
+            throwIndexOutOfBoundsException("Index must be between 0 and size")
         }
         ensureCapacity(_size + 1)
         val content = content
@@ -770,7 +770,7 @@
      */
     public fun removeAt(@IntRange(from = 0) index: Int): Long {
         if (index !in 0 until _size) {
-            throwIndexOutOfBoundsException("")
+            throwIndexOutOfBoundsException("Index must be between 0 and size")
         }
         val content = content
         val item = content[index]
@@ -794,10 +794,10 @@
      */
     public fun removeRange(@IntRange(from = 0) start: Int, @IntRange(from = 0) end: Int) {
         if (start !in 0.._size || end !in 0.._size) {
-            throwIndexOutOfBoundsException("")
+            throwIndexOutOfBoundsException("Index must be between 0 and size")
         }
         if (end < start) {
-            throwIllegalArgumentException("")
+            throwIllegalArgumentException("The end index must be < start index")
         }
         if (end != start) {
             if (end < _size) {
@@ -854,7 +854,7 @@
      */
     public operator fun set(@IntRange(from = 0) index: Int, element: Long): Long {
         if (index !in 0 until _size) {
-            throwIndexOutOfBoundsException("")
+            throwIndexOutOfBoundsException("Index must be between 0 and size")
         }
         val content = content
         val old = content[index]
diff --git a/collection/collection/template/PKeyList.kt.template b/collection/collection/template/PKeyList.kt.template
index 929c44c..03233b7 100644
--- a/collection/collection/template/PKeyList.kt.template
+++ b/collection/collection/template/PKeyList.kt.template
@@ -308,7 +308,7 @@
      */
     public operator fun get(@IntRange(from = 0) index: Int): PKey {
         if (index !in 0 until _size) {
-            throwIndexOutOfBoundsException("")
+            throwIndexOutOfBoundsException("Index must be between 0 and size")
         }
         return content[index]
     }
@@ -319,7 +319,7 @@
      */
     public fun elementAt(@IntRange(from = 0) index: Int): PKey {
         if (index !in 0 until _size) {
-            throwIndexOutOfBoundsException("")
+            throwIndexOutOfBoundsException("Index must be between 0 and size")
         }
         return content[index]
     }
@@ -607,7 +607,7 @@
      */
     public fun add(@IntRange(from = 0) index: Int, element: PKey) {
         if (index !in 0.._size) {
-            throwIndexOutOfBoundsException("")
+            throwIndexOutOfBoundsException("Index must be between 0 and size")
         }
         ensureCapacity(_size + 1)
         val content = content
@@ -822,7 +822,7 @@
      */
     public fun removeAt(@IntRange(from = 0) index: Int): PKey {
         if (index !in 0 until _size) {
-            throwIndexOutOfBoundsException("")
+            throwIndexOutOfBoundsException("Index must be between 0 and size")
         }
         val content = content
         val item = content[index]
@@ -848,10 +848,10 @@
         @IntRange(from = 0) end: Int
     ) {
         if (start !in 0.._size || end !in 0.._size) {
-            throwIndexOutOfBoundsException("")
+            throwIndexOutOfBoundsException("Index must be between 0 and size")
         }
         if (end < start) {
-            throwIllegalArgumentException("")
+            throwIllegalArgumentException("The end index must be < start index")
         }
         if (end != start) {
             if (end < _size) {
@@ -908,7 +908,7 @@
         element: PKey
     ): PKey {
         if (index !in 0 until _size) {
-            throwIndexOutOfBoundsException("")
+            throwIndexOutOfBoundsException("Index must be between 0 and size")
         }
         val content = content
         val old = content[index]
diff --git a/compose/animation/animation-core/src/androidUnitTest/kotlin/androidx/compose/animation/core/ArcAnimationTest.kt b/compose/animation/animation-core/src/androidUnitTest/kotlin/androidx/compose/animation/core/ArcAnimationTest.kt
index 98cfa61..a8a8e70 100644
--- a/compose/animation/animation-core/src/androidUnitTest/kotlin/androidx/compose/animation/core/ArcAnimationTest.kt
+++ b/compose/animation/animation-core/src/androidUnitTest/kotlin/androidx/compose/animation/core/ArcAnimationTest.kt
@@ -345,6 +345,185 @@
         assertNotEquals(animationA, animationB)
     }
 
+    @Test
+    fun testArcSplineGraph_overallCurve() {
+        val expectX =
+            """
+                |*******************                                         | 0.0
+                |                   ******                                   |
+                |                          *****                             |
+                |                               *****                        |
+                |                                    ***                     |
+                |                                       ***                  | 71.429
+                |                                          ***               |
+                |                                             ***            |
+                |                                                **          |
+                |                                                 * *        |
+                |                                                    **      | 142.857
+                |                                                      **    |
+                |                                                        **  |
+                |                                                          * |
+                |                                                           *| 200.0
+                0.0                                                        5.0
+            """
+                .trimIndent()
+        val expectY =
+            """
+                |****                                                        | 0.0
+                |    ***                                                     |
+                |       ****                                                 |
+                |           ***                                              |
+                |              ****                                          |
+                |                  ****                                      | 142.857
+                |                      ***                                   |
+                |                        * ***                               |
+                |                             ****                           |
+                |                                 ***                        |
+                |                                    ****                    | 285.714
+                |                                        *****               |
+                |                                             *****          |
+                |                                                 * ******** |
+                |                                                           *| 400.0
+                0.0                                                        5.0
+            """
+                .trimIndent()
+        assertArcSplineCurve(
+            segment = CurveSegment.All,
+            expectGraphX = expectX,
+            expectGraphY = expectY
+        )
+    }
+
+    @Test
+    fun testArcSplineGraph_startOfCurve() {
+        val expectX =
+            """
+                |****************                                            | 0.0
+                |                *******                                     |
+                |                       *****                                |
+                |                            ***                             |
+                |                                ****                        |
+                |                                    ***                     | 2.116
+                |                                       ***                  |
+                |                                          ***               |
+                |                                             ***            |
+                |                                                **          |
+                |                                                  ***       | 4.232
+                |                                                     **     |
+                |                                                       **   |
+                |                                                         ** |
+                |                                                           *| 5.925
+                0.0                                                        1.0
+            """
+                .trimIndent()
+        val expectY =
+            """
+                |*****                                                       | 0.0
+                |     ****                                                   |
+                |         ****                                               |
+                |             ****                                           |
+                |                 *****                                      |
+                |                      ****                                  | 34.515
+                |                          ****                              |
+                |                              * **                          |
+                |                                  ****                      |
+                |                                      *****                 |
+                |                                           ****             | 69.029
+                |                                               ****         |
+                |                                                   ****     |
+                |                                                       **** |
+                |                                                           *| 96.641
+                0.0                                                        1.0
+            """
+                .trimIndent()
+        assertArcSplineCurve(
+            segment = CurveSegment.Start,
+            expectGraphX = expectX,
+            expectGraphY = expectY
+        )
+    }
+
+    @Test
+    fun testArcSplineGraph_endOfCurve() {
+        val expectX =
+            """
+                |******                                                      | 113.9
+                |      ****                                                  |
+                |          ****                                              |
+                |              **** *                                        |
+                |                    ****                                    |
+                |                        ****                                | 144.65
+                |                            ***                             |
+                |                               *****                        |
+                |                                    * **                    |
+                |                                        ****                |
+                |                                            ****            | 175.4
+                |                                                * *         |
+                |                                                   ****     |
+                |                                                       ** **|
+                |                                                            | 200.0
+                4.0                                                        5.0
+            """
+                .trimIndent()
+        val expectY =
+            """
+                |***                                                         | 361.036
+                |   ***                                                      |
+                |      **                                                    |
+                |        ***                                                 |
+                |          ***                                               |
+                |             ***                                            | 374.952
+                |                ** *                                        |
+                |                    ***                                     |
+                |                       ***                                  |
+                |                          ****                              |
+                |                             ****                           | 388.868
+                |                                 **** *                     |
+                |                                       ******               |
+                |                                             **** ******* * |
+                |                                                           *| 400.0
+                4.0                                                        5.0
+            """
+                .trimIndent()
+        assertArcSplineCurve(
+            segment = CurveSegment.End,
+            expectGraphX = expectX,
+            expectGraphY = expectY
+        )
+    }
+
+    private fun assertArcSplineCurve(
+        segment: CurveSegment,
+        expectGraphX: String,
+        expectGraphY: String
+    ) {
+        val startTime = 0f
+        val endTime = 5f
+        val arcSpline =
+            ArcSpline(
+                arcModes = intArrayOf(ArcSplineArcBelow),
+                timePoints = floatArrayOf(startTime, endTime),
+                y = arrayOf(floatArrayOf(0f, 0f), floatArrayOf(200f, 400f))
+            )
+        val arcSplineX =
+            plot2DArcSpline(
+                spline = arcSpline,
+                dimensionToPlot = 0,
+                start = endTime * segment.startPercent,
+                end = endTime * segment.endPercent
+            )
+        assertEquals("Graph on X dimension not equals", expectGraphX, arcSplineX)
+
+        val arcSplineY =
+            plot2DArcSpline(
+                spline = arcSpline,
+                dimensionToPlot = 1,
+                start = endTime * segment.startPercent,
+                end = endTime * segment.endPercent
+            )
+        assertEquals("Graph on Y dimension not equals", expectGraphY, arcSplineY)
+    }
+
     private inline fun <reified V : AnimationVector> VectorizedDurationBasedAnimationSpec<V>
         .valueAt(timePercent: Float): V =
         this.getValueFromNanos(
@@ -378,3 +557,31 @@
         return spec.vectorize(createFloatArrayConverter())
     }
 }
+
+private enum class CurveSegment(val startPercent: Float, val endPercent: Float) {
+    All(0f, 1f),
+    Start(0f, 1f / 5f),
+    End(4f / 5f, 1f)
+}
+
+/** Plot an [ArcSpline] under the assumption that it has 2 dimensions in values. */
+private fun plot2DArcSpline(
+    spline: ArcSpline,
+    dimensionToPlot: Int,
+    start: Float,
+    end: Float
+): String {
+    val count = 60
+    val x = FloatArray(count)
+    val y = FloatArray(count)
+    var c = 0
+    val output = FloatArray(2)
+    for (i in 0 until count) {
+        val t = start + (end - start) * i / (count - 1)
+        x[c] = t
+        spline.getPos(t, output)
+        y[c] = output[dimensionToPlot]
+        c++
+    }
+    return drawTextGraph(count, count / 4, x, y, false)
+}
diff --git a/compose/animation/animation-core/src/androidUnitTest/kotlin/androidx/compose/animation/core/MonoSplineTest.kt b/compose/animation/animation-core/src/androidUnitTest/kotlin/androidx/compose/animation/core/MonoSplineTest.kt
index fa3f502..dd3d23d 100644
--- a/compose/animation/animation-core/src/androidUnitTest/kotlin/androidx/compose/animation/core/MonoSplineTest.kt
+++ b/compose/animation/animation-core/src/androidUnitTest/kotlin/androidx/compose/animation/core/MonoSplineTest.kt
@@ -79,74 +79,69 @@
                 .trimIndent()
         assertEquals(expect, s)
     }
+}
 
-    private fun plotMonoSpline(
-        spline: MonoSpline,
-        splineNo: Int,
-        start: Float,
-        end: Float
-    ): String {
-        val count = 60
-        val x = FloatArray(count)
-        val y = FloatArray(count)
-        var c = 0
-        for (i in 0 until count) {
-            val t = start + (end - start) * i / (count - 1)
-            x[c] = t
-            y[c] = spline.getPos(t, splineNo)
-            c++
-        }
-        return textDraw(count, count / 4, x, y, false)
+private fun plotMonoSpline(spline: MonoSpline, splineNo: Int, start: Float, end: Float): String {
+    val count = 60
+    val x = FloatArray(count)
+    val y = FloatArray(count)
+    var c = 0
+    for (i in 0 until count) {
+        val t = start + (end - start) * i / (count - 1)
+        x[c] = t
+        y[c] = spline.getPos(t, splineNo)
+        c++
     }
+    return drawTextGraph(count, count / 4, x, y, false)
+}
 
-    private fun textDraw(
-        dimx: Int,
-        dimy: Int,
-        x: FloatArray,
-        y: FloatArray,
-        flip: Boolean
-    ): String {
-        var minX = x[0]
-        var maxX = x[0]
-        var minY = y[0]
-        var maxY = y[0]
-        var ret = ""
-        for (i in x.indices) {
-            minX = Math.min(minX, x[i])
-            maxX = Math.max(maxX, x[i])
-            minY = Math.min(minY, y[i])
-            maxY = Math.max(maxY, y[i])
-        }
-        val c = Array(dimy) { CharArray(dimx) }
-        for (i in 0 until dimy) {
-            Arrays.fill(c[i], ' ')
-        }
-        val dimx1 = dimx - 1
-        val dimy1 = dimy - 1
-        for (j in x.indices) {
-            val xp = (dimx1 * (x[j] - minX) / (maxX - minX)).toInt()
-            val yp = (dimy1 * (y[j] - minY) / (maxY - minY)).toInt()
-            c[if (flip) dimy - yp - 1 else yp][xp] = '*'
-        }
-        for (i in c.indices) {
-            var v: Float =
-                if (flip) {
-                    (minY - maxY) * (i / (c.size - 1.0f)) + maxY
-                } else {
-                    (maxY - minY) * (i / (c.size - 1.0f)) + minY
-                }
-            v = (v * 1000 + 0.5).toInt() / 1000f
-            ret +=
-                if (i % 5 == 0 || i == c.size - 1) {
-                    "|" + String(c[i]) + "| " + v + "\n"
-                } else {
-                    "|" + String(c[i]) + "|\n"
-                }
-        }
-        val minStr = ((minX * 1000 + 0.5).toInt() / 1000f).toString()
-        val maxStr = ((maxX * 1000 + 0.5).toInt() / 1000f).toString()
-        var s = minStr + String(CharArray(dimx) { ' ' })
-        s = s.substring(0, dimx - maxStr.length + 2) + maxStr + '\n'
-        return (ret + s).trimIndent()
+internal fun drawTextGraph(
+    dimx: Int,
+    dimy: Int,
+    x: FloatArray,
+    y: FloatArray,
+    flip: Boolean
+): String {
+    var minX = x[0]
+    var maxX = x[0]
+    var minY = y[0]
+    var maxY = y[0]
+    var ret = ""
+    for (i in x.indices) {
+        minX = Math.min(minX, x[i])
+        maxX = Math.max(maxX, x[i])
+        minY = Math.min(minY, y[i])
+        maxY = Math.max(maxY, y[i])
     }
+    val c = Array(dimy) { CharArray(dimx) }
+    for (i in 0 until dimy) {
+        Arrays.fill(c[i], ' ')
+    }
+    val dimx1 = dimx - 1
+    val dimy1 = dimy - 1
+    for (j in x.indices) {
+        val xp = (dimx1 * (x[j] - minX) / (maxX - minX)).toInt()
+        val yp = (dimy1 * (y[j] - minY) / (maxY - minY)).toInt()
+        c[if (flip) dimy - yp - 1 else yp][xp] = '*'
+    }
+    for (i in c.indices) {
+        var v: Float =
+            if (flip) {
+                (minY - maxY) * (i / (c.size - 1.0f)) + maxY
+            } else {
+                (maxY - minY) * (i / (c.size - 1.0f)) + minY
+            }
+        v = (v * 1000 + 0.5).toInt() / 1000f
+        ret +=
+            if (i % 5 == 0 || i == c.size - 1) {
+                "|" + String(c[i]) + "| " + v + "\n"
+            } else {
+                "|" + String(c[i]) + "|\n"
+            }
+    }
+    val minStr = ((minX * 1000 + 0.5).toInt() / 1000f).toString()
+    val maxStr = ((maxX * 1000 + 0.5).toInt() / 1000f).toString()
+    var s = minStr + String(CharArray(dimx) { ' ' })
+    s = s.substring(0, dimx - maxStr.length + 2) + maxStr + '\n'
+    return (ret + s).trimIndent()
 }
diff --git a/compose/animation/animation-core/src/commonMain/kotlin/androidx/compose/animation/core/ArcSpline.kt b/compose/animation/animation-core/src/commonMain/kotlin/androidx/compose/animation/core/ArcSpline.kt
index 45dfee1..e4b0e7d 100644
--- a/compose/animation/animation-core/src/commonMain/kotlin/androidx/compose/animation/core/ArcSpline.kt
+++ b/compose/animation/animation-core/src/commonMain/kotlin/androidx/compose/animation/core/ArcSpline.kt
@@ -327,6 +327,7 @@
 
             val ourPercent = OurPercentCache
             val lastIndex = ourPercent.size - 1
+            val lastIndexFloat = lastIndex.toFloat()
             val lut = lut
 
             for (i in 1..lastIndex) {
@@ -351,7 +352,7 @@
                 val pos = i / lutLastIndex
                 val index = binarySearch(ourPercent, pos)
                 if (index >= 0) {
-                    lut[i] = index / lutLastIndex
+                    lut[i] = index / lastIndexFloat
                 } else if (index == -1) {
                     lut[i] = 0f
                 } else {
@@ -359,7 +360,7 @@
                     val p2 = -index - 1
                     val ans =
                         (p1 + (pos - ourPercent[p1]) / (ourPercent[p2] - ourPercent[p1])) /
-                            lastIndex
+                            lastIndexFloat
                     lut[i] = ans
                 }
             }
diff --git a/compose/material3/adaptive/adaptive-render-strategy/build.gradle b/compose/material3/adaptive/adaptive-render-strategy/build.gradle
deleted file mode 100644
index 7634ff6..0000000
--- a/compose/material3/adaptive/adaptive-render-strategy/build.gradle
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (C) 2024 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.LibraryType
-import androidx.build.PlatformIdentifier
-
-plugins {
-    id("AndroidXPlugin")
-    id("AndroidXComposePlugin")
-    id("com.android.library")
-}
-
-androidXMultiplatform {
-    android()
-    jvmStubs()
-
-    defaultPlatform(PlatformIdentifier.ANDROID)
-
-    sourceSets {
-        commonMain {
-            dependencies {
-                implementation(libs.kotlinStdlib)
-            }
-        }
-
-        commonTest {
-            dependencies {
-            }
-        }
-
-        jvmMain {
-            dependsOn(commonMain)
-            dependencies {
-                implementation(libs.testRules)
-                implementation(libs.testRunner)
-                implementation(libs.junit)
-                implementation(libs.truth)
-            }
-        }
-
-        androidMain {
-            dependsOn(jvmMain)
-            dependencies {
-                api("androidx.annotation:annotation:1.8.1")
-            }
-        }
-
-        jvmTest {
-            dependsOn(commonTest)
-            dependencies {
-            }
-        }
-
-        androidInstrumentedTest {
-            dependsOn(jvmTest)
-            dependencies {
-                implementation(libs.testRules)
-                implementation(libs.testRunner)
-                implementation(libs.junit)
-                implementation(libs.truth)
-            }
-        }
-
-        commonStubsMain {
-            dependsOn(commonMain)
-        }
-
-        jvmStubsMain {
-            dependsOn(commonStubsMain)
-        }
-    }
-}
-
-android {
-    namespace "androidx.compose.material3.adaptive.render.strategy"
-}
-
-androidx {
-    name = "androidx.compose.material3.adaptive:adaptive-render-strategy"
-    type = LibraryType.PUBLISHED_LIBRARY_ONLY_USED_BY_KOTLIN_CONSUMERS
-    inceptionYear = "2024"
-    description = "Material AdaptiveRenderStrategy library"
-}
diff --git a/compose/material3/adaptive/adaptive-render-strategy/src/commonMain/kotlin/androidx/compose/material3/adaptive/androidx-compose-material3-adaptive-adaptive-render-strategy-documentation.md b/compose/material3/adaptive/adaptive-render-strategy/src/commonMain/kotlin/androidx/compose/material3/adaptive/androidx-compose-material3-adaptive-adaptive-render-strategy-documentation.md
deleted file mode 100644
index 0fb75e6..0000000
--- a/compose/material3/adaptive/adaptive-render-strategy/src/commonMain/kotlin/androidx/compose/material3/adaptive/androidx-compose-material3-adaptive-adaptive-render-strategy-documentation.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Module root
-
-androidx.compose.material3.adaptive adaptive-render-strategy
-
-# Package androidx.compose.material3.adaptive.render.strategy
-
-Material AdaptiveRenderStrategy library
diff --git a/compose/material3/material3/src/androidInstrumentedTest/kotlin/androidx/compose/material3/IconButtonScreenshotTest.kt b/compose/material3/material3/src/androidInstrumentedTest/kotlin/androidx/compose/material3/IconButtonScreenshotTest.kt
index d57c4a2..da0d64f 100644
--- a/compose/material3/material3/src/androidInstrumentedTest/kotlin/androidx/compose/material3/IconButtonScreenshotTest.kt
+++ b/compose/material3/material3/src/androidInstrumentedTest/kotlin/androidx/compose/material3/IconButtonScreenshotTest.kt
@@ -24,6 +24,8 @@
 import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Favorite
+import androidx.compose.material.icons.filled.FavoriteBorder
+import androidx.compose.material.icons.outlined.Favorite
 import androidx.compose.material.icons.outlined.FavoriteBorder
 import androidx.compose.testutils.assertAgainstGolden
 import androidx.compose.ui.Alignment
@@ -190,7 +192,7 @@
         rule.setMaterialContent(lightColorScheme()) {
             Box(wrap.testTag(wrapperTestTag)) {
                 IconToggleButton(checked = false, onCheckedChange = { /* doSomething() */ }) {
-                    Icon(Icons.Filled.Favorite, contentDescription = "Localized description")
+                    Icon(Icons.Outlined.Favorite, contentDescription = "Localized description")
                 }
             }
         }
@@ -202,7 +204,7 @@
         rule.setMaterialContent(darkColorScheme()) {
             Box(wrap.testTag(wrapperTestTag)) {
                 IconToggleButton(checked = false, onCheckedChange = { /* doSomething() */ }) {
-                    Icon(Icons.Filled.Favorite, contentDescription = "Localized description")
+                    Icon(Icons.Outlined.Favorite, contentDescription = "Localized description")
                 }
             }
         }
@@ -274,7 +276,7 @@
         rule.setMaterialContent(lightColorScheme()) {
             Box(wrap.testTag(wrapperTestTag)) {
                 FilledIconToggleButton(checked = false, onCheckedChange = { /* doSomething() */ }) {
-                    Icon(Icons.Filled.Favorite, contentDescription = "Localized description")
+                    Icon(Icons.Outlined.Favorite, contentDescription = "Localized description")
                 }
             }
         }
@@ -290,7 +292,7 @@
                     onCheckedChange = { /* doSomething() */ },
                     enabled = false
                 ) {
-                    Icon(Icons.Filled.Favorite, contentDescription = "Localized description")
+                    Icon(Icons.Outlined.Favorite, contentDescription = "Localized description")
                 }
             }
         }
@@ -302,7 +304,7 @@
         rule.setMaterialContent(darkColorScheme()) {
             Box(wrap.testTag(wrapperTestTag)) {
                 FilledIconToggleButton(checked = false, onCheckedChange = { /* doSomething() */ }) {
-                    Icon(Icons.Filled.Favorite, contentDescription = "Localized description")
+                    Icon(Icons.Outlined.Favorite, contentDescription = "Localized description")
                 }
             }
         }
@@ -377,7 +379,7 @@
                     checked = false,
                     onCheckedChange = { /* doSomething() */ }
                 ) {
-                    Icon(Icons.Filled.Favorite, contentDescription = "Localized description")
+                    Icon(Icons.Outlined.Favorite, contentDescription = "Localized description")
                 }
             }
         }
@@ -392,7 +394,7 @@
                     checked = false,
                     onCheckedChange = { /* doSomething() */ }
                 ) {
-                    Icon(Icons.Filled.Favorite, contentDescription = "Localized description")
+                    Icon(Icons.Outlined.Favorite, contentDescription = "Localized description")
                 }
             }
         }
@@ -434,10 +436,7 @@
         rule.setMaterialContent(lightColorScheme()) {
             Box(wrap.testTag(wrapperTestTag)) {
                 OutlinedIconButton(onClick = { /* doSomething() */ }) {
-                    Icon(
-                        Icons.Outlined.FavoriteBorder,
-                        contentDescription = "Localized description"
-                    )
+                    Icon(Icons.Filled.FavoriteBorder, contentDescription = "Localized description")
                 }
             }
         }
@@ -449,10 +448,7 @@
         rule.setMaterialContent(lightColorScheme()) {
             Box(wrap.testTag(wrapperTestTag)) {
                 OutlinedIconButton(onClick = { /* doSomething() */ }, enabled = false) {
-                    Icon(
-                        Icons.Outlined.FavoriteBorder,
-                        contentDescription = "Localized description"
-                    )
+                    Icon(Icons.Filled.FavoriteBorder, contentDescription = "Localized description")
                 }
             }
         }
@@ -464,10 +460,7 @@
         rule.setMaterialContent(darkColorScheme()) {
             Box(wrap.testTag(wrapperTestTag)) {
                 OutlinedIconButton(onClick = { /* doSomething() */ }) {
-                    Icon(
-                        Icons.Outlined.FavoriteBorder,
-                        contentDescription = "Localized description"
-                    )
+                    Icon(Icons.Filled.FavoriteBorder, contentDescription = "Localized description")
                 }
             }
         }
diff --git a/compose/material3/material3/src/androidInstrumentedTest/kotlin/androidx/compose/material3/SplitButtonScreenshotTest.kt b/compose/material3/material3/src/androidInstrumentedTest/kotlin/androidx/compose/material3/SplitButtonScreenshotTest.kt
index 06b13ec..883c847 100644
--- a/compose/material3/material3/src/androidInstrumentedTest/kotlin/androidx/compose/material3/SplitButtonScreenshotTest.kt
+++ b/compose/material3/material3/src/androidInstrumentedTest/kotlin/androidx/compose/material3/SplitButtonScreenshotTest.kt
@@ -23,7 +23,8 @@
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Edit
+import androidx.compose.material.icons.filled.Edit
+import androidx.compose.material.icons.filled.KeyboardArrowDown
 import androidx.compose.material.icons.outlined.KeyboardArrowDown
 import androidx.compose.testutils.assertAgainstGolden
 import androidx.compose.ui.Alignment
@@ -63,7 +64,7 @@
                             onClick = { /* Do Nothing */ },
                         ) {
                             Icon(
-                                Icons.Outlined.Edit,
+                                Icons.Filled.Edit,
                                 modifier = Modifier.size(SplitButtonDefaults.LeadingIconSize),
                                 contentDescription = "Localized description",
                             )
@@ -100,7 +101,7 @@
                     checked = false,
                     leadingContent = {
                         Icon(
-                            Icons.Outlined.Edit,
+                            Icons.Filled.Edit,
                             contentDescription = "Localized description",
                             Modifier.size(SplitButtonDefaults.LeadingIconSize)
                         )
@@ -136,7 +137,7 @@
                     onTrailingButtonClick = {},
                     leadingContent = {
                         Icon(
-                            Icons.Outlined.Edit,
+                            Icons.Filled.Edit,
                             contentDescription = "Localized description",
                             Modifier.size(SplitButtonDefaults.LeadingIconSize)
                         )
@@ -145,7 +146,7 @@
                     },
                     trailingContent = {
                         Icon(
-                            Icons.Outlined.KeyboardArrowDown,
+                            Icons.Filled.KeyboardArrowDown,
                             modifier =
                                 Modifier.size(SplitButtonDefaults.TrailingIconSize).graphicsLayer {
                                     this.rotationZ = 180f
@@ -170,7 +171,7 @@
                     checked = false,
                     leadingContent = {
                         Icon(
-                            Icons.Outlined.Edit,
+                            Icons.Filled.Edit,
                             contentDescription = "Localized description",
                             Modifier.size(SplitButtonDefaults.LeadingIconSize)
                         )
@@ -203,7 +204,7 @@
                     checked = false,
                     leadingContent = {
                         Icon(
-                            Icons.Outlined.Edit,
+                            Icons.Filled.Edit,
                             contentDescription = "Localized description",
                             Modifier.size(SplitButtonDefaults.LeadingIconSize)
                         )
@@ -236,7 +237,7 @@
                     checked = false,
                     leadingContent = {
                         Icon(
-                            Icons.Outlined.Edit,
+                            Icons.Filled.Edit,
                             contentDescription = "Localized description",
                             Modifier.size(SplitButtonDefaults.LeadingIconSize)
                         )
@@ -269,7 +270,7 @@
                             onClick = { /* Do Nothing */ },
                         ) {
                             Icon(
-                                Icons.Outlined.Edit,
+                                Icons.Filled.Edit,
                                 contentDescription = "Localized description",
                                 Modifier.size(SplitButtonDefaults.LeadingIconSize)
                             )
diff --git a/compose/material3/material3/src/androidInstrumentedTest/kotlin/androidx/compose/material3/ToggleButtonScreenshotTest.kt b/compose/material3/material3/src/androidInstrumentedTest/kotlin/androidx/compose/material3/ToggleButtonScreenshotTest.kt
index d6dcd91..a699d92 100644
--- a/compose/material3/material3/src/androidInstrumentedTest/kotlin/androidx/compose/material3/ToggleButtonScreenshotTest.kt
+++ b/compose/material3/material3/src/androidInstrumentedTest/kotlin/androidx/compose/material3/ToggleButtonScreenshotTest.kt
@@ -22,6 +22,7 @@
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Favorite
+import androidx.compose.material.icons.outlined.Favorite
 import androidx.compose.testutils.assertAgainstGolden
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.testTag
@@ -448,7 +449,7 @@
             Box(Modifier.testTag(wrapperTestTag)) {
                 ToggleButton(checked = false, onCheckedChange = {}) {
                     Icon(
-                        Icons.Filled.Favorite,
+                        Icons.Outlined.Favorite,
                         contentDescription = "Localized description",
                         modifier = Modifier.size(ToggleButtonDefaults.IconSize)
                     )
@@ -466,7 +467,7 @@
             Box(Modifier.testTag(wrapperTestTag)) {
                 ToggleButton(checked = false, onCheckedChange = {}, enabled = false) {
                     Icon(
-                        Icons.Filled.Favorite,
+                        Icons.Outlined.Favorite,
                         contentDescription = "Localized description",
                         modifier = Modifier.size(ToggleButtonDefaults.IconSize)
                     )
@@ -484,7 +485,7 @@
             Box(Modifier.testTag(wrapperTestTag)) {
                 ToggleButton(checked = false, onCheckedChange = {}) {
                     Icon(
-                        Icons.Filled.Favorite,
+                        Icons.Outlined.Favorite,
                         contentDescription = "Localized description",
                         modifier = Modifier.size(ToggleButtonDefaults.IconSize)
                     )
@@ -539,7 +540,7 @@
             Box(Modifier.testTag(wrapperTestTag)) {
                 ToggleButton(checked = false, onCheckedChange = {}) {
                     Icon(
-                        Icons.Filled.Favorite,
+                        Icons.Outlined.Favorite,
                         contentDescription = "Localized description",
                         modifier = Modifier.size(ToggleButtonDefaults.IconSize)
                     )
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/NavigationDrawer.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/NavigationDrawer.kt
index 6f5dfbc..4ebaa83 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/NavigationDrawer.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/NavigationDrawer.kt
@@ -380,8 +380,14 @@
             modifier =
                 Modifier.offset {
                         drawerState.currentOffset.let { offset ->
-                            if (offset.isNaN()) IntOffset.Zero
-                            else IntOffset(offset.roundToInt(), 0)
+                            val offsetX =
+                                when {
+                                    !offset.isNaN() -> offset.roundToInt()
+                                    // If offset is NaN, set offset based on open/closed state
+                                    drawerState.isOpen -> 0
+                                    else -> -DrawerDefaults.MaximumDrawerWidth.roundToPx()
+                                }
+                            IntOffset(offsetX, 0)
                         }
                     }
                     .semantics {
diff --git a/compose/runtime/runtime-test-utils/src/commonMain/kotlin/androidx/compose/runtime/mock/ViewApplier.kt b/compose/runtime/runtime-test-utils/src/commonMain/kotlin/androidx/compose/runtime/mock/ViewApplier.kt
index 4b1b684..e92c777 100644
--- a/compose/runtime/runtime-test-utils/src/commonMain/kotlin/androidx/compose/runtime/mock/ViewApplier.kt
+++ b/compose/runtime/runtime-test-utils/src/commonMain/kotlin/androidx/compose/runtime/mock/ViewApplier.kt
@@ -20,6 +20,8 @@
 
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER")
 class ViewApplier(root: View) : AbstractApplier<View>(root) {
+    var called = false
+
     var onBeginChangesCalled = 0
         private set
 
@@ -28,29 +30,53 @@
 
     override fun insertTopDown(index: Int, instance: View) {
         // Ignored as the tree is built bottom-up.
+        called = true
     }
 
     override fun insertBottomUp(index: Int, instance: View) {
         current.addAt(index, instance)
+        called = true
     }
 
     override fun remove(index: Int, count: Int) {
         current.removeAt(index, count)
+        called = true
     }
 
     override fun move(from: Int, to: Int, count: Int) {
         current.moveAt(from, to, count)
+        called = true
     }
 
     override fun onClear() {
         root.removeAllChildren()
+        called = true
     }
 
     override fun onBeginChanges() {
         onBeginChangesCalled++
+        called = true
     }
 
     override fun onEndChanges() {
         onEndChangesCalled++
+        called = true
+    }
+
+    override var current: View
+        get() = super.current.also { if (it != root) called = true }
+        set(value) {
+            super.current = value
+            called = true
+        }
+
+    override fun down(node: View) {
+        super.down(node)
+        called = true
+    }
+
+    override fun up() {
+        super.up()
+        called = true
     }
 }
diff --git a/compose/runtime/runtime/api/current.ignore b/compose/runtime/runtime/api/current.ignore
index fc9bb64..f02ef5a 100644
--- a/compose/runtime/runtime/api/current.ignore
+++ b/compose/runtime/runtime/api/current.ignore
@@ -1,19 +1,3 @@
 // Baseline format: 1.0
-AddedAbstractMethod: androidx.compose.runtime.Composer#endReplaceGroup():
-    Added method androidx.compose.runtime.Composer.endReplaceGroup()
-AddedAbstractMethod: androidx.compose.runtime.Composer#startReplaceGroup(int):
-    Added method androidx.compose.runtime.Composer.startReplaceGroup(int)
-AddedAbstractMethod: androidx.compose.runtime.ControlledComposition#abandonChanges():
-    Added method androidx.compose.runtime.ControlledComposition.abandonChanges()
-
-
-InvalidNullConversion: androidx.compose.runtime.ComposablesKt#key(Object[], kotlin.jvm.functions.Function0<? extends T>) parameter #0:
-    Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter keys in androidx.compose.runtime.ComposablesKt.key(Object[] keys, kotlin.jvm.functions.Function0<? extends T> block)
-InvalidNullConversion: androidx.compose.runtime.ComposablesKt#remember(Object[], kotlin.jvm.functions.Function0<? extends T>) parameter #0:
-    Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter keys in androidx.compose.runtime.ComposablesKt.remember(Object[] keys, kotlin.jvm.functions.Function0<? extends T> calculation)
-InvalidNullConversion: androidx.compose.runtime.EffectsKt#DisposableEffect(Object[], kotlin.jvm.functions.Function1<? super androidx.compose.runtime.DisposableEffectScope,? extends androidx.compose.runtime.DisposableEffectResult>) parameter #0:
-    Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter keys in androidx.compose.runtime.EffectsKt.DisposableEffect(Object[] keys, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.DisposableEffectScope,? extends androidx.compose.runtime.DisposableEffectResult> effect)
-InvalidNullConversion: androidx.compose.runtime.EffectsKt#LaunchedEffect(Object[], kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?>) parameter #0:
-    Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter keys in androidx.compose.runtime.EffectsKt.LaunchedEffect(Object[] keys, kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block)
-InvalidNullConversion: androidx.compose.runtime.SnapshotStateKt#produceState(T, Object[], kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?>) parameter #1:
-    Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter keys in androidx.compose.runtime.SnapshotStateKt.produceState(T initialValue, Object[] keys, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer)
+AddedAbstractMethod: androidx.compose.runtime.ControlledComposition#setShouldPauseCallback(kotlin.jvm.functions.Function0<java.lang.Boolean>):
+    Added method androidx.compose.runtime.ControlledComposition.setShouldPauseCallback(kotlin.jvm.functions.Function0<java.lang.Boolean>)
diff --git a/compose/runtime/runtime/api/current.txt b/compose/runtime/runtime/api/current.txt
index 110569b..9212ade 100644
--- a/compose/runtime/runtime/api/current.txt
+++ b/compose/runtime/runtime/api/current.txt
@@ -22,6 +22,7 @@
   }
 
   @kotlin.jvm.JvmDefaultWithCompatibility public interface Applier<N> {
+    method public default void apply(kotlin.jvm.functions.Function2<? super N,java.lang.Object?,kotlin.Unit> block, Object? value);
     method public void clear();
     method public void down(N node);
     method public N getCurrent();
@@ -31,6 +32,7 @@
     method public default void onBeginChanges();
     method public default void onEndChanges();
     method public void remove(int index, int count);
+    method public default void reuse();
     method public void up();
     property public abstract N current;
   }
@@ -286,6 +288,7 @@
     method public void recordModificationsOf(java.util.Set<?> values);
     method public void recordReadOf(Object value);
     method public void recordWriteOf(Object value);
+    method public kotlin.jvm.functions.Function0<java.lang.Boolean>? setShouldPauseCallback(kotlin.jvm.functions.Function0<java.lang.Boolean>? shouldPause);
     method @SuppressCompatibility @androidx.compose.runtime.InternalComposeApi public void verifyConsistent();
     property public abstract boolean hasPendingChanges;
     property public abstract boolean isComposing;
@@ -459,6 +462,15 @@
   @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.SOURCE) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER}) public @interface NonSkippableComposable {
   }
 
+  public interface PausableComposition extends androidx.compose.runtime.ReusableComposition {
+    method public androidx.compose.runtime.PausedComposition setPausableContent(kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method public androidx.compose.runtime.PausedComposition setPausableContentWithReuse(kotlin.jvm.functions.Function0<kotlin.Unit> content);
+  }
+
+  public final class PausableCompositionKt {
+    method public static androidx.compose.runtime.PausableComposition PausableComposition(androidx.compose.runtime.Applier<? extends java.lang.Object?> applier, androidx.compose.runtime.CompositionContext parent);
+  }
+
   public final class PausableMonotonicFrameClock implements androidx.compose.runtime.MonotonicFrameClock {
     ctor public PausableMonotonicFrameClock(androidx.compose.runtime.MonotonicFrameClock frameClock);
     method public boolean isPaused();
@@ -468,6 +480,14 @@
     property public final boolean isPaused;
   }
 
+  public interface PausedComposition {
+    method public void apply();
+    method public void cancel();
+    method public boolean isComplete();
+    method public boolean resume(kotlin.jvm.functions.Function0<java.lang.Boolean> shouldPause);
+    property public abstract boolean isComplete;
+  }
+
   public final class PrimitiveSnapshotStateKt {
     method public static inline operator float getValue(androidx.compose.runtime.FloatState, Object? thisObj, kotlin.reflect.KProperty<? extends java.lang.Object?> property);
     method @androidx.compose.runtime.snapshots.StateFactoryMarker public static androidx.compose.runtime.MutableFloatState mutableFloatStateOf(float value);
diff --git a/compose/runtime/runtime/api/restricted_current.ignore b/compose/runtime/runtime/api/restricted_current.ignore
index 5826792..f02ef5a 100644
--- a/compose/runtime/runtime/api/restricted_current.ignore
+++ b/compose/runtime/runtime/api/restricted_current.ignore
@@ -1,23 +1,3 @@
 // Baseline format: 1.0
-AddedAbstractMethod: androidx.compose.runtime.Composer#endReplaceGroup():
-    Added method androidx.compose.runtime.Composer.endReplaceGroup()
-AddedAbstractMethod: androidx.compose.runtime.Composer#startReplaceGroup(int):
-    Added method androidx.compose.runtime.Composer.startReplaceGroup(int)
-AddedAbstractMethod: androidx.compose.runtime.ControlledComposition#abandonChanges():
-    Added method androidx.compose.runtime.ControlledComposition.abandonChanges()
-
-
-InvalidNullConversion: androidx.compose.runtime.ComposablesKt#key(Object[], kotlin.jvm.functions.Function0<? extends T>) parameter #0:
-    Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter keys in androidx.compose.runtime.ComposablesKt.key(Object[] keys, kotlin.jvm.functions.Function0<? extends T> block)
-InvalidNullConversion: androidx.compose.runtime.ComposablesKt#remember(Object[], kotlin.jvm.functions.Function0<? extends T>) parameter #0:
-    Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter keys in androidx.compose.runtime.ComposablesKt.remember(Object[] keys, kotlin.jvm.functions.Function0<? extends T> calculation)
-InvalidNullConversion: androidx.compose.runtime.EffectsKt#DisposableEffect(Object[], kotlin.jvm.functions.Function1<? super androidx.compose.runtime.DisposableEffectScope,? extends androidx.compose.runtime.DisposableEffectResult>) parameter #0:
-    Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter keys in androidx.compose.runtime.EffectsKt.DisposableEffect(Object[] keys, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.DisposableEffectScope,? extends androidx.compose.runtime.DisposableEffectResult> effect)
-InvalidNullConversion: androidx.compose.runtime.EffectsKt#LaunchedEffect(Object[], kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?>) parameter #0:
-    Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter keys in androidx.compose.runtime.EffectsKt.LaunchedEffect(Object[] keys, kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block)
-InvalidNullConversion: androidx.compose.runtime.SnapshotStateKt#produceState(T, Object[], kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?>) parameter #1:
-    Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter keys in androidx.compose.runtime.SnapshotStateKt.produceState(T initialValue, Object[] keys, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer)
-
-
-RemovedClass: androidx.compose.runtime.ExpectKt:
-    Removed class androidx.compose.runtime.ExpectKt
+AddedAbstractMethod: androidx.compose.runtime.ControlledComposition#setShouldPauseCallback(kotlin.jvm.functions.Function0<java.lang.Boolean>):
+    Added method androidx.compose.runtime.ControlledComposition.setShouldPauseCallback(kotlin.jvm.functions.Function0<java.lang.Boolean>)
diff --git a/compose/runtime/runtime/api/restricted_current.txt b/compose/runtime/runtime/api/restricted_current.txt
index 186ecc4..9580ec3 100644
--- a/compose/runtime/runtime/api/restricted_current.txt
+++ b/compose/runtime/runtime/api/restricted_current.txt
@@ -26,6 +26,7 @@
   }
 
   @kotlin.jvm.JvmDefaultWithCompatibility public interface Applier<N> {
+    method public default void apply(kotlin.jvm.functions.Function2<? super N,java.lang.Object?,kotlin.Unit> block, Object? value);
     method public void clear();
     method public void down(N node);
     method public N getCurrent();
@@ -35,6 +36,7 @@
     method public default void onBeginChanges();
     method public default void onEndChanges();
     method public void remove(int index, int count);
+    method public default void reuse();
     method public void up();
     property public abstract N current;
   }
@@ -313,6 +315,7 @@
     method public void recordModificationsOf(java.util.Set<?> values);
     method public void recordReadOf(Object value);
     method public void recordWriteOf(Object value);
+    method public kotlin.jvm.functions.Function0<java.lang.Boolean>? setShouldPauseCallback(kotlin.jvm.functions.Function0<java.lang.Boolean>? shouldPause);
     method @SuppressCompatibility @androidx.compose.runtime.InternalComposeApi public void verifyConsistent();
     property public abstract boolean hasPendingChanges;
     property public abstract boolean isComposing;
@@ -487,6 +490,15 @@
   @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.SOURCE) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER}) public @interface NonSkippableComposable {
   }
 
+  public interface PausableComposition extends androidx.compose.runtime.ReusableComposition {
+    method public androidx.compose.runtime.PausedComposition setPausableContent(kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method public androidx.compose.runtime.PausedComposition setPausableContentWithReuse(kotlin.jvm.functions.Function0<kotlin.Unit> content);
+  }
+
+  public final class PausableCompositionKt {
+    method public static androidx.compose.runtime.PausableComposition PausableComposition(androidx.compose.runtime.Applier<? extends java.lang.Object?> applier, androidx.compose.runtime.CompositionContext parent);
+  }
+
   public final class PausableMonotonicFrameClock implements androidx.compose.runtime.MonotonicFrameClock {
     ctor public PausableMonotonicFrameClock(androidx.compose.runtime.MonotonicFrameClock frameClock);
     method public boolean isPaused();
@@ -496,6 +508,14 @@
     property public final boolean isPaused;
   }
 
+  public interface PausedComposition {
+    method public void apply();
+    method public void cancel();
+    method public boolean isComplete();
+    method public boolean resume(kotlin.jvm.functions.Function0<java.lang.Boolean> shouldPause);
+    property public abstract boolean isComplete;
+  }
+
   public final class PrimitiveSnapshotStateKt {
     method public static inline operator float getValue(androidx.compose.runtime.FloatState, Object? thisObj, kotlin.reflect.KProperty<? extends java.lang.Object?> property);
     method @androidx.compose.runtime.snapshots.StateFactoryMarker public static androidx.compose.runtime.MutableFloatState mutableFloatStateOf(float value);
diff --git a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/Applier.kt b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/Applier.kt
index e1cd951..5b33661 100644
--- a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/Applier.kt
+++ b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/Applier.kt
@@ -174,6 +174,16 @@
      * root to be used as the target of a new composition in the future.
      */
     fun clear()
+
+    /** Apply a change to the current node. */
+    fun apply(block: N.(Any?) -> Unit, value: Any?) {
+        current.block(value)
+    }
+
+    /** Notify [current] is is being reused in reusable content. */
+    fun reuse() {
+        (current as? ComposeNodeLifecycleCallback)?.onReuse()
+    }
 }
 
 /**
diff --git a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/Composer.kt b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/Composer.kt
index 28f2850..172e582 100644
--- a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/Composer.kt
+++ b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/Composer.kt
@@ -101,6 +101,15 @@
         priority: Int,
         endRelativeAfter: Int
     )
+
+    /** The restart scope is pausing */
+    fun rememberPausingScope(scope: RecomposeScopeImpl)
+
+    /** The restart scope is resuming */
+    fun startResumingScope(scope: RecomposeScopeImpl)
+
+    /** The restart scope is finished resuming */
+    fun endResumingScope(scope: RecomposeScopeImpl)
 }
 
 /**
@@ -1356,6 +1365,9 @@
     private var insertAnchor: Anchor = insertTable.read { it.anchor(0) }
     private var insertFixups = FixupList()
 
+    private var pausable: Boolean = false
+    private var shouldPauseCallback: (() -> Boolean)? = null
+
     override val applyCoroutineContext: CoroutineContext
         @TestOnly get() = parentContext.effectCoroutineContext
 
@@ -2726,7 +2738,10 @@
                 providerCache = null
 
                 // Invoke the scope's composition function
+                val shouldRestartReusing = !reusing && firstInRange.scope.reusing
+                if (shouldRestartReusing) reusing = true
                 firstInRange.scope.compose(this)
+                if (shouldRestartReusing) reusing = false
 
                 // We could have moved out of a provider so the provider cache is invalid.
                 providerCache = null
@@ -3038,8 +3053,34 @@
     }
 
     @ComposeCompilerApi
-    @Suppress("UNUSED")
     override fun shouldExecute(parametersChanged: Boolean, flags: Int): Boolean {
+        // We only want to pause when we are not resuming and only when inserting new content or
+        // when reusing content. This 0 bit of `flags` is only 1 if this function was restarted by
+        // the restart lambda. The other bits of this flags are currently all 0's and are reserved
+        // for future use.
+        if (((flags and 1) == 0) && (inserting || reusing)) {
+            val callback = shouldPauseCallback ?: return true
+            val scope = currentRecomposeScope ?: return true
+            val pausing = callback()
+            if (pausing) {
+                scope.used = true
+                // Force the composer back into the reusing state when this scope restarts.
+                scope.reusing = reusing
+                scope.paused = true
+                // Remember a place-holder object to ensure all remembers are sent in the correct
+                // order. The remember manager will record the remember callback for the resumed
+                // content into a place-holder to ensure that, when the remember callbacks are
+                // dispatched, the callbacks for the resumed content are dispatched in the same
+                // order they would have been had the content not paused.
+                changeListWriter.rememberPausingScope(scope)
+                parentContext.reportPausedScope(scope)
+                return false
+            }
+            return true
+        }
+
+        // Otherwise we should execute the function if the parameters have changed or when
+        // skipping is disabled.
         return parametersChanged || !skipping
     }
 
@@ -3118,6 +3159,11 @@
                     }
             invalidateStack.push(scope)
             scope.start(compositionToken)
+            if (scope.paused) {
+                scope.paused = false
+                scope.resuming = true
+                changeListWriter.startResumingScope(scope)
+            }
         }
     }
 
@@ -3133,8 +3179,16 @@
         // exception stack unwinding that might have not called the doneJoin/endRestartGroup in the
         // the correct order.
         val scope = if (invalidateStack.isNotEmpty()) invalidateStack.pop() else null
-        scope?.requiresRecompose = false
-        scope?.end(compositionToken)?.let { changeListWriter.endCompositionScope(it, composition) }
+        if (scope != null) {
+            scope.requiresRecompose = false
+            scope.end(compositionToken)?.let {
+                changeListWriter.endCompositionScope(it, composition)
+            }
+            if (scope.resuming) {
+                scope.resuming = false
+                changeListWriter.endResumingScope(scope)
+            }
+        }
         val result =
             if (scope != null && !scope.skipped && (scope.used || forceRecomposeScopes)) {
                 if (scope.anchor == null) {
@@ -3438,10 +3492,16 @@
      */
     internal fun composeContent(
         invalidationsRequested: ScopeMap<RecomposeScopeImpl, Any>,
-        content: @Composable () -> Unit
+        content: @Composable () -> Unit,
+        shouldPause: (() -> Boolean)?
     ) {
         runtimeCheck(changes.isEmpty()) { "Expected applyChanges() to have been called" }
-        doCompose(invalidationsRequested, content)
+        this.shouldPauseCallback = shouldPause
+        try {
+            doCompose(invalidationsRequested, content)
+        } finally {
+            this.shouldPauseCallback = null
+        }
     }
 
     internal fun prepareCompose(block: () -> Unit) {
@@ -3460,6 +3520,7 @@
      */
     internal fun recompose(
         invalidationsRequested: ScopeMap<RecomposeScopeImpl, Any>,
+        shouldPause: (() -> Boolean)?
     ): Boolean {
         runtimeCheck(changes.isEmpty()) { "Expected applyChanges() to have been called" }
         // even if invalidationsRequested is empty we still need to recompose if the Composer has
@@ -3467,7 +3528,12 @@
         // there were a change for a state which was used by the child composition. such changes
         // will be tracked and added into `invalidations` list.
         if (invalidationsRequested.size > 0 || invalidations.isNotEmpty() || forciblyRecompose) {
-            doCompose(invalidationsRequested, null)
+            shouldPauseCallback = shouldPause
+            try {
+                doCompose(invalidationsRequested, null)
+            } finally {
+                shouldPauseCallback = null
+            }
             return changes.isNotEmpty()
         }
         return false
@@ -3786,6 +3852,10 @@
             parentContext.unregisterComposition(composition)
         }
 
+        override fun reportPausedScope(scope: RecomposeScopeImpl) {
+            parentContext.reportPausedScope(scope)
+        }
+
         override val effectCoroutineContext: CoroutineContext
             get() = parentContext.effectCoroutineContext
 
@@ -3802,6 +3872,20 @@
             parentContext.composeInitial(composition, content)
         }
 
+        override fun composeInitialPaused(
+            composition: ControlledComposition,
+            shouldPause: () -> Boolean,
+            content: @Composable () -> Unit
+        ): ScatterSet<RecomposeScopeImpl> =
+            parentContext.composeInitialPaused(composition, shouldPause, content)
+
+        override fun recomposePaused(
+            composition: ControlledComposition,
+            shouldPause: () -> Boolean,
+            invalidScopes: ScatterSet<RecomposeScopeImpl>
+        ): ScatterSet<RecomposeScopeImpl> =
+            parentContext.recomposePaused(composition, shouldPause, invalidScopes)
+
         override fun invalidate(composition: ControlledComposition) {
             // Invalidate ourselves with our parent before we invalidate a child composer.
             // This ensures that when we are scheduling recompositions, parents always
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 e2efd82..f674dbe 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
@@ -18,13 +18,12 @@
 
 package androidx.compose.runtime
 
-import androidx.collection.MutableIntList
 import androidx.collection.MutableScatterSet
-import androidx.collection.mutableScatterSetOf
 import androidx.compose.runtime.changelist.ChangeList
 import androidx.compose.runtime.collection.ScopeMap
 import androidx.compose.runtime.collection.fastForEach
 import androidx.compose.runtime.internal.AtomicReference
+import androidx.compose.runtime.internal.RememberEventDispatcher
 import androidx.compose.runtime.internal.trace
 import androidx.compose.runtime.snapshots.ReaderKind
 import androidx.compose.runtime.snapshots.StateObjectImpl
@@ -289,6 +288,29 @@
      * used to compose as if the scopes have already been changed.
      */
     fun <R> delegateInvalidations(to: ControlledComposition?, groupIndex: Int, block: () -> R): R
+
+    /**
+     * Sets the [shouldPause] callback allowing a composition to be pausable if it is not `null`.
+     * Setting the callback to `null` disables pausing.
+     *
+     * @return the previous value of the callback which will be restored once the callback is no
+     *   longer needed.
+     * @see PausableComposition
+     */
+    fun setShouldPauseCallback(shouldPause: (() -> Boolean)?): (() -> Boolean)?
+}
+
+/** Utility function to set and restore a should pause callback. */
+internal inline fun <R> ControlledComposition.pausable(
+    noinline shouldPause: () -> Boolean,
+    block: () -> R
+): R {
+    val previous = setShouldPauseCallback(shouldPause)
+    return try {
+        block()
+    } finally {
+        setShouldPauseCallback(previous)
+    }
 }
 
 /**
@@ -409,7 +431,12 @@
     /** The applier to use to update the tree managed by the composition. */
     private val applier: Applier<*>,
     recomposeContext: CoroutineContext? = null
-) : ControlledComposition, ReusableComposition, RecomposeScopeOwner, CompositionServices {
+) :
+    ControlledComposition,
+    ReusableComposition,
+    RecomposeScopeOwner,
+    CompositionServices,
+    PausableComposition {
     /**
      * `null` if a composition isn't pending to apply. `Set<Any>` or `Array<Set<Any>>` if there are
      * modifications to record [PendingApplyNoModifications] if a composition is pending to apply,
@@ -520,6 +547,14 @@
     @Suppress("MemberVisibilityCanBePrivate") // published as internal
     internal var pendingInvalidScopes = false
 
+    /**
+     * If the [shouldPause] callback is set the composition is pausable and should pause whenever
+     * the [shouldPause] callback returns `true`.
+     */
+    private var shouldPause: (() -> Boolean)? = null
+
+    private var pendingPausedComposition: PausedCompositionImpl? = null
+
     private var invalidationDelegate: CompositionImpl? = null
 
     private var invalidationDelegateGroup: Int = 0
@@ -572,10 +607,16 @@
         get() = synchronized(lock) { composer.hasPendingChanges }
 
     override fun setContent(content: @Composable () -> Unit) {
+        checkPrecondition(pendingPausedComposition == null) {
+            "A pausable composition is in progress"
+        }
         composeInitial(content)
     }
 
     override fun setContentWithReuse(content: @Composable () -> Unit) {
+        checkPrecondition(pendingPausedComposition == null) {
+            "A pausable composition is in progress"
+        }
         composer.startReuseFromRoot()
 
         composeInitial(content)
@@ -583,6 +624,50 @@
         composer.endReuseFromRoot()
     }
 
+    override fun setPausableContent(content: @Composable () -> Unit): PausedComposition {
+        checkPrecondition(!disposed) { "The composition is disposed" }
+        checkPrecondition(pendingPausedComposition == null) {
+            "A pausable composition is in progress"
+        }
+        val pausedComposition =
+            PausedCompositionImpl(
+                composition = this,
+                context = parent,
+                composer = composer,
+                content = content,
+                reusable = false,
+                abandonSet = abandonSet,
+                applier = applier,
+                lock = lock,
+            )
+        pendingPausedComposition = pausedComposition
+        return pausedComposition
+    }
+
+    override fun setPausableContentWithReuse(content: @Composable () -> Unit): PausedComposition {
+        checkPrecondition(!disposed) { "The composition is disposed" }
+        checkPrecondition(pendingPausedComposition == null) {
+            "A pausable composition is in progress"
+        }
+        val pausedComposition =
+            PausedCompositionImpl(
+                composition = this,
+                context = parent,
+                composer = composer,
+                content = content,
+                reusable = true,
+                abandonSet = abandonSet,
+                applier = applier,
+                lock = lock,
+            )
+        pendingPausedComposition = pausedComposition
+        return pausedComposition
+    }
+
+    internal fun pausedCompositionFinished() {
+        pendingPausedComposition = null
+    }
+
     private fun composeInitial(content: @Composable () -> Unit) {
         checkPrecondition(!disposed) { "The composition is disposed" }
         this.composable = content
@@ -701,7 +786,7 @@
                             invalidations.asMap() as Map<RecomposeScope, Set<Any>>
                         )
                     }
-                    composer.composeContent(invalidations, content)
+                    composer.composeContent(invalidations, content, shouldPause)
                     observer?.onEndComposition(this)
                 }
             }
@@ -911,7 +996,7 @@
                         this,
                         invalidations.asMap() as Map<RecomposeScope, Set<Any>>
                     )
-                    composer.recompose(invalidations).also { shouldDrain ->
+                    composer.recompose(invalidations, shouldPause).also { shouldDrain ->
                         // Apply would normally do this for us; do it now if apply shouldn't happen.
                         if (!shouldDrain) drainPendingModificationsLocked()
                         observer?.onEndComposition(this)
@@ -939,11 +1024,13 @@
         try {
             if (changes.isEmpty()) return
             trace("Compose:applyChanges") {
+                val applier = pendingPausedComposition?.pausableApplier ?: applier
+                val rememberManager = pendingPausedComposition?.rememberManager ?: manager
                 applier.onBeginChanges()
 
                 // Apply all changes
                 slotTable.write { slots ->
-                    changes.executeAndFlushAllPendingChanges(applier, slots, manager)
+                    changes.executeAndFlushAllPendingChanges(applier, slots, rememberManager)
                 }
                 applier.onEndChanges()
             }
@@ -962,9 +1049,12 @@
                 }
             }
         } finally {
-            // Only dispatch abandons if we do not have any late changes. The instances in the
-            // abandon set can be remembered in the late changes.
-            if (this.lateChanges.isEmpty()) manager.dispatchAbandons()
+            // Only dispatch abandons if we do not have any late changes or pending paused
+            // compositions. The instances in the abandon set can be remembered in the late changes
+            // or when the paused composition is applied.
+            if (this.lateChanges.isEmpty() && pendingPausedComposition == null) {
+                manager.dispatchAbandons()
+            }
         }
     }
 
@@ -1062,6 +1152,12 @@
         } else block()
     }
 
+    override fun setShouldPauseCallback(shouldPause: (() -> Boolean)?): (() -> Boolean)? {
+        val previous = this.shouldPause
+        this.shouldPause = shouldPause
+        return previous
+    }
+
     override fun invalidate(scope: RecomposeScopeImpl, instance: Any?): InvalidationResult {
         if (scope.defaultsInScope) {
             scope.defaultsInvalid = true
@@ -1241,218 +1337,6 @@
 
     // This is only used in tests to ensure the stacks do not silently leak.
     internal fun composerStacksSizes(): Int = composer.stacksSize()
-
-    /** Helper for collecting remember observers for later strictly ordered dispatch. */
-    private class RememberEventDispatcher(private val abandoning: MutableSet<RememberObserver>) :
-        RememberManager {
-        private val remembering = mutableListOf<RememberObserver>()
-        private val leaving = mutableListOf<Any>()
-        private val sideEffects = mutableListOf<() -> Unit>()
-        private var releasing: MutableScatterSet<ComposeNodeLifecycleCallback>? = null
-        private val pending = mutableListOf<Any>()
-        private val priorities = MutableIntList()
-        private val afters = MutableIntList()
-
-        override fun remembering(instance: RememberObserver) {
-            remembering.add(instance)
-        }
-
-        override fun forgetting(
-            instance: RememberObserver,
-            endRelativeOrder: Int,
-            priority: Int,
-            endRelativeAfter: Int
-        ) {
-            recordLeaving(instance, endRelativeOrder, priority, endRelativeAfter)
-        }
-
-        override fun sideEffect(effect: () -> Unit) {
-            sideEffects += effect
-        }
-
-        override fun deactivating(
-            instance: ComposeNodeLifecycleCallback,
-            endRelativeOrder: Int,
-            priority: Int,
-            endRelativeAfter: Int
-        ) {
-            recordLeaving(instance, endRelativeOrder, priority, endRelativeAfter)
-        }
-
-        override fun releasing(
-            instance: ComposeNodeLifecycleCallback,
-            endRelativeOrder: Int,
-            priority: Int,
-            endRelativeAfter: Int
-        ) {
-            val releasing =
-                releasing
-                    ?: mutableScatterSetOf<ComposeNodeLifecycleCallback>().also { releasing = it }
-
-            releasing += instance
-            recordLeaving(instance, endRelativeOrder, priority, endRelativeAfter)
-        }
-
-        fun dispatchRememberObservers() {
-            // Add any pending out-of-order forgotten objects
-            processPendingLeaving(Int.MIN_VALUE)
-
-            // Send forgets and node callbacks
-            if (leaving.isNotEmpty()) {
-                trace("Compose:onForgotten") {
-                    val releasing = releasing
-                    for (i in leaving.size - 1 downTo 0) {
-                        val instance = leaving[i]
-                        if (instance is RememberObserver) {
-                            abandoning.remove(instance)
-                            instance.onForgotten()
-                        }
-                        if (instance is ComposeNodeLifecycleCallback) {
-                            // node callbacks are in the same queue as forgets to ensure ordering
-                            if (releasing != null && instance in releasing) {
-                                instance.onRelease()
-                            } else {
-                                instance.onDeactivate()
-                            }
-                        }
-                    }
-                }
-            }
-
-            // Send remembers
-            if (remembering.isNotEmpty()) {
-                trace("Compose:onRemembered") {
-                    remembering.fastForEach { instance ->
-                        abandoning.remove(instance)
-                        instance.onRemembered()
-                    }
-                }
-            }
-        }
-
-        fun dispatchSideEffects() {
-            if (sideEffects.isNotEmpty()) {
-                trace("Compose:sideeffects") {
-                    sideEffects.fastForEach { sideEffect -> sideEffect() }
-                    sideEffects.clear()
-                }
-            }
-        }
-
-        fun dispatchAbandons() {
-            if (abandoning.isNotEmpty()) {
-                trace("Compose:abandons") {
-                    val iterator = abandoning.iterator()
-                    // remove elements one by one to ensure that abandons will not be dispatched
-                    // second time in case [onAbandoned] throws.
-                    while (iterator.hasNext()) {
-                        val instance = iterator.next()
-                        iterator.remove()
-                        instance.onAbandoned()
-                    }
-                }
-            }
-        }
-
-        private fun recordLeaving(
-            instance: Any,
-            endRelativeOrder: Int,
-            priority: Int,
-            endRelativeAfter: Int
-        ) {
-            processPendingLeaving(endRelativeOrder)
-            if (endRelativeAfter in 0 until endRelativeOrder) {
-                pending.add(instance)
-                priorities.add(priority)
-                afters.add(endRelativeAfter)
-            } else {
-                leaving.add(instance)
-            }
-        }
-
-        private fun processPendingLeaving(endRelativeOrder: Int) {
-            if (pending.isNotEmpty()) {
-                var index = 0
-                var toAdd: MutableList<Any>? = null
-                var toAddAfter: MutableIntList? = null
-                var toAddPriority: MutableIntList? = null
-                while (index < afters.size) {
-                    if (endRelativeOrder <= afters[index]) {
-                        val instance = pending.removeAt(index)
-                        val endRelativeAfter = afters.removeAt(index)
-                        val priority = priorities.removeAt(index)
-
-                        if (toAdd == null) {
-                            toAdd = mutableListOf(instance)
-                            toAddAfter = MutableIntList().also { it.add(endRelativeAfter) }
-                            toAddPriority = MutableIntList().also { it.add(priority) }
-                        } else {
-                            toAddPriority as MutableIntList
-                            toAddAfter as MutableIntList
-                            toAdd.add(instance)
-                            toAddAfter.add(endRelativeAfter)
-                            toAddPriority.add(priority)
-                        }
-                    } else {
-                        index++
-                    }
-                }
-                if (toAdd != null) {
-                    toAddPriority as MutableIntList
-                    toAddAfter as MutableIntList
-
-                    // Sort the list into [after, -priority] order where it is ordered by after
-                    // in ascending order as the primary key and priority in descending order as
-                    // secondary key.
-
-                    // For example if remember occurs after a child group it must be added after
-                    // all the remembers of the child. This is reported with an after which is the
-                    // slot index of the child's last slot. As this slot might be at the same
-                    // location as where its parents ends this would be ambiguous which should
-                    // first if both the two groups request a slot to be after the same slot.
-                    // Priority is used to break the tie here which is the group index of the group
-                    // which is leaving. Groups that are lower must be added before the parent's
-                    // remember when they have the same after.
-
-                    // The sort must be stable as as consecutive remembers in the same group after
-                    // the same child will have the same after and priority.
-
-                    // A selection sort is used here because it is stable and the groups are
-                    // typically very short so this quickly exit list of one and not loop for
-                    // for sizes of 2. As the information is split between three lists, to
-                    // reduce allocations, [MutableList.sort] cannot be used as it doesn't have
-                    // an option to supply a custom swap.
-                    for (i in 0 until toAdd.size - 1) {
-                        for (j in i + 1 until toAdd.size) {
-                            val iAfter = toAddAfter[i]
-                            val jAfter = toAddAfter[j]
-                            if (
-                                iAfter < jAfter ||
-                                    (jAfter == iAfter && toAddPriority[i] < toAddPriority[j])
-                            ) {
-                                toAdd.swap(i, j)
-                                toAddPriority.swap(i, j)
-                                toAddAfter.swap(i, j)
-                            }
-                        }
-                    }
-                    leaving.addAll(toAdd)
-                }
-            }
-        }
-    }
-}
-
-private fun <T> MutableList<T>.swap(a: Int, b: Int) {
-    val item = this[a]
-    this[a] = this[b]
-    this[b] = item
-}
-
-private fun MutableIntList.swap(a: Int, b: Int) {
-    val item = this[a]
-    this[a] = this[b]
-    this[b] = item
 }
 
 internal object ScopeInvalidated
diff --git a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/CompositionContext.kt b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/CompositionContext.kt
index 561890c..e5b6d6b 100644
--- a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/CompositionContext.kt
+++ b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/CompositionContext.kt
@@ -16,6 +16,7 @@
 
 package androidx.compose.runtime
 
+import androidx.collection.ScatterSet
 import androidx.compose.runtime.internal.persistentCompositionLocalHashMapOf
 import androidx.compose.runtime.tooling.CompositionData
 import kotlin.coroutines.CoroutineContext
@@ -52,6 +53,20 @@
         content: @Composable () -> Unit
     )
 
+    internal abstract fun composeInitialPaused(
+        composition: ControlledComposition,
+        shouldPause: () -> Boolean,
+        content: @Composable () -> Unit
+    ): ScatterSet<RecomposeScopeImpl>
+
+    internal abstract fun recomposePaused(
+        composition: ControlledComposition,
+        shouldPause: () -> Boolean,
+        invalidScopes: ScatterSet<RecomposeScopeImpl>
+    ): ScatterSet<RecomposeScopeImpl>
+
+    internal abstract fun reportPausedScope(scope: RecomposeScopeImpl)
+
     internal abstract fun invalidate(composition: ControlledComposition)
 
     internal abstract fun invalidateScope(scope: RecomposeScopeImpl)
diff --git a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/PausableComposition.kt b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/PausableComposition.kt
new file mode 100644
index 0000000..0eff8d6
--- /dev/null
+++ b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/PausableComposition.kt
@@ -0,0 +1,381 @@
+/*
+ * Copyright 2024 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:OptIn(InternalComposeApi::class)
+
+package androidx.compose.runtime
+
+import androidx.collection.emptyScatterSet
+import androidx.collection.mutableIntListOf
+import androidx.collection.mutableObjectListOf
+import androidx.compose.runtime.internal.RememberEventDispatcher
+
+/**
+ * A [PausableComposition] is a sub-composition that can be composed incrementally as it supports
+ * being paused and resumed.
+ *
+ * Pausable sub-composition can be used between frames to prepare a sub-composition before it is
+ * required by the main composition. For example, this is used in lazy lists to prepare list items
+ * in between frames to that are likely to be scrolled in. The composition is paused when the start
+ * of the next frame is near allowing composition to be spread across multiple frames without
+ * delaying the production of the next frame.
+ *
+ * The result of the composition should not be used (e.g. the nodes should not added to a layout
+ * tree or placed in layout) until [PausedComposition.isComplete] is `true` and
+ * [PausedComposition.apply] has been called. The composition is incomplete and will not
+ * automatically recompose until after [PausedComposition.apply] is called.
+ *
+ * A [PausableComposition] is a [ReusableComposition] but [setPausableContent] should be used
+ * instead of [ReusableComposition.setContentWithReuse] to create a paused composition.
+ *
+ * If [Composition.setContent] or [ReusableComposition.setContentWithReuse] are used then the
+ * composition behaves as if it wasn't pausable. If there is a [PausedComposition] that has not yet
+ * been applied, an exception is thrown.
+ *
+ * @see Composition
+ * @see ReusableComposition
+ */
+interface PausableComposition : ReusableComposition {
+    /**
+     * Set the content of the composition. A [PausedComposition] that is currently paused. No
+     * composition is performed until [PausedComposition.resume] is called.
+     * [PausedComposition.resume] should be called until [PausedComposition.isComplete] is `true`.
+     * The composition should not be used until [PausedComposition.isComplete] is `true` and
+     * [PausedComposition.apply] has been called.
+     *
+     * @see Composition.setContent
+     * @see ReusableComposition.setContentWithReuse
+     */
+    fun setPausableContent(content: @Composable () -> Unit): PausedComposition
+
+    /**
+     * Set the content of a resuable composition. A [PausedComposition] that is currently paused. No
+     * composition is performed until [PausedComposition.resume] is called.
+     * [PausedComposition.resume] should be called until [PausedComposition.isComplete] is `true`.
+     * The composition should not be used until [PausedComposition.isComplete] is `true` and
+     * [PausedComposition.apply] has been called.
+     *
+     * @see Composition.setContent
+     * @see ReusableComposition.setContentWithReuse
+     */
+    fun setPausableContentWithReuse(content: @Composable () -> Unit): PausedComposition
+}
+
+/**
+ * [PausedComposition] is the result of calling [PausableComposition.setContent] or
+ * [PausableComposition.setContentWithReuse]. It is used to drive the paused composition to
+ * completion. A [PausedComposition] should not be used until [isComplete] is `true` and [apply] has
+ * been called.
+ *
+ * A [PausedComposition] is created paused and will only compose the `content` parameter when
+ * [resume] is called the first time.
+ */
+interface PausedComposition {
+    /**
+     * Returns `true` when the [PausedComposition] is complete. [isComplete] matches the last value
+     * returned from [resume]. Once a [PausedComposition] is [isComplete] the [apply] method should
+     * be called.
+     */
+    val isComplete: Boolean
+
+    /**
+     * Resume the composition that has been paused. This method should be called until [resume]
+     * returns `true` or [isComplete] is `true` which has the same result as the last result of
+     * calling [resume]. The [shouldPause] parameter is a lambda that returns whether the
+     * composition should be paused. For example, in lazy lists this returns `false` until just
+     * prior to the next frame starting in which it returns `true`
+     *
+     * Calling [resume] after it returns `true` or when `isComplete` is true will throw an
+     * exception.
+     *
+     * @param shouldPause A lambda that is used to determine if the composition should be paused.
+     *   This lambda is called often so should be a very simple calculation. Returning `true` does
+     *   not guarantee the composition will pause, it should only be considered a request to pause
+     *   the composition. Not all composable functions are pausable and only pausable composition
+     *   functions will pause.
+     * @return `true` if the composition is complete and `false` if one or more calls to `resume`
+     *   are required to complete composition.
+     */
+    fun resume(shouldPause: () -> Boolean): Boolean
+
+    /**
+     * Apply the composition. This is the last step of a paused composition and is required to be
+     * called prior to the composition is usable.
+     */
+    fun apply()
+
+    /**
+     * Cancels the paused composition. This should only be used if the composition is going to be
+     * disposed and the entire composition is not going to be used.
+     */
+    fun cancel()
+}
+
+/**
+ * Create a [PausableComposition]. A [PausableComposition] can create a [PausedComposition] which
+ * allows pausing and resuming the composition.
+ *
+ * @param applier The [Applier] instance to be used in the composition.
+ * @param parent The parent [CompositionContext].
+ * @see Applier
+ * @see CompositionContext
+ * @see PausableComposition
+ */
+fun PausableComposition(applier: Applier<*>, parent: CompositionContext): PausableComposition =
+    CompositionImpl(parent, applier)
+
+internal enum class PausedCompositionState {
+    Invalid,
+    Cancelled,
+    InitialPending,
+    RecomposePending,
+    ApplyPending,
+    Applied,
+}
+
+internal class PausedCompositionImpl(
+    val composition: CompositionImpl,
+    val context: CompositionContext,
+    val composer: ComposerImpl,
+    abandonSet: MutableSet<RememberObserver>,
+    val content: @Composable () -> Unit,
+    val reusable: Boolean,
+    val applier: Applier<*>,
+    val lock: SynchronizedObject,
+) : PausedComposition {
+    private var state = PausedCompositionState.InitialPending
+    private var invalidScopes = emptyScatterSet<RecomposeScopeImpl>()
+    internal val rememberManager = RememberEventDispatcher(abandonSet)
+    internal val pausableApplier = RecordingApplier(applier.current)
+
+    override val isComplete: Boolean
+        get() = state >= PausedCompositionState.ApplyPending
+
+    override fun resume(shouldPause: () -> Boolean): Boolean {
+        try {
+            when (state) {
+                PausedCompositionState.InitialPending -> {
+                    if (reusable) composer.startReuseFromRoot()
+                    try {
+                        invalidScopes =
+                            context.composeInitialPaused(composition, shouldPause, content)
+                    } finally {
+                        if (reusable) composer.endReuseFromRoot()
+                    }
+                    state = PausedCompositionState.RecomposePending
+                    if (invalidScopes.isEmpty()) markComplete()
+                }
+                PausedCompositionState.RecomposePending -> {
+                    invalidScopes = context.recomposePaused(composition, shouldPause, invalidScopes)
+                    if (invalidScopes.isEmpty()) markComplete()
+                }
+                PausedCompositionState.ApplyPending ->
+                    error("Pausable composition is complete and apply() should be applied")
+                PausedCompositionState.Applied -> error("The paused composition has been applied")
+                PausedCompositionState.Cancelled ->
+                    error("The paused composition has been cancelled")
+                PausedCompositionState.Invalid ->
+                    error("The paused composition is invalid because of a previous exception")
+            }
+        } catch (e: Exception) {
+            state = PausedCompositionState.Invalid
+        }
+        return isComplete
+    }
+
+    override fun apply() {
+        try {
+            when (state) {
+                PausedCompositionState.InitialPending,
+                PausedCompositionState.RecomposePending ->
+                    error("The paused composition has not completed yet")
+                PausedCompositionState.ApplyPending -> {
+                    applyChanges()
+                    state = PausedCompositionState.Applied
+                }
+                PausedCompositionState.Applied ->
+                    error("The paused composition has already been applied")
+                PausedCompositionState.Cancelled ->
+                    error("The paused composition has been cancelled")
+                PausedCompositionState.Invalid ->
+                    error("The paused composition is invalid because of a previous exception")
+            }
+        } catch (e: Exception) {
+            state = PausedCompositionState.Invalid
+            throw e
+        }
+    }
+
+    override fun cancel() {
+        state = PausedCompositionState.Cancelled
+        rememberManager.dispatchAbandons()
+        composition.pausedCompositionFinished()
+    }
+
+    private fun markComplete() {
+        state = PausedCompositionState.ApplyPending
+    }
+
+    private fun applyChanges() {
+        synchronized(lock) {
+            @Suppress("UNCHECKED_CAST")
+            try {
+                pausableApplier.playTo(applier as Applier<Any?>)
+                rememberManager.dispatchRememberObservers()
+                rememberManager.dispatchSideEffects()
+            } finally {
+                rememberManager.dispatchAbandons()
+                composition.pausedCompositionFinished()
+            }
+        }
+    }
+}
+
+internal class RecordingApplier<N>(root: N) : Applier<N> {
+    private val stack = mutableObjectListOf<N>()
+    private val operations = mutableIntListOf()
+    private val instances = mutableObjectListOf<Any?>()
+
+    override var current: N = root
+
+    override fun down(node: N) {
+        operations.add(DOWN)
+        instances.add(node)
+        stack.add(current)
+        current = node
+    }
+
+    override fun up() {
+        operations.add(UP)
+        current = stack.removeAt(stack.size - 1)
+    }
+
+    override fun remove(index: Int, count: Int) {
+        operations.add(REMOVE)
+        operations.add(index)
+        operations.add(count)
+    }
+
+    override fun move(from: Int, to: Int, count: Int) {
+        operations.add(MOVE)
+        operations.add(from)
+        operations.add(to)
+        operations.add(count)
+    }
+
+    override fun clear() {
+        operations.add(CLEAR)
+    }
+
+    override fun insertBottomUp(index: Int, instance: N) {
+        operations.add(INSERT_BOTTOM_UP)
+        operations.add(index)
+        instances.add(instance)
+    }
+
+    override fun insertTopDown(index: Int, instance: N) {
+        operations.add(INSERT_TOP_DOWN)
+        operations.add(index)
+        instances.add(instance)
+    }
+
+    override fun apply(block: N.(Any?) -> Unit, value: Any?) {
+        operations.add(APPLY)
+        instances.add(block)
+        instances.add(value)
+    }
+
+    override fun reuse() {
+        operations.add(REUSE)
+    }
+
+    fun playTo(applier: Applier<N>) {
+        var currentOperation = 0
+        var currentInstance = 0
+        val operations = operations
+        val size = operations.size
+        val instances = instances
+        applier.onBeginChanges()
+        try {
+            while (currentOperation < size) {
+                val operation = operations[currentOperation++]
+                when (operation) {
+                    UP -> {
+                        applier.up()
+                    }
+                    DOWN -> {
+                        @Suppress("UNCHECKED_CAST") val node = instances[currentInstance++] as N
+                        applier.down(node)
+                    }
+                    REMOVE -> {
+                        val index = operations[currentOperation++]
+                        val count = operations[currentOperation++]
+                        applier.remove(index, count)
+                    }
+                    MOVE -> {
+                        val from = operations[currentOperation++]
+                        val to = operations[currentOperation++]
+                        val count = operations[currentOperation++]
+                        applier.move(from, to, count)
+                    }
+                    CLEAR -> {
+                        applier.clear()
+                    }
+                    INSERT_TOP_DOWN -> {
+                        val index = operations[currentOperation++]
+
+                        @Suppress("UNCHECKED_CAST") val instance = instances[currentInstance++] as N
+                        applier.insertTopDown(index, instance)
+                    }
+                    INSERT_BOTTOM_UP -> {
+                        val index = operations[currentOperation++]
+
+                        @Suppress("UNCHECKED_CAST") val instance = instances[currentInstance++] as N
+                        applier.insertBottomUp(index, instance)
+                    }
+                    APPLY -> {
+                        @Suppress("UNCHECKED_CAST")
+                        val block = instances[currentInstance++] as Any?.(Any?) -> Unit
+                        val value = instances[currentInstance++]
+                        applier.apply(block, value)
+                    }
+                    REUSE -> {
+                        applier.reuse()
+                    }
+                }
+            }
+            runtimeCheck(currentInstance == instances.size) { "Applier operation size mismatch" }
+            instances.clear()
+            operations.clear()
+        } finally {
+            applier.onEndChanges()
+        }
+    }
+
+    // These commands need to be an integer, not just a enum value, as they are stored along side
+    // the commands integer parameters, so the values are explicitly set.
+    companion object {
+        const val UP = 0
+        const val DOWN = UP + 1
+        const val REMOVE = DOWN + 1
+        const val MOVE = REMOVE + 1
+        const val CLEAR = MOVE + 1
+        const val INSERT_BOTTOM_UP = CLEAR + 1
+        const val INSERT_TOP_DOWN = INSERT_BOTTOM_UP + 1
+        const val APPLY = INSERT_TOP_DOWN + 1
+        const val REUSE = APPLY + 1
+    }
+}
diff --git a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/RecomposeScopeImpl.kt b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/RecomposeScopeImpl.kt
index 88245a7..48657d5 100644
--- a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/RecomposeScopeImpl.kt
+++ b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/RecomposeScopeImpl.kt
@@ -55,13 +55,16 @@
         ((lowBits shl 1) and highBits))
 }
 
-private const val UsedFlag = 0x01
-private const val DefaultsInScopeFlag = 0x02
-private const val DefaultsInvalidFlag = 0x04
-private const val RequiresRecomposeFlag = 0x08
-private const val SkippedFlag = 0x10
-private const val RereadingFlag = 0x20
-private const val ForcedRecomposeFlag = 0x40
+private const val UsedFlag = 0x001
+private const val DefaultsInScopeFlag = 0x002
+private const val DefaultsInvalidFlag = 0x004
+private const val RequiresRecomposeFlag = 0x008
+private const val SkippedFlag = 0x010
+private const val RereadingFlag = 0x020
+private const val ForcedRecomposeFlag = 0x040
+private const val ForceReusing = 0x080
+private const val Paused = 0x100
+private const val Resuming = 0x200
 
 internal interface RecomposeScopeOwner {
     fun invalidate(scope: RecomposeScopeImpl, instance: Any?): InvalidationResult
@@ -110,11 +113,51 @@
     var used: Boolean
         get() = flags and UsedFlag != 0
         set(value) {
-            if (value) {
-                flags = flags or UsedFlag
-            } else {
-                flags = flags and UsedFlag.inv()
-            }
+            flags =
+                if (value) {
+                    flags or UsedFlag
+                } else {
+                    flags and UsedFlag.inv()
+                }
+        }
+
+    /**
+     * Used to force a scope to the reusing state when a composition is paused while reusing
+     * content.
+     */
+    var reusing: Boolean
+        get() = flags and ForceReusing != 0
+        set(value) {
+            flags =
+                if (value) {
+                    flags or ForceReusing
+                } else {
+                    flags and ForceReusing.inv()
+                }
+        }
+
+    /** Used to flag a scope as paused for pausable compositions */
+    var paused: Boolean
+        get() = flags and Paused != 0
+        set(value) {
+            flags =
+                if (value) {
+                    flags or Paused
+                } else {
+                    flags and Paused.inv()
+                }
+        }
+
+    /** Used to flag a scope as paused for pausable compositions */
+    var resuming: Boolean
+        get() = flags and Resuming != 0
+        set(value) {
+            flags =
+                if (value) {
+                    flags or Resuming
+                } else {
+                    flags and Resuming.inv()
+                }
         }
 
     /**
@@ -299,7 +342,9 @@
     }
 
     fun scopeSkipped() {
-        skipped = true
+        if (!reusing) {
+            skipped = true
+        }
     }
 
     /**
diff --git a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/Recomposer.kt b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/Recomposer.kt
index 67d0d8a..e347076 100644
--- a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/Recomposer.kt
+++ b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/Recomposer.kt
@@ -17,12 +17,15 @@
 package androidx.compose.runtime
 
 import androidx.collection.MutableScatterSet
+import androidx.collection.ScatterSet
+import androidx.collection.emptyScatterSet
 import androidx.collection.mutableScatterSetOf
 import androidx.compose.runtime.collection.fastForEach
 import androidx.compose.runtime.collection.mutableVectorOf
 import androidx.compose.runtime.collection.wrapIntoSet
 import androidx.compose.runtime.external.kotlinx.collections.immutable.persistentSetOf
 import androidx.compose.runtime.internal.AtomicReference
+import androidx.compose.runtime.internal.SnapshotThreadLocal
 import androidx.compose.runtime.internal.logError
 import androidx.compose.runtime.internal.trace
 import androidx.compose.runtime.snapshots.MutableSnapshot
@@ -232,6 +235,7 @@
     // End properties guarded by stateLock
 
     private val _state = MutableStateFlow(State.Inactive)
+    private val pausedScopes = SnapshotThreadLocal<MutableScatterSet<RecomposeScopeImpl>?>()
 
     /**
      * A [Job] used as a parent of any effects created by this [Recomposer]'s compositions. Its
@@ -1116,6 +1120,54 @@
         }
     }
 
+    internal override fun composeInitialPaused(
+        composition: ControlledComposition,
+        shouldPause: () -> Boolean,
+        content: @Composable () -> Unit
+    ): ScatterSet<RecomposeScopeImpl> {
+        return try {
+            composition.pausable(shouldPause) {
+                composeInitial(composition, content)
+                pausedScopes.get() ?: emptyScatterSet()
+            }
+        } finally {
+            pausedScopes.set(null)
+        }
+    }
+
+    internal override fun recomposePaused(
+        composition: ControlledComposition,
+        shouldPause: () -> Boolean,
+        invalidScopes: ScatterSet<RecomposeScopeImpl>
+    ): ScatterSet<RecomposeScopeImpl> {
+        return try {
+            recordComposerModifications()
+            composition.recordModificationsOf(invalidScopes.wrapIntoSet())
+            composition.pausable(shouldPause) {
+                val needsApply = performRecompose(composition, null)
+                if (needsApply != null) {
+                    performInitialMovableContentInserts(composition)
+                    needsApply.applyChanges()
+                    needsApply.applyLateChanges()
+                }
+                pausedScopes.get() ?: emptyScatterSet()
+            }
+        } finally {
+            pausedScopes.set(null)
+        }
+    }
+
+    override fun reportPausedScope(scope: RecomposeScopeImpl) {
+        val scopes =
+            pausedScopes.get()
+                ?: run {
+                    val newScopes = mutableScatterSetOf<RecomposeScopeImpl>()
+                    pausedScopes.set(newScopes)
+                    newScopes
+                }
+        scopes.add(scope)
+    }
+
     private fun performInitialMovableContentInserts(composition: ControlledComposition) {
         synchronized(stateLock) {
             if (!compositionValuesAwaitingInsert.fastAny { it.composition == composition }) return
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/changelist/ChangeList.kt
index 4780cdb..e2eaa76 100644
--- a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/changelist/ChangeList.kt
+++ b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/changelist/ChangeList.kt
@@ -25,6 +25,7 @@
 import androidx.compose.runtime.InternalComposeApi
 import androidx.compose.runtime.MovableContentState
 import androidx.compose.runtime.MovableContentStateReference
+import androidx.compose.runtime.RecomposeScopeImpl
 import androidx.compose.runtime.RememberManager
 import androidx.compose.runtime.RememberObserver
 import androidx.compose.runtime.SlotTable
@@ -40,6 +41,7 @@
 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
@@ -48,11 +50,13 @@
 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
@@ -87,6 +91,18 @@
         operations.push(Remember) { setObject(Remember.Value, value) }
     }
 
+    fun pushRememberPausingScope(scope: RecomposeScopeImpl) {
+        operations.push(RememberPausingScope) { setObject(RememberPausingScope.Scope, scope) }
+    }
+
+    fun pushStartResumingScope(scope: RecomposeScopeImpl) {
+        operations.push(StartResumingScope) { setObject(StartResumingScope.Scope, scope) }
+    }
+
+    fun pushEndResumingScope(scope: RecomposeScopeImpl) {
+        operations.push(EndResumingScope) { setObject(EndResumingScope.Scope, scope) }
+    }
+
     fun pushUpdateValue(value: Any?, groupSlotIndex: Int) {
         operations.push(UpdateValue) {
             setObject(UpdateValue.Value, value)
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/changelist/ComposerChangeListWriter.kt
index 74c7146..9b87d45 100644
--- a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/changelist/ComposerChangeListWriter.kt
+++ b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/changelist/ComposerChangeListWriter.kt
@@ -25,6 +25,7 @@
 import androidx.compose.runtime.InternalComposeApi
 import androidx.compose.runtime.MovableContentState
 import androidx.compose.runtime.MovableContentStateReference
+import androidx.compose.runtime.RecomposeScopeImpl
 import androidx.compose.runtime.RememberObserver
 import androidx.compose.runtime.SlotReader
 import androidx.compose.runtime.SlotTable
@@ -192,6 +193,18 @@
         changeList.pushRemember(value)
     }
 
+    fun rememberPausingScope(scope: RecomposeScopeImpl) {
+        changeList.pushRememberPausingScope(scope)
+    }
+
+    fun startResumingScope(scope: RecomposeScopeImpl) {
+        changeList.pushStartResumingScope(scope)
+    }
+
+    fun endResumingScope(scope: RecomposeScopeImpl) {
+        changeList.pushEndResumingScope(scope)
+    }
+
     fun updateValue(value: Any?, groupSlotIndex: Int) {
         pushSlotTableOperationPreamble(useParentSlot = true)
         changeList.pushUpdateValue(value, groupSlotIndex)
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/changelist/Operation.kt
index 894f3d47..15aa234 100644
--- a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/changelist/Operation.kt
+++ b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/changelist/Operation.kt
@@ -18,7 +18,6 @@
 
 import androidx.compose.runtime.Anchor
 import androidx.compose.runtime.Applier
-import androidx.compose.runtime.ComposeNodeLifecycleCallback
 import androidx.compose.runtime.Composition
 import androidx.compose.runtime.CompositionContext
 import androidx.compose.runtime.ControlledComposition
@@ -171,6 +170,66 @@
         }
     }
 
+    object RememberPausingScope : Operation(objects = 1) {
+        inline val Scope
+            get() = ObjectParameter<RecomposeScopeImpl>(0)
+
+        override fun objectParamName(parameter: ObjectParameter<*>): String =
+            when (parameter) {
+                Scope -> "scope"
+                else -> super.objectParamName(parameter)
+            }
+
+        override fun OperationArgContainer.execute(
+            applier: Applier<*>,
+            slots: SlotWriter,
+            rememberManager: RememberManager
+        ) {
+            val scope = getObject(Scope)
+            rememberManager.rememberPausingScope(scope)
+        }
+    }
+
+    object StartResumingScope : Operation(objects = 1) {
+        inline val Scope
+            get() = ObjectParameter<RecomposeScopeImpl>(0)
+
+        override fun objectParamName(parameter: ObjectParameter<*>): String =
+            when (parameter) {
+                Scope -> "scope"
+                else -> super.objectParamName(parameter)
+            }
+
+        override fun OperationArgContainer.execute(
+            applier: Applier<*>,
+            slots: SlotWriter,
+            rememberManager: RememberManager
+        ) {
+            val scope = getObject(Scope)
+            rememberManager.startResumingScope(scope)
+        }
+    }
+
+    object EndResumingScope : Operation(objects = 1) {
+        inline val Scope
+            get() = ObjectParameter<RecomposeScopeImpl>(0)
+
+        override fun objectParamName(parameter: ObjectParameter<*>): String =
+            when (parameter) {
+                Scope -> "scope"
+                else -> super.objectParamName(parameter)
+            }
+
+        override fun OperationArgContainer.execute(
+            applier: Applier<*>,
+            slots: SlotWriter,
+            rememberManager: RememberManager
+        ) {
+            val scope = getObject(Scope)
+            rememberManager.endResumingScope(scope)
+        }
+    }
+
     object AppendValue : Operation(objects = 2) {
         inline val Anchor
             get() = ObjectParameter<Anchor>(0)
@@ -467,7 +526,7 @@
             slots: SlotWriter,
             rememberManager: RememberManager
         ) {
-            (applier.current as ComposeNodeLifecycleCallback).onReuse()
+            applier.reuse()
         }
     }
 
@@ -492,7 +551,7 @@
         ) {
             val value = getObject(Value)
             val block = getObject(Block)
-            applier.current.block(value)
+            applier.apply(block, value)
         }
     }
 
diff --git a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/internal/RememberEventDispatcher.kt b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/internal/RememberEventDispatcher.kt
new file mode 100644
index 0000000..d9d78ea
--- /dev/null
+++ b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/internal/RememberEventDispatcher.kt
@@ -0,0 +1,301 @@
+/*
+ * Copyright 2024 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.internal
+
+import androidx.collection.MutableIntList
+import androidx.collection.MutableScatterMap
+import androidx.collection.MutableScatterSet
+import androidx.collection.mutableScatterMapOf
+import androidx.collection.mutableScatterSetOf
+import androidx.compose.runtime.ComposeNodeLifecycleCallback
+import androidx.compose.runtime.RecomposeScopeImpl
+import androidx.compose.runtime.RememberManager
+import androidx.compose.runtime.RememberObserver
+import androidx.compose.runtime.Stack
+import androidx.compose.runtime.snapshots.fastForEach
+
+/**
+ * Used as a placeholder for paused compositions to ensure the remembers are dispatch in the correct
+ * order. While the paused composition is resuming all remembered objects are placed into the this
+ * classes list instead of the main list. As remembers are dispatched, this will dispatch remembers
+ * to the object remembered in the paused composition's content in the order that they would have
+ * been dispatched had the composition not been paused.
+ */
+internal class PausedCompositionRemembers(private val abandoning: MutableSet<RememberObserver>) :
+    RememberObserver {
+    val pausedRemembers = mutableListOf<RememberObserver>()
+
+    override fun onRemembered() {
+        pausedRemembers.fastForEach {
+            abandoning.remove(it)
+            it.onRemembered()
+        }
+    }
+
+    // These are never called
+    override fun onForgotten() {}
+
+    override fun onAbandoned() {}
+}
+
+/** Helper for collecting remember observers for later strictly ordered dispatch. */
+internal class RememberEventDispatcher(private val abandoning: MutableSet<RememberObserver>) :
+    RememberManager {
+    private val remembering = mutableListOf<RememberObserver>()
+    private var currentRememberingList = remembering
+    private val leaving = mutableListOf<Any>()
+    private val sideEffects = mutableListOf<() -> Unit>()
+    private var releasing: MutableScatterSet<ComposeNodeLifecycleCallback>? = null
+    private var pausedPlaceholders:
+        MutableScatterMap<RecomposeScopeImpl, PausedCompositionRemembers>? =
+        null
+    private val pending = mutableListOf<Any>()
+    private val priorities = MutableIntList()
+    private val afters = MutableIntList()
+    private var nestedRemembersLists: Stack<MutableList<RememberObserver>>? = null
+
+    override fun remembering(instance: RememberObserver) {
+        currentRememberingList.add(instance)
+    }
+
+    override fun forgetting(
+        instance: RememberObserver,
+        endRelativeOrder: Int,
+        priority: Int,
+        endRelativeAfter: Int
+    ) {
+        recordLeaving(instance, endRelativeOrder, priority, endRelativeAfter)
+    }
+
+    override fun sideEffect(effect: () -> Unit) {
+        sideEffects += effect
+    }
+
+    override fun deactivating(
+        instance: ComposeNodeLifecycleCallback,
+        endRelativeOrder: Int,
+        priority: Int,
+        endRelativeAfter: Int
+    ) {
+        recordLeaving(instance, endRelativeOrder, priority, endRelativeAfter)
+    }
+
+    override fun releasing(
+        instance: ComposeNodeLifecycleCallback,
+        endRelativeOrder: Int,
+        priority: Int,
+        endRelativeAfter: Int
+    ) {
+        val releasing =
+            releasing ?: mutableScatterSetOf<ComposeNodeLifecycleCallback>().also { releasing = it }
+
+        releasing += instance
+        recordLeaving(instance, endRelativeOrder, priority, endRelativeAfter)
+    }
+
+    override fun rememberPausingScope(scope: RecomposeScopeImpl) {
+        val pausedPlaceholder = PausedCompositionRemembers(abandoning)
+        (pausedPlaceholders
+            ?: mutableScatterMapOf<RecomposeScopeImpl, PausedCompositionRemembers>().also {
+                pausedPlaceholders = it
+            })[scope] = pausedPlaceholder
+        this.currentRememberingList.add(pausedPlaceholder)
+    }
+
+    override fun startResumingScope(scope: RecomposeScopeImpl) {
+        val placeholder = pausedPlaceholders?.get(scope)
+        if (placeholder != null) {
+            (nestedRemembersLists
+                    ?: Stack<MutableList<RememberObserver>>().also { nestedRemembersLists = it })
+                .push(currentRememberingList)
+            currentRememberingList = placeholder.pausedRemembers
+        }
+    }
+
+    override fun endResumingScope(scope: RecomposeScopeImpl) {
+        val pausedPlaceholders = pausedPlaceholders
+        if (pausedPlaceholders != null) {
+            val placeholder = pausedPlaceholders[scope]
+            if (placeholder != null) {
+                nestedRemembersLists?.pop()?.let { currentRememberingList = it }
+                pausedPlaceholders.remove(scope)
+            }
+        }
+    }
+
+    fun dispatchRememberObservers() {
+        // Add any pending out-of-order forgotten objects
+        processPendingLeaving(Int.MIN_VALUE)
+
+        // Send forgets and node callbacks
+        if (leaving.isNotEmpty()) {
+            trace("Compose:onForgotten") {
+                val releasing = releasing
+                for (i in leaving.size - 1 downTo 0) {
+                    val instance = leaving[i]
+                    if (instance is RememberObserver) {
+                        abandoning.remove(instance)
+                        instance.onForgotten()
+                    }
+                    if (instance is ComposeNodeLifecycleCallback) {
+                        // node callbacks are in the same queue as forgets to ensure ordering
+                        if (releasing != null && instance in releasing) {
+                            instance.onRelease()
+                        } else {
+                            instance.onDeactivate()
+                        }
+                    }
+                }
+            }
+        }
+
+        // Send remembers
+        if (remembering.isNotEmpty()) {
+            trace("Compose:onRemembered") { dispatchRememberList(remembering) }
+        }
+    }
+
+    private fun dispatchRememberList(list: List<RememberObserver>) {
+        list.fastForEach { instance ->
+            abandoning.remove(instance)
+            instance.onRemembered()
+        }
+    }
+
+    fun dispatchSideEffects() {
+        if (sideEffects.isNotEmpty()) {
+            trace("Compose:sideeffects") {
+                sideEffects.fastForEach { sideEffect -> sideEffect() }
+                sideEffects.clear()
+            }
+        }
+    }
+
+    fun dispatchAbandons() {
+        if (abandoning.isNotEmpty()) {
+            trace("Compose:abandons") {
+                val iterator = abandoning.iterator()
+                // remove elements one by one to ensure that abandons will not be dispatched
+                // second time in case [onAbandoned] throws.
+                while (iterator.hasNext()) {
+                    val instance = iterator.next()
+                    iterator.remove()
+                    instance.onAbandoned()
+                }
+            }
+        }
+    }
+
+    private fun recordLeaving(
+        instance: Any,
+        endRelativeOrder: Int,
+        priority: Int,
+        endRelativeAfter: Int
+    ) {
+        processPendingLeaving(endRelativeOrder)
+        if (endRelativeAfter in 0 until endRelativeOrder) {
+            pending.add(instance)
+            priorities.add(priority)
+            afters.add(endRelativeAfter)
+        } else {
+            leaving.add(instance)
+        }
+    }
+
+    private fun processPendingLeaving(endRelativeOrder: Int) {
+        if (pending.isNotEmpty()) {
+            var index = 0
+            var toAdd: MutableList<Any>? = null
+            var toAddAfter: MutableIntList? = null
+            var toAddPriority: MutableIntList? = null
+            while (index < afters.size) {
+                if (endRelativeOrder <= afters[index]) {
+                    val instance = pending.removeAt(index)
+                    val endRelativeAfter = afters.removeAt(index)
+                    val priority = priorities.removeAt(index)
+
+                    if (toAdd == null) {
+                        toAdd = mutableListOf(instance)
+                        toAddAfter = MutableIntList().also { it.add(endRelativeAfter) }
+                        toAddPriority = MutableIntList().also { it.add(priority) }
+                    } else {
+                        toAddPriority as MutableIntList
+                        toAddAfter as MutableIntList
+                        toAdd.add(instance)
+                        toAddAfter.add(endRelativeAfter)
+                        toAddPriority.add(priority)
+                    }
+                } else {
+                    index++
+                }
+            }
+            if (toAdd != null) {
+                toAddPriority as MutableIntList
+                toAddAfter as MutableIntList
+
+                // Sort the list into [after, -priority] order where it is ordered by after
+                // in ascending order as the primary key and priority in descending order as
+                // secondary key.
+
+                // For example if remember occurs after a child group it must be added after
+                // all the remembers of the child. This is reported with an after which is the
+                // slot index of the child's last slot. As this slot might be at the same
+                // location as where its parents ends this would be ambiguous which should
+                // first if both the two groups request a slot to be after the same slot.
+                // Priority is used to break the tie here which is the group index of the group
+                // which is leaving. Groups that are lower must be added before the parent's
+                // remember when they have the same after.
+
+                // The sort must be stable as as consecutive remembers in the same group after
+                // the same child will have the same after and priority.
+
+                // A selection sort is used here because it is stable and the groups are
+                // typically very short so this quickly exit list of one and not loop for
+                // for sizes of 2. As the information is split between three lists, to
+                // reduce allocations, [MutableList.sort] cannot be used as it doesn't have
+                // an option to supply a custom swap.
+                for (i in 0 until toAdd.size - 1) {
+                    for (j in i + 1 until toAdd.size) {
+                        val iAfter = toAddAfter[i]
+                        val jAfter = toAddAfter[j]
+                        if (
+                            iAfter < jAfter ||
+                                (jAfter == iAfter && toAddPriority[i] < toAddPriority[j])
+                        ) {
+                            toAdd.swap(i, j)
+                            toAddPriority.swap(i, j)
+                            toAddAfter.swap(i, j)
+                        }
+                    }
+                }
+                leaving.addAll(toAdd)
+            }
+        }
+    }
+}
+
+private fun <T> MutableList<T>.swap(a: Int, b: Int) {
+    val item = this[a]
+    this[a] = this[b]
+    this[b] = item
+}
+
+private fun MutableIntList.swap(a: Int, b: Int) {
+    val item = this[a]
+    this[a] = this[b]
+    this[b] = item
+}
diff --git a/compose/runtime/runtime/src/nonEmulatorCommonTest/kotlin/androidx/compose/runtime/CompositionTests.kt b/compose/runtime/runtime/src/nonEmulatorCommonTest/kotlin/androidx/compose/runtime/CompositionTests.kt
index c2560dd..9328a61 100644
--- a/compose/runtime/runtime/src/nonEmulatorCommonTest/kotlin/androidx/compose/runtime/CompositionTests.kt
+++ b/compose/runtime/runtime/src/nonEmulatorCommonTest/kotlin/androidx/compose/runtime/CompositionTests.kt
@@ -4800,16 +4800,16 @@
 private val rob_reports_to_alice = Report("Rob", "Alice")
 private val clark_reports_to_lois = Report("Clark", "Lois")
 
-private interface Counted {
+internal interface Counted {
     val count: Int
 }
 
-private interface Ordered {
+internal interface Ordered {
     val rememberOrder: Int
     val forgetOrder: Int
 }
 
-private interface Named {
+internal interface Named {
     val name: String
 }
 
diff --git a/compose/runtime/runtime/src/nonEmulatorCommonTest/kotlin/androidx/compose/runtime/PausableCompositionTests.kt b/compose/runtime/runtime/src/nonEmulatorCommonTest/kotlin/androidx/compose/runtime/PausableCompositionTests.kt
new file mode 100644
index 0000000..e885f96
--- /dev/null
+++ b/compose/runtime/runtime/src/nonEmulatorCommonTest/kotlin/androidx/compose/runtime/PausableCompositionTests.kt
@@ -0,0 +1,607 @@
+/*
+ * Copyright 2024 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
+
+import android.annotation.SuppressLint
+import androidx.compose.runtime.mock.EmptyApplier
+import androidx.compose.runtime.mock.Linear
+import androidx.compose.runtime.mock.MockViewValidator
+import androidx.compose.runtime.mock.Text
+import androidx.compose.runtime.mock.View
+import androidx.compose.runtime.mock.ViewApplier
+import androidx.compose.runtime.mock.compositionTest
+import androidx.compose.runtime.mock.validate
+import androidx.compose.runtime.mock.view
+import kotlin.coroutines.resume
+import kotlin.test.Ignore
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
+import kotlinx.coroutines.CancellableContinuation
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.test.runTest
+
+@Stable
+class PausableCompositionTests {
+    @Test
+    fun canCreateARootPausableComposition() = runTest {
+        val recomposer = Recomposer(coroutineContext)
+        val pausableComposition = PausableComposition(EmptyApplier(), recomposer)
+        pausableComposition.dispose()
+        recomposer.cancel()
+        recomposer.close()
+    }
+
+    @Test
+    fun canCreateANestedPausableComposition() = compositionTest {
+        compose {
+            val parent = rememberCompositionContext()
+            DisposableEffect(Unit) {
+                val pausableComposition = PausableComposition(EmptyApplier(), parent)
+                onDispose { pausableComposition.dispose() }
+            }
+        }
+    }
+
+    @Test
+    fun canRecordAComposition() = compositionTest {
+        // This just tests the recording mechanism used in the tests below.
+        val recording = recordTest {
+            compose { A() }
+
+            validate { this.A() }
+        }
+
+        // Legend for the recording:
+        //  +N: Enter N for functions A, B, C, D, (where A:1 is the first lambda in A())
+        //  -N: Exit N
+        //  *N: Calling N (e.g *B is recorded before B() is called).
+        //  ^n: calling remember for some value
+
+        // Here we expect the normal, synchronous, execution as the recorded composition is not
+        // pausable. That is if we see a *B that should immediately followed by a B+ its content and
+        // a B-.
+        assertEquals(
+            recording,
+            "+A, ^z, ^Y, *B, +B, *Linear, +A:1, *C, +C, ^x, *Text, -C, *D, +D, +D:1, *C, +C, " +
+                "^x, *Text, -C, *C, +C, ^x, *Text, -C, *C, +C, ^x, *Text, -C, -D:1, -D, -A:1, " +
+                "-B, -A"
+        )
+    }
+
+    @Test
+    @Ignore // Requires compiler support
+    fun canPauseContent() = compositionTest {
+        val awaiter = Awaiter()
+        var receivedIteration = 0
+        val recording = recordTest {
+            compose {
+                PausableContent(
+                    normalWorkflow {
+                        receivedIteration = iteration
+                        awaiter.done()
+                    }
+                ) {
+                    A()
+                }
+            }
+            awaiter.await()
+        }
+        validate { this.PausableContent { this.A() } }
+        assertEquals(10, receivedIteration)
+
+        // Same Legend as canRecordAComposition
+        // Here we expect all functions to exit before the content of the function is executed
+        // because the above will pause at every pause point. If we see a B* we should not receive
+        // a B+ until after the caller finishes. (e.g. A-).
+        assertEquals(
+            recording,
+            "+A, ^z, ^Y, *B, -A, +B, *Linear, -B, +A:1, *C, *D, -A:1, +C, " +
+                "^x, *Text, -C, +D, -D, +D:1, *C, *C, *C, -D:1, +C, ^x, *Text, -C, +C, ^x, *Text, " +
+                "-C, +C, ^x, *Text, -C"
+        )
+    }
+
+    @Test
+    @Ignore // Requires compiler support
+    fun canPauseReusableContent() = compositionTest {
+        val awaiter = Awaiter()
+        var receivedIteration = 0
+        val recording = recordTest {
+            compose {
+                PausableContent(
+                    reuseWorkflow {
+                        receivedIteration = iteration
+                        awaiter.done()
+                    }
+                ) {
+                    A()
+                }
+            }
+            awaiter.await()
+        }
+        validate { this.PausableContent { this.A() } }
+        assertEquals(10, receivedIteration)
+        // Same Legend as canRecordAComposition
+        // Here we expect the result to be the same as if we were inserting new content as in
+        // canPauseContent
+        assertEquals(
+            "+A, ^z, ^Y, *B, -A, +B, *Linear, -B, +A:1, *C, *D, -A:1, +C, " +
+                "^x, *Text, -C, +D, -D, +D:1, *C, *C, *C, -D:1, +C, ^x, *Text, -C, +C, ^x, *Text, " +
+                "-C, +C, ^x, *Text, -C",
+            recording
+        )
+    }
+
+    @Test
+    @Ignore // Requires compiler support
+    fun canPauseReusingContent() = compositionTest {
+        val awaiter = Awaiter()
+        var recording = ""
+        val workflow: Workflow = {
+            // Create the content
+            setContentWithReuse()
+            resumeTillComplete { false }
+            apply()
+
+            // Reuse the content
+            recording = recordTest {
+                setContentWithReuse()
+                resumeTillComplete { true }
+                apply()
+            }
+            awaiter.done()
+        }
+
+        compose { PausableContent(workflow) { A() } }
+        awaiter.await()
+        // Same Legend as canRecordAComposition
+        // Here we expect the result to be the same as if we were inserting new content as in
+        // canPauseContent
+        assertArrayEquals(
+            ("+A, ^z, ^Y, *B, -A, +B, *Linear, -B, +A:1, *C, *D, -A:1, +C, " +
+                    "^x, *Text, -C, +D, -D, +D:1, *C, *C, *C, -D:1, +C, ^x, *Text, -C, +C, ^x, *Text, " +
+                    "-C, +C, ^x, *Text, -C")
+                .splitRecording(),
+            recording.splitRecording()
+        )
+    }
+
+    @Test
+    fun applierOnlyCalledInApply() = compositionTest {
+        val awaiter = Awaiter()
+        var applier: ViewApplier? = null
+
+        val workflow = workflow {
+            setContent()
+
+            assertFalse(applier?.called == true, "Applier was called during set content")
+
+            resumeTillComplete { false }
+
+            assertFalse(applier?.called == true, "Applier was called during resume")
+
+            apply()
+
+            assertTrue(applier?.called == true, "Applier wasn't called")
+
+            awaiter.done()
+        }
+
+        compose {
+            PausableContent(workflow, { view -> ViewApplier(view).also { applier = it } }) { A() }
+        }
+        awaiter.await()
+    }
+
+    @Test
+    @Ignore // Requires compiler support
+    fun rememberOnlyCalledInApply() = compositionTest {
+        val awaiter = Awaiter()
+        var onRememberCalled = false
+
+        val workflow = workflow {
+            setContent()
+            assertFalse(onRememberCalled, "onRemember called during set content")
+
+            resumeTillComplete {
+                assertFalse(onRememberCalled, "onRemember called during resume")
+                true
+            }
+            assertFalse(onRememberCalled, "onRemember called before resume returned")
+
+            apply()
+
+            assertTrue(onRememberCalled, "onRemember was not called in apply")
+
+            awaiter.done()
+        }
+
+        fun rememberedObject(name: String) =
+            object : RememberObserver {
+                val name = name
+
+                override fun onRemembered() {
+                    onRememberCalled = true
+                    report("+$name")
+                }
+
+                override fun onForgotten() {
+                    report("-$name")
+                }
+
+                override fun onAbandoned() {
+                    report("!$name")
+                }
+            }
+
+        val recording = recordTest {
+            compose {
+                PausableContent(workflow) {
+                    val a = remember { rememberedObject("a") }
+                    report("C(${a.name})")
+                    B {
+                        val b = remember { rememberedObject("b") }
+                        report("C(${b.name})")
+                        B {
+                            val c = remember { rememberedObject("c") }
+                            report("C(${c.name})")
+                            C()
+                            val d = remember { rememberedObject("d") }
+                            report("C(${d.name})")
+                            D()
+                        }
+                    }
+                }
+            }
+
+            awaiter.await()
+        }
+        // Same Legend as canRecordAComposition except the addition of the C(N) added above and
+        // +a, +b, etc. which records when the remembered object are sent the on-remember. This
+        // ensures that all onRemember calls are made after the composition has completed.
+        assertEquals(
+            "C(a), +B, *Linear, -B, C(b), +B, *Linear, -B, C(c), C(d), +C, ^x, *Text, -C, +D, " +
+                "-D, +D:1, *C, *C, *C, -D:1, +C, ^x, *Text, -C, +C, ^x, *Text, -C, +C, ^x, *Text, " +
+                "-C, +a, +b, +c, +d",
+            recording
+        )
+    }
+
+    @SuppressLint("ListIterator")
+    @Test
+    fun pausable_testRemember_RememberForgetOrder() = compositionTest {
+        var order = 0
+        val objects = mutableListOf<Any>()
+        val newRememberObject = { name: String ->
+            object : RememberObserver, Counted, Ordered, Named {
+                    override var name = name
+                    override var count = 0
+                    override var rememberOrder = -1
+                    override var forgetOrder = -1
+
+                    override fun onRemembered() {
+                        assertEquals(-1, rememberOrder, "Only one call to onRemembered expected")
+                        rememberOrder = order++
+                        count++
+                    }
+
+                    override fun onForgotten() {
+                        assertEquals(-1, forgetOrder, "Only one call to onForgotten expected")
+                        forgetOrder = order++
+                        count--
+                    }
+
+                    override fun onAbandoned() {
+                        assertEquals(0, count, "onAbandoned called after onRemembered")
+                    }
+                }
+                .also { objects.add(it) }
+        }
+
+        @Suppress("UNUSED_PARAMETER") fun used(v: Any) {}
+
+        @Composable
+        fun Tree() {
+            used(remember { newRememberObject("L0B") })
+            Linear {
+                used(remember { newRememberObject("L1B") })
+                Linear {
+                    used(remember { newRememberObject("L2B") })
+                    Linear {
+                        used(remember { newRememberObject("L3B") })
+                        Linear { used(remember { newRememberObject("Leaf") }) }
+                        used(remember { newRememberObject("L3A") })
+                    }
+                    used(remember { newRememberObject("L2A") })
+                }
+                used(remember { newRememberObject("L1A") })
+            }
+            used(remember { newRememberObject("L0A") })
+        }
+
+        val awaiter = Awaiter()
+        val workFlow = normalWorkflow { awaiter.done() }
+
+        compose { PausableContent(workFlow) { Tree() } }
+        awaiter.await()
+
+        // Legend:
+        //   L<N><B|A>: where N is the nesting level and B is before the children and
+        //     A is after the children.
+        //   Leaf: the object remembered in the middle.
+        // This is asserting that the remember order is the same as it would have been had the
+        //   above composition was not paused.
+        assertEquals(
+            "L0B, L1B, L2B, L3B, Leaf, L3A, L2A, L1A, L0A",
+            objects
+                .mapNotNull { it as? Ordered }
+                .sortedBy { it.rememberOrder }
+                .joinToString { (it as Named).name },
+            "Expected enter order",
+        )
+    }
+}
+
+fun String.splitRecording() = split(", ")
+
+typealias Workflow = suspend PausableContentWorkflowScope.() -> Unit
+
+fun workflow(workflow: Workflow): Workflow = workflow
+
+fun reuseWorkflow(done: Workflow = {}) = workflow {
+    setContentWithReuse()
+    resumeTillComplete { true }
+    apply()
+    done()
+}
+
+fun normalWorkflow(done: Workflow = {}) = workflow {
+    setContent()
+    resumeTillComplete { true }
+    apply()
+    done()
+}
+
+private interface TestRecorder {
+    fun log(message: String)
+
+    fun logs(): String
+
+    fun clear()
+}
+
+private var recorder: TestRecorder =
+    object : TestRecorder {
+        override fun log(message: String) {}
+
+        override fun logs(): String = ""
+
+        override fun clear() {}
+    }
+
+private inline fun recordTest(block: () -> Unit): String {
+    val result = mutableListOf<String>()
+    val oldRecorder = recorder
+    recorder =
+        object : TestRecorder {
+            override fun log(message: String) {
+                result.add(message)
+            }
+
+            override fun logs() = result.joinToString()
+
+            override fun clear() {
+                result.clear()
+            }
+        }
+    block()
+    recorder = oldRecorder
+    return result.joinToString()
+}
+
+private fun report(message: String) {
+    synchronized(recorder) { recorder.log(message) }
+}
+
+private inline fun report(message: String, block: () -> Unit) {
+    report("+$message")
+    block()
+    report("-$message")
+}
+
+@Composable
+private fun A() {
+    report("A") {
+        report("^z")
+        val z = remember { 0 }
+        report("^Y")
+        val y = remember { 1 }
+        Text("A: $z $y")
+        report("*B")
+        B {
+            report("A:1") {
+                report("*C")
+                C()
+                report("*D")
+                D()
+            }
+        }
+    }
+}
+
+private fun MockViewValidator.PausableContent(content: MockViewValidator.() -> Unit) {
+    this.view("PausableContentHost") { this.view("PausableContent", content) }
+}
+
+private fun MockViewValidator.A() {
+    Text("A: 0 1")
+    this.B {
+        this.C()
+        this.D()
+    }
+}
+
+@Composable
+private fun B(content: @Composable () -> Unit) {
+    report("B") {
+        report("*Linear")
+        Linear(content)
+    }
+}
+
+private fun MockViewValidator.B(content: MockViewValidator.() -> Unit) {
+    this.Linear(content)
+}
+
+@Composable
+private fun C() {
+    report("C") {
+        report("^x")
+        val x = remember { 3 }
+        report("*Text")
+        Text("C: $x")
+    }
+}
+
+private fun MockViewValidator.C() {
+    this.Text("C: 3")
+}
+
+@Composable
+private fun D() {
+    report("D") {
+        Linear {
+            report("D:1") {
+                repeat(3) {
+                    report("*C")
+                    C()
+                }
+            }
+        }
+    }
+}
+
+private fun MockViewValidator.D() {
+    this.Linear { repeat(3) { this.C() } }
+}
+
+interface PausableContentWorkflowScope {
+    val iteration: Int
+    val applied: Boolean
+
+    fun setContent(): PausedComposition
+
+    fun setContentWithReuse(): PausedComposition
+
+    fun resumeTillComplete(shouldPause: () -> Boolean)
+
+    fun apply()
+}
+
+fun PausableContentWorkflowScope.run(shouldPause: () -> Boolean = { true }) {
+    setContent()
+    resumeTillComplete(shouldPause)
+    apply()
+}
+
+class PausableContentWorkflowDriver(
+    private val composition: PausableComposition,
+    private val content: @Composable () -> Unit,
+    private var host: View?,
+    private var contentView: View?
+) : PausableContentWorkflowScope {
+    private var pausedComposition: PausedComposition? = null
+    override var iteration = 0
+    override val applied: Boolean
+        get() = host == null && pausedComposition == null
+
+    override fun setContent(): PausedComposition {
+        checkPrecondition(pausedComposition == null)
+        return composition.setPausableContent(content).also { pausedComposition = it }
+    }
+
+    override fun setContentWithReuse(): PausedComposition {
+        checkPrecondition(pausedComposition == null)
+        return composition.setPausableContentWithReuse(content).also { pausedComposition = it }
+    }
+
+    override fun resumeTillComplete(shouldPause: () -> Boolean) {
+        val pausedComposition = pausedComposition
+        checkPrecondition(pausedComposition != null)
+        while (!pausedComposition.isComplete) {
+            pausedComposition.resume(shouldPause)
+            iteration++
+        }
+    }
+
+    override fun apply() {
+        val pausedComposition = pausedComposition
+        checkPrecondition(pausedComposition != null && pausedComposition.isComplete)
+        pausedComposition.apply()
+        this.pausedComposition = null
+        val host = host
+        val contentView = contentView
+        if (host != null && contentView != null) {
+            host.children.add(contentView)
+            this.host = null
+            this.contentView = null
+        }
+    }
+}
+
+@Composable
+private fun PausableContent(
+    workflow: suspend PausableContentWorkflowScope.() -> Unit = { run() },
+    createApplier: (view: View) -> Applier<View> = { ViewApplier(it) },
+    content: @Composable () -> Unit
+) {
+    val host = View().also { it.name = "PausableContentHost" }
+    val pausableContent = View().also { it.name = "PausableContent" }
+    ComposeNode<View, ViewApplier>(factory = { host }, update = {})
+    val parent = rememberCompositionContext()
+    val composition =
+        remember(parent) { PausableComposition(createApplier(pausableContent), parent) }
+    LaunchedEffect(content as Any) {
+        val scope = PausableContentWorkflowDriver(composition, content, host, pausableContent)
+        scope.workflow()
+    }
+    DisposableEffect(Unit) { onDispose { composition.dispose() } }
+}
+
+private class Awaiter {
+    private var continuation: CancellableContinuation<Unit>? = null
+    private var done = false
+
+    suspend fun await() {
+        if (!done) {
+            suspendCancellableCoroutine { continuation = it }
+        }
+    }
+
+    fun resume() {
+        val current = continuation
+        continuation = null
+        current?.resume(Unit)
+    }
+
+    fun done() {
+        done = true
+        resume()
+    }
+}
diff --git a/compose/ui/ui/build.gradle b/compose/ui/ui/build.gradle
index 8905d36..134d810 100644
--- a/compose/ui/ui/build.gradle
+++ b/compose/ui/ui/build.gradle
@@ -56,6 +56,8 @@
                 api(project(":compose:ui:ui-text"))
                 api(project(":compose:ui:ui-unit"))
                 api(project(":compose:ui:ui-util"))
+
+                api(project(":lifecycle:lifecycle-runtime-compose"))
             }
         }
 
@@ -87,8 +89,8 @@
                 implementation("androidx.collection:collection:1.4.2")
                 implementation("androidx.customview:customview-poolingcontainer:1.0.0")
                 implementation("androidx.savedstate:savedstate-ktx:1.2.1")
-                api("androidx.lifecycle:lifecycle-runtime-compose:2.8.3")
-                implementation("androidx.lifecycle:lifecycle-viewmodel:2.6.1")
+                implementation("androidx.lifecycle:lifecycle-viewmodel:2.8.3")
+                implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.3")
                 implementation("androidx.emoji2:emoji2:1.2.0")
 
                 implementation("androidx.profileinstaller:profileinstaller:1.3.1")
diff --git a/compose/ui/ui/src/androidInstrumentedTest/kotlin/androidx/compose/ui/graphics/vector/VectorTest.kt b/compose/ui/ui/src/androidInstrumentedTest/kotlin/androidx/compose/ui/graphics/vector/VectorTest.kt
index 1d0476c..dff7236 100644
--- a/compose/ui/ui/src/androidInstrumentedTest/kotlin/androidx/compose/ui/graphics/vector/VectorTest.kt
+++ b/compose/ui/ui/src/androidInstrumentedTest/kotlin/androidx/compose/ui/graphics/vector/VectorTest.kt
@@ -37,6 +37,7 @@
 import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
@@ -222,6 +223,41 @@
         }
     }
 
+    @Test
+    fun testVectorDisposal() {
+        val composeVector = mutableStateOf(true)
+        var initCount = 0
+        var disposeCount = 0
+        val disposeLatch = CountDownLatch(1)
+        rule.setContent {
+            if (composeVector.value) {
+                rememberVectorPainter(
+                    defaultWidth = 16.dp,
+                    defaultHeight = 16.dp,
+                    viewportWidth = 16f,
+                    viewportHeight = 16f,
+                    autoMirror = false,
+                ) { _, _ ->
+                    DisposableEffect(Unit) {
+                        initCount++
+                        onDispose {
+                            disposeCount++
+                            disposeLatch.countDown()
+                        }
+                    }
+                }
+            }
+        }
+        rule.waitForIdle()
+
+        composeVector.value = false
+
+        rule.waitForIdle()
+
+        assertTrue(disposeLatch.await(3000, TimeUnit.MILLISECONDS))
+        assertEquals(initCount, disposeCount)
+    }
+
     @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
     @Test
     fun testVectorRendersOnceOnFirstFrame() {
diff --git a/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/node/UiApplier.android.kt b/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/node/UiApplier.android.kt
index ef4b85e..2a1655b 100644
--- a/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/node/UiApplier.android.kt
+++ b/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/node/UiApplier.android.kt
@@ -45,4 +45,8 @@
         super.onEndChanges()
         root.owner?.onEndApplyChanges()
     }
+
+    override fun reuse() {
+        current.onReuse()
+    }
 }
diff --git a/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/platform/AndroidCompositionLocals.android.kt b/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/platform/AndroidCompositionLocals.android.kt
index fd0963c..16452b7 100644
--- a/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/platform/AndroidCompositionLocals.android.kt
+++ b/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/platform/AndroidCompositionLocals.android.kt
@@ -34,7 +34,6 @@
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.res.ImageVectorCache
 import androidx.compose.ui.res.ResourceIdCache
-import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.savedstate.SavedStateRegistryOwner
 
@@ -54,12 +53,11 @@
 internal val LocalResourceIdCache =
     staticCompositionLocalOf<ResourceIdCache> { noLocalProvidedFor("LocalResourceIdCache") }
 
-/** The CompositionLocal containing the current [LifecycleOwner]. */
 @Deprecated(
     "Moved to lifecycle-runtime-compose library in androidx.lifecycle.compose package.",
     ReplaceWith("androidx.lifecycle.compose.LocalLifecycleOwner"),
 )
-val LocalLifecycleOwner
+actual val LocalLifecycleOwner
     get() = LocalLifecycleOwner
 
 /** The CompositionLocal containing the current [SavedStateRegistryOwner]. */
diff --git a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/graphics/vector/VectorPainter.kt b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/graphics/vector/VectorPainter.kt
index 3472a63..717740f 100644
--- a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/graphics/vector/VectorPainter.kt
+++ b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/graphics/vector/VectorPainter.kt
@@ -19,6 +19,7 @@
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.ComposableOpenTarget
 import androidx.compose.runtime.Composition
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
@@ -142,7 +143,7 @@
                 autoMirror = autoMirror
             )
             val compositionContext = rememberCompositionContext()
-            this.composition =
+            val composition =
                 remember(viewportWidth, viewportHeight, content) {
                     val curComp = this.composition
                     val next =
@@ -154,6 +155,8 @@
                     next.setContent { content(viewport.width, viewport.height) }
                     next
                 }
+            this.composition = composition
+            DisposableEffect(this) { onDispose { composition.dispose() } }
         }
 }
 
diff --git a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/platform/CompositionLocals.kt b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/platform/CompositionLocals.kt
index 41037c6..d8f78e6 100644
--- a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/platform/CompositionLocals.kt
+++ b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/platform/CompositionLocals.kt
@@ -42,6 +42,7 @@
 import androidx.compose.ui.text.input.TextInputService
 import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.LayoutDirection
+import androidx.lifecycle.LifecycleOwner
 
 /** The CompositionLocal to provide communication with platform accessibility service. */
 val LocalAccessibilityManager = staticCompositionLocalOf<AccessibilityManager?> { null }
@@ -151,6 +152,13 @@
  */
 val LocalWindowInfo = staticCompositionLocalOf<WindowInfo> { noLocalProvidedFor("LocalWindowInfo") }
 
+/** The CompositionLocal containing the current [LifecycleOwner]. */
+@Deprecated(
+    "Moved to lifecycle-runtime-compose library in androidx.lifecycle.compose package.",
+    ReplaceWith("androidx.lifecycle.compose.LocalLifecycleOwner"),
+)
+expect val LocalLifecycleOwner: ProvidableCompositionLocal<LifecycleOwner>
+
 internal val LocalPointerIconService = staticCompositionLocalOf<PointerIconService?> { null }
 
 /** @see LocalScrollCaptureInProgress */
diff --git a/lifecycle/lifecycle-runtime-compose/src/desktopMain/kotlin/androidx/lifecycle/compose/LocalLifecycleOwner.desktop.kt b/compose/ui/ui/src/commonStubsMain/kotlin/androidx/compose/ui/platform/CompositionLocals.commonStubs.kt
similarity index 65%
copy from lifecycle/lifecycle-runtime-compose/src/desktopMain/kotlin/androidx/lifecycle/compose/LocalLifecycleOwner.desktop.kt
copy to compose/ui/ui/src/commonStubsMain/kotlin/androidx/compose/ui/platform/CompositionLocals.commonStubs.kt
index 1a1c7e5..3147a63 100644
--- a/lifecycle/lifecycle-runtime-compose/src/desktopMain/kotlin/androidx/lifecycle/compose/LocalLifecycleOwner.desktop.kt
+++ b/compose/ui/ui/src/commonStubsMain/kotlin/androidx/compose/ui/platform/CompositionLocals.commonStubs.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-@file:JvmName("LocalLifecycleOwnerKt")
-
-package androidx.lifecycle.compose
+package androidx.compose.ui.platform
 
 import androidx.compose.runtime.ProvidableCompositionLocal
-import androidx.compose.runtime.staticCompositionLocalOf
+import androidx.compose.ui.implementedInJetBrainsFork
 import androidx.lifecycle.LifecycleOwner
 
-public actual val LocalLifecycleOwner: ProvidableCompositionLocal<LifecycleOwner> =
-    staticCompositionLocalOf {
-        error("CompositionLocal LocalLifecycleOwner not present")
-    }
+@Deprecated(
+    "Moved to lifecycle-runtime-compose library in androidx.lifecycle.compose package.",
+    ReplaceWith("androidx.lifecycle.compose.LocalLifecycleOwner"),
+)
+actual val LocalLifecycleOwner: ProvidableCompositionLocal<LifecycleOwner>
+    get() = implementedInJetBrainsFork()
diff --git a/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/CredentialProviderPlayServicesImpl.kt b/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/CredentialProviderPlayServicesImpl.kt
index e702dda..bb32384 100644
--- a/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/CredentialProviderPlayServicesImpl.kt
+++ b/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/CredentialProviderPlayServicesImpl.kt
@@ -21,8 +21,8 @@
 import android.util.Log
 import androidx.annotation.RestrictTo
 import androidx.annotation.VisibleForTesting
-import androidx.credentials.ClearCredentialRequestTypes
 import androidx.credentials.ClearCredentialStateRequest
+import androidx.credentials.ClearCredentialStateRequest.Companion.TYPE_CLEAR_RESTORE_CREDENTIAL
 import androidx.credentials.CreateCredentialRequest
 import androidx.credentials.CreateCredentialResponse
 import androidx.credentials.CreatePasswordRequest
@@ -202,7 +202,7 @@
         if (cancellationReviewer(cancellationSignal)) {
             return
         }
-        if (request.requestType == ClearCredentialRequestTypes.CLEAR_RESTORE_CREDENTIAL) {
+        if (request.requestType == TYPE_CLEAR_RESTORE_CREDENTIAL) {
             if (!isAvailableOnDevice(MIN_GMS_APK_VERSION_RESTORE_CRED)) {
                 cancellationReviewerWithCallback(cancellationSignal) {
                     executor.execute {
diff --git a/credentials/credentials/api/current.txt b/credentials/credentials/api/current.txt
index db192ff..9e4e064 100644
--- a/credentials/credentials/api/current.txt
+++ b/credentials/credentials/api/current.txt
@@ -3,11 +3,17 @@
 
   public final class ClearCredentialStateRequest {
     ctor public ClearCredentialStateRequest();
-    ctor public ClearCredentialStateRequest(int requestType);
+    ctor public ClearCredentialStateRequest(optional String requestType);
     method public android.os.Bundle getRequestBundle();
-    method public int getRequestType();
+    method public String getRequestType();
     property public final android.os.Bundle requestBundle;
-    property public final int requestType;
+    property public final String requestType;
+    field public static final androidx.credentials.ClearCredentialStateRequest.Companion Companion;
+    field public static final String TYPE_CLEAR_CREDENTIAL_STATE = "androidx.credentials.TYPE_CLEAR_CREDENTIAL_STATE";
+    field public static final String TYPE_CLEAR_RESTORE_CREDENTIAL = "androidx.credentials.TYPE_CLEAR_RESTORE_CREDENTIAL";
+  }
+
+  public static final class ClearCredentialStateRequest.Companion {
   }
 
   public abstract class CreateCredentialRequest {
diff --git a/credentials/credentials/api/restricted_current.txt b/credentials/credentials/api/restricted_current.txt
index db192ff..9e4e064 100644
--- a/credentials/credentials/api/restricted_current.txt
+++ b/credentials/credentials/api/restricted_current.txt
@@ -3,11 +3,17 @@
 
   public final class ClearCredentialStateRequest {
     ctor public ClearCredentialStateRequest();
-    ctor public ClearCredentialStateRequest(int requestType);
+    ctor public ClearCredentialStateRequest(optional String requestType);
     method public android.os.Bundle getRequestBundle();
-    method public int getRequestType();
+    method public String getRequestType();
     property public final android.os.Bundle requestBundle;
-    property public final int requestType;
+    property public final String requestType;
+    field public static final androidx.credentials.ClearCredentialStateRequest.Companion Companion;
+    field public static final String TYPE_CLEAR_CREDENTIAL_STATE = "androidx.credentials.TYPE_CLEAR_CREDENTIAL_STATE";
+    field public static final String TYPE_CLEAR_RESTORE_CREDENTIAL = "androidx.credentials.TYPE_CLEAR_RESTORE_CREDENTIAL";
+  }
+
+  public static final class ClearCredentialStateRequest.Companion {
   }
 
   public abstract class CreateCredentialRequest {
diff --git a/credentials/credentials/src/main/java/androidx/credentials/ClearCredentialRequestTypes.kt b/credentials/credentials/src/main/java/androidx/credentials/ClearCredentialRequestTypes.kt
index e2c122c..7f63cb4 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/ClearCredentialRequestTypes.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/ClearCredentialRequestTypes.kt
@@ -16,30 +16,23 @@
 
 package androidx.credentials
 
-import androidx.annotation.IntDef
 import androidx.annotation.RestrictTo
-import androidx.credentials.ClearCredentialRequestTypes.Companion.CLEAR_CREDENTIAL_STATE
-import androidx.credentials.ClearCredentialRequestTypes.Companion.CLEAR_RESTORE_CREDENTIAL
+import androidx.annotation.StringDef
+import androidx.credentials.ClearCredentialStateRequest.Companion.TYPE_CLEAR_CREDENTIAL_STATE
+import androidx.credentials.ClearCredentialStateRequest.Companion.TYPE_CLEAR_RESTORE_CREDENTIAL
 
 /**
  * This allows verification when the user passes in the request type for their
  * [ClearCredentialStateRequest].
  *
- * If the request type is [ClearCredentialRequestTypes.CLEAR_CREDENTIAL_STATE], then the request
- * will be sent to the credential providers to clear the user's credential state.
+ * If the request type is [TYPE_CLEAR_CREDENTIAL_STATE], then the request will be sent to the
+ * credential providers to clear the user's credential state.
  *
- * If the request type is [ClearCredentialRequestTypes.CLEAR_RESTORE_CREDENTIAL], then the request
- * will be sent to the restore credential provider to delete any stored [RestoreCredential].
+ * If the request type is [TYPE_CLEAR_RESTORE_CREDENTIAL], then the request will be sent to the
+ * restore credential provider to delete any stored [RestoreCredential].
  */
 @Target(AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.TYPE)
 @Retention(AnnotationRetention.SOURCE)
-@IntDef(value = [CLEAR_CREDENTIAL_STATE, CLEAR_RESTORE_CREDENTIAL])
-@RestrictTo(RestrictTo.Scope.LIBRARY)
-annotation class ClearCredentialRequestTypes {
-    companion object {
-        /** Clears credential state from the credential providers */
-        const val CLEAR_CREDENTIAL_STATE = 0
-        /** Clears restore credential stored on device as well as cloud. */
-        const val CLEAR_RESTORE_CREDENTIAL = 1
-    }
-}
+@StringDef(value = [TYPE_CLEAR_CREDENTIAL_STATE, TYPE_CLEAR_RESTORE_CREDENTIAL])
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+annotation class ClearCredentialRequestTypes
diff --git a/credentials/credentials/src/main/java/androidx/credentials/ClearCredentialStateRequest.kt b/credentials/credentials/src/main/java/androidx/credentials/ClearCredentialStateRequest.kt
index 2eec3ab..faddd23 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/ClearCredentialStateRequest.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/ClearCredentialStateRequest.kt
@@ -21,32 +21,44 @@
 /**
  * Request class for clearing a user's credential state from the credential providers.
  *
- * If the request type is [ClearCredentialRequestTypes.CLEAR_CREDENTIAL_STATE], then the request
- * will be sent to the credential providers to clear the user's credential state.
+ * If the request type is [TYPE_CLEAR_CREDENTIAL_STATE], then the request will be sent to the
+ * credential providers to clear the user's credential state.
  *
- * If the request type is [ClearCredentialRequestTypes.CLEAR_RESTORE_CREDENTIAL], then the request
- * will be sent to the restore credential provider to delete any stored [RestoreCredential].
+ * If the request type is [TYPE_CLEAR_RESTORE_CREDENTIAL], then the request will be sent to the
+ * restore credential provider to delete any stored [RestoreCredential].
  *
+ * @constructor creates a new ClearCredentialStateRequest
+ * @property requestType the type of this request
  * @throws IllegalArgumentException if the [requestType] is unsupported type.
  */
-class ClearCredentialStateRequest(val requestType: @ClearCredentialRequestTypes Int) {
-    constructor() : this(ClearCredentialRequestTypes.CLEAR_CREDENTIAL_STATE)
-
+class ClearCredentialStateRequest
+@JvmOverloads
+constructor(val requestType: @ClearCredentialRequestTypes String = TYPE_CLEAR_CREDENTIAL_STATE) {
     val requestBundle: Bundle = Bundle()
 
     init {
         if (
-            requestType != ClearCredentialRequestTypes.CLEAR_CREDENTIAL_STATE &&
-                requestType != ClearCredentialRequestTypes.CLEAR_RESTORE_CREDENTIAL
+            requestType != TYPE_CLEAR_CREDENTIAL_STATE &&
+                requestType != TYPE_CLEAR_RESTORE_CREDENTIAL
         ) {
             throw IllegalArgumentException("The request type $requestType is not supported.")
         }
-        if (requestType == ClearCredentialRequestTypes.CLEAR_RESTORE_CREDENTIAL) {
+        if (requestType == TYPE_CLEAR_RESTORE_CREDENTIAL) {
             requestBundle.putBoolean(BUNDLE_KEY_CLEAR_RESTORE_CREDENTIAL_REQUEST, true)
         }
     }
 
-    private companion object {
+    companion object {
+        /**
+         * Clears credential state from all credential providers that have cached a user sign-in
+         * states.
+         */
+        const val TYPE_CLEAR_CREDENTIAL_STATE = "androidx.credentials.TYPE_CLEAR_CREDENTIAL_STATE"
+
+        /** Clears restore credential from the device and the backup */
+        const val TYPE_CLEAR_RESTORE_CREDENTIAL =
+            "androidx.credentials.TYPE_CLEAR_RESTORE_CREDENTIAL"
+
         private const val BUNDLE_KEY_CLEAR_RESTORE_CREDENTIAL_REQUEST =
             "androidx.credentials.BUNDLE_KEY_CLEAR_RESTORE_CREDENTIAL_REQUEST"
     }
diff --git a/credentials/credentials/src/main/java/androidx/credentials/CredentialManager.kt b/credentials/credentials/src/main/java/androidx/credentials/CredentialManager.kt
index 1c910c3..2b2965b 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/CredentialManager.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/CredentialManager.kt
@@ -299,8 +299,8 @@
      * app and in order to get the holistic sign-in options the next time, you should call this API
      * to let the provider clear any stored credential session.
      *
-     * If the API is called with [ClearCredentialRequestTypes.CLEAR_RESTORE_CREDENTIAL] then any
-     * restore credential stored on device will be cleared.
+     * If the API is called with [ClearCredentialStateRequest.TYPE_CLEAR_RESTORE_CREDENTIAL] then
+     * any restore credential stored on device will be cleared.
      *
      * @param request the request for clearing the app user's credential state
      * @throws ClearCredentialException If the request fails
diff --git a/credentials/credentials/src/main/java/androidx/credentials/CredentialManagerImpl.kt b/credentials/credentials/src/main/java/androidx/credentials/CredentialManagerImpl.kt
index 6967280..ad29461 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/CredentialManagerImpl.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/CredentialManagerImpl.kt
@@ -263,8 +263,8 @@
      * app and in order to get the holistic sign-in options the next time, you should call this API
      * to let the provider clear any stored credential session.
      *
-     * If the API is called with [ClearCredentialRequestTypes.CLEAR_RESTORE_CREDENTIAL] then any
-     * restore credential stored on device will be cleared.
+     * If the API is called with [ClearCredentialStateRequest.TYPE_CLEAR_RESTORE_CREDENTIAL] then
+     * any restore credential stored on device will be cleared.
      *
      * @param request the request for clearing the app user's credential state
      * @param cancellationSignal an optional signal that allows for cancelling this call
diff --git a/credentials/credentials/src/main/java/androidx/credentials/CredentialProviderFactory.kt b/credentials/credentials/src/main/java/androidx/credentials/CredentialProviderFactory.kt
index 302316c..bf885cb 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/CredentialProviderFactory.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/CredentialProviderFactory.kt
@@ -23,6 +23,7 @@
 import androidx.annotation.RequiresApi
 import androidx.annotation.RestrictTo
 import androidx.annotation.VisibleForTesting
+import androidx.credentials.ClearCredentialStateRequest.Companion.TYPE_CLEAR_RESTORE_CREDENTIAL
 
 /** Factory that returns the credential provider to be used by Credential Manager. */
 @OptIn(ExperimentalDigitalCredentialApi::class)
@@ -63,18 +64,15 @@
      * the pre-U provider is used. If not, then the provider is determined by the API level.
      *
      * @param request is a credential request of either [CreateRestoreCredentialRequest],
-     *   [ClearCredentialRequestTypes.ClearRestoreCredential], or [GetCredentialRequest] that can
-     *   determine [CredentialProvider] type.
+     *   [TYPE_CLEAR_RESTORE_CREDENTIAL], or [GetCredentialRequest] that can determine
+     *   [CredentialProvider] type.
      * @return the best available provider, or null if no provider is available.
      */
     fun getBestAvailableProvider(
         request: Any,
         shouldFallbackToPreU: Boolean = true
     ): CredentialProvider? {
-        if (
-            request is CreateRestoreCredentialRequest ||
-                request == ClearCredentialRequestTypes.CLEAR_RESTORE_CREDENTIAL
-        ) {
+        if (request is CreateRestoreCredentialRequest || request == TYPE_CLEAR_RESTORE_CREDENTIAL) {
             return tryCreatePreUOemProvider()
         } else if (request is GetCredentialRequest) {
             for (option in request.credentialOptions) {
diff --git a/docs-tip-of-tree/build.gradle b/docs-tip-of-tree/build.gradle
index b4d4e4f..e89eb38 100644
--- a/docs-tip-of-tree/build.gradle
+++ b/docs-tip-of-tree/build.gradle
@@ -86,7 +86,6 @@
     kmpDocs(project(":compose:material3:adaptive:adaptive"))
     kmpDocs(project(":compose:material3:adaptive:adaptive-layout"))
     kmpDocs(project(":compose:material3:adaptive:adaptive-navigation"))
-    kmpDocs(project(":compose:material3:adaptive:adaptive-render-strategy"))
     kmpDocs(project(":compose:material3:material3"))
     kmpDocs(project(":compose:material3:material3-adaptive-navigation-suite"))
     kmpDocs(project(":compose:material3:material3-common"))
@@ -206,6 +205,7 @@
     kmpDocs(project(":ink:ink-brush"))
     kmpDocs(project(":ink:ink-geometry"))
     kmpDocs(project(":ink:ink-nativeloader"))
+    kmpDocs(project(":ink:ink-strokes"))
     docs(project(":input:input-motionprediction"))
     docs(project(":interpolator:interpolator"))
     docs(project(":javascriptengine:javascriptengine"))
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5165817..99e5b63 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -67,7 +67,7 @@
 spdxGradlePlugin = "0.6.0"
 sqldelight = "1.3.0"
 retrofit = "2.7.2"
-wire = "4.9.7"
+wire = "5.0.0"
 core = "1.12.0"
 xmlApis = "1.4.01"
 yarn = "1.22.17"
diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
index efdf962..4a0d0b9 100644
--- a/gradle/verification-keyring.keys
+++ b/gradle/verification-keyring.keys
@@ -3,7 +3,7 @@
 
 sub    CF771F914C2A4A73
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGiBE2fCWARBAC3v9wYo5kmynmVP+43ccamidflSLQjjpsXpSDLPFokGxeuw0OC
 QJy46m8b5ACoCqRlfwnRRcEHxiSlaBATJA6hi7NRO41R39C62JXsIxNJR16JNQ5k
@@ -33,7 +33,7 @@
 
 pub    82B5574242C20D6F
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGNBFC1VWUBDADZwqBEEmSjwy2JADG0qCpvVQzC5KszL0CjzqTLPMBmLKNuc/36
 26MU4yI8Y+pcCTnC3LN9hrI0hxiP4zFFFyLYKkUWCZRAwj4OQlnyTDKa9frKBMed
@@ -52,7 +52,7 @@
 
 sub    43115D7B115DB0C0
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFSR0DQBCADw8XL+xgFg9WVPknAIqqb0sUIZ3yNNr8LkuNtwQXnwAcSJkHSt
 C1k2CIKwRPPfcLsb51l3SpxFTs/s5yhyiknDfjqP8IFtLocBSsn3kD4VRjcxFQhc
@@ -80,7 +80,7 @@
 uid    The Legion of the Bouncy Castle Inc. (Maven Repository Artifact Signer) <bcmavensync@bouncycastle.org>
 
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGNBGR/8HUBDADJ+V5VgTXFG4xVI/1r07a/pTXoAQhHyJMkVdFScGARsps07VXI
 IsYgPsifOFU55E7uRMZPTLAx5F1uxoZAWGtXIz0d4ISKhobFquH8jZe7TnsJBJNV
@@ -101,7 +101,7 @@
 
 sub    594E23256A36A392
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBEqQOcwBEACdPSfBAkHm1b2GdOjB3gGerx/JDn3zYNnNpcQrM8Do0bxDwlfT
 qwLA0P9ju4mzTfHU5kEvm2lrXz8QCZPLe9eY6GxzzSbeXtt+4fP84/YGmsK6DQTy
@@ -146,7 +146,7 @@
 
 sub    8B2A34A7D4A9B8B3
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBFrKW9IBEACkqUvM7hU1WqOOeb1gZ7pUsRliHuoUvYIrd+hdp+qhPmJ0NG0W
 YhZK5UtJBmqvtHKRkbwYxUuya9zlBmCfQFf0GpFKJ65JSrPSkZADI3aZ4aUkxIUw
@@ -191,7 +191,7 @@
 
 sub    8832A83FA3060393
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGiBD9AzmcRBACMqgb7IFvC/nLxw7mUAgHENeZXY3JOQJ8wVBevIbbMEeFvzHE2
 diFydqUXocPexduYr0ahkf033WvWdAiNqDLfVW/HFOsc1TpjbHkqPUHtJ62Ya5tg
@@ -220,7 +220,7 @@
 
 sub    51F5B36C761AA122
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBFoQh54BEADOuivAfgGKc4/zDwx+AwJdctjTT0znL9knRTYG6ediv2Eq+CXm
 gBM9m5twl+qhUB1NtrdHb4BH49VY9/gHr3JDyo5ewu96qkbeQl4pxW0zmHg/yJx7
@@ -263,7 +263,7 @@
 pub    86FDC7E2A11262CB
 sub    59BA7BFEAD3D7F94
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBE2kzuwBCACYV+G9yxNkSjAKSji0B5ipMGM74JAL1Ogtcu+993pLHHYsdXri
 WWXi37x9PLjeHxw63mN26SFyrbMJ4A8erLB03PDjw0DEzAwiu9P2vSvL/RFxGBbk
@@ -291,7 +291,7 @@
 
 sub    1AFEC329B615D06C
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGiBEdddbQRBADRgstdUZq7ceq3NYcR5kpoU2tN2Zvg1vptE9FxpDbL73gdLWnI
 C7IAx+NNjdG7Ncdg+u10UZv6OSmhWAd8ubWcD9JxKtS4UXkNPHxhHFHqVPHuCwsQ
@@ -322,7 +322,7 @@
 pub    88BB19A33A18445F
 sub    FF59C22B07640A16
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBE//SjoBCADao3lh/I96fWIY2ZU49ljtHR4Vnzmifm3URFNuv/c8McWGxxCy
 Y1+oolgVuJcy4hCqcgbkwTiAfBhjZSmsC1QK/2Vs1awFzGccPcgTBakFw/TUav12
@@ -350,7 +350,7 @@
 
 sub    5E9AEEBA28836032
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBGUVRogBEAChVh0t3YAJIdreb6SP/lf4x097IRpOiJ7Ww+DDtXFUhKJBwgfC
 4T10TBGP835tV6TfkEeCPGWABoxaD88zUlSHs7k7v/SfedwfOKbOE3c+oR43JL7P
@@ -395,7 +395,7 @@
 
 sub    E98008460EB9BB34
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBF8kuOUBCACo8/VYVfmglgTgmai5FvmNzKi9XIJIK4fHCA1r+t47aGkGy36E
 dSOlApDjqbtuodnyH4jiyBvT599yeMA0O/Pr+zL+dOwdT1kYL/owvT0U9oczvwUj
@@ -422,7 +422,7 @@
 pub    8E3F0DE7AE354651
 sub    D3047B0BA4452AE1
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFMnpeABCAC+vckg+AqDG5Sg+GKbA5t2knu72aD000Qle1X//SjTvPHz0L1v
 rUNzwrqlmah17usczZHOoOCaGjSUFl3nPmBEOlLBh6L4+e2Av8PSbP0qUneaQVgi
@@ -450,7 +450,7 @@
 
 sub    37AE8263DA3084E5
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGNBFu8+5UBDAC74QfHuMgQVUqSmwgE+zWX1YKY4w9a0vKrj7E4tRY8JXaX6GtH
 TWnOkAndsxK3kpUyRx8S7f4HL4Sxf05Tar22nrNkuiQddKjLsdlH7VIolGW1eFm2
@@ -487,7 +487,7 @@
 
 sub    9D149DAC4AC24632
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFPzzfABCADK/wEIRhUCUTj00TcBOxGTPs5ad8jn5D01P7P5ILpLOgmnUp1I
 E3EYy54PQYjDIeOFvEmEywvwMRV8yCVhhYGpOPqbegKwcebXoiMGhJjuRf2nPbdZ
@@ -516,7 +516,7 @@
 
 sub    E04D6BFB21395F43
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBF5ZgzYBEADQvBgzh4vKJqO3amYjIUJ85OPCjJdK5G0xSH/nqOGZbo78DjLx
 3PosyuYqV6sIfaCx+NWv+pYnpKdQHbAnQygggjOTByIQJtpmMT80dUsXTxAk6Aim
@@ -561,7 +561,7 @@
 
 sub    F57552EA2A2B5F3F
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFUITeIBCADHIijQBuGmC+Oo/XE5qIXxzZ2cK26uD0tlDqaPhRLWt5RP3EbU
 b6X8ZLE2AlmawFzU0IqndrCDxSyuo9+ZFQRYT+stf+qHFjtvVQJh2+4L2LpcPrnf
@@ -590,7 +590,7 @@
 
 sub    684EB33FB007E676
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQSuBEwVyy4RDAC9hprQuF4fCPCYdtMlb0Mfb+6G2TqerT1MebLm8/KHCRnPbFLg
 PwGgcyynLX5R2nXUb6oBZQByDN/Dal0UMuC19KeZX83LTcFE9vr516BMXLXXKmM9
@@ -643,7 +643,7 @@
 pub    971B04F56669B805
 sub    D3664677F6280E44
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBEzZjwMBCAC0ecfE/qkdgq8uJv1c1ZlzegeWH/lxW0W3SWK2RwaHx7LrfpiN
 WhxLkXbK6fkf86FN4579W1+9Qef2yjZCwTfLe6bqj3zZGQWSu7HPw1mmhf9lbhJ9
@@ -671,7 +671,7 @@
 
 sub    CC3328A2F49A80C8
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFhlXQUBCACoN2nTeSRVZnGoktKHyiCgeYQ/hEKKKDDAbWubnnQwonCTILaN
 Qw3GmIT6plmi9iy4rl+rJprSzDeQDZngQCx1KPYcXCrrc0pnjERDaogw9fC3c3z2
@@ -700,7 +700,7 @@
 
 sub    C327DD2B96A50E1C
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBF6WyHgBEADOrbvGGDYVckFcUofqKiYrBneClFJH1ANheF+KIekmnFV2SH1Z
 RS2rw12IbpCjwqjhFTMWH2UTLF6pAsSGIufTrSVUAF2WxHw84Y60KmwuYayJCVd3
@@ -745,7 +745,7 @@
 
 sub    B89991D171A02F5C
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBF9amNkBEADKyJj5snYd8bZpONpu1QHf7c/TK9HxcMzGZaIv9QzViX6CtEHb
 2Q2x6ejXQ2frECMrvns5JAJd21B6215EhlOqrHSMkTrQ6fvOIfWd0huZ0QHr4FME
@@ -791,7 +791,7 @@
 
 sub    80CFA7C482552DC3
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGNBGJGMxoBDADF9xkWwxwN72wRh0al9ARzTTIHpcVBIjDij1Xr768zMMRdKOsQ
 aEHRTBKArAfGl6Xt6CfYnu3wMgEDUfh50s9NPOKvhpKtqdIlUxZLEJ807ebW3MD+
@@ -829,7 +829,7 @@
 sub    6C907406A9482E08
 sub    B2581403B6FA2318
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGiBEJDQwIRBAD8GFadoCUDLBvFZaR/xu2KS+k8dgfqtYKXpEQ2CH05lpFWrTXo
 C6h9koiHcsMKtgLFE0LG6nHTUbLs2W7gBCaCk9HzMmsFI5D7RDbyga0wvvg96y4d
@@ -877,7 +877,7 @@
 
 sub    D66472CF54179CC4
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBFKD+PgBEAC8IkWujQlmU0/7+QPZFsc/z/rXgg7BQyo330QK4HeMzeCK6WHa
 SWzVDM9h6nFDs6Xln6YexbZUjLsxS/a/Ox2i26Qg8B+NghgiratbdJsByRrU/3la
@@ -920,7 +920,7 @@
 pub    9A2C7A98E457C53D
 sub    92AECA6AC21DB816
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFjN6bABCADHL68BhnXVXyJhOA9kO9cBwJXKmav2RftpcpXfaeHJTy+CMQa4
 rFxokx5W7E1IPlLg0qJfKSMeWhimVLOsLhY1MZV8Mb4fkK+SlDz/ah+5ej6dzOs3
@@ -948,7 +948,7 @@
 
 sub    2F3C9EEB05D1D1E3
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBEzH8KcBEADyHAdW2cHj2SfvmdAG3yG0NIlfdSWXG06k7BGUatjNfaIGHVSv
 r0U3WlGlUowiLqPhZfQf3v/tvd7yDKZ1Tk3p3A3rEVEZQ26u/o66QgTNjl15YmaR
@@ -993,7 +993,7 @@
 
 sub    458AF764D812A037
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGiBEWjofgRBACePEiXmSvjcjUgWkNAFQ/w7w2VSEqe1vuTCrta+ER9JsvhwipP
 2/BEHigFf99TlU0p1UC591LMeYP2UXfQnb3jiyEPKxA06aj1fTGGMoNMAilymvgd
@@ -1026,7 +1026,7 @@
 
 sub    32E3DF6FC5E91334
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBEzDDl0BEADHvJW2uff8vfxbfy0IvNOK4aytU+HVEvKEmuSqYEzC8i3BF6RT
 LOxTeRFlu92rYz5ypD0mdNCzQaH0xbkcjialP6FpPCByrM9fFv6hmxZFSY71rvqz
@@ -1071,7 +1071,7 @@
 
 sub    81176177BB514041
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBF3xPHMBCAC7OXU5uXXKttUU/BwWm6q08NBC3ybk0fNIfoITWiFA1RtxO7S3
 K4ijImBnLLb7ivjpTtIWzUwFAfSZHc3LgS/TBQJQ2PGsO4/AdaMAcs69irgfoPYY
@@ -1100,7 +1100,7 @@
 
 sub    923C08F9417B222D
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBFKws7QBEADEy9+PqF0cjeS1yG4xMRBV+teFNsS+WZW1ATDBl5ETASqMZT7R
 zFWjMWq8Kf3iTMfmPlKVCPIFH1FG+SgMvWpQEEcLCOmUkJR7UYtn2y3vaXXYqawz
@@ -1145,7 +1145,7 @@
 
 sub    E3F6790A5A167F5A
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBGHDIagBEADpzdCwVjVlHuo8qpu9HtmqNpEW4TB7y6+NX7Q39mj8w+iVskE1
 sL0+BOCdP6ZMiQziWbOQ2FxCd3mD0ixZ7v1i7+0jowySPacJbVNaPPECP38gDte4
@@ -1190,7 +1190,7 @@
 
 sub    BA6D22590B3F9BEA
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBE4waOEBCADHDHNTq1NRR5TSooIrKY0BTQnaLfjKZfcJOwp+btBJrOUO7+e/
 V3M4DZQclj/e8SBiVmRPK8Oyrv6i5B5+Ee/qNlLjWiO10AJ/PLRjYdoW1V6PlTm7
@@ -1219,7 +1219,7 @@
 
 sub    6366592024774157
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGiBDsSIk4RBADSCj6rUjV64tYCGT1DYKYR7GthyWpNdGHSYLbETBcDatAe1dzQ
 5NsCgfrlybfyeY+y1lxr3T9bqf6zJWDw/718wff96qmmv1qzexSYtmIrj+h53V82
@@ -1248,7 +1248,7 @@
 
 sub    6A2038967E03726F
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFRdA40BCAC0zSALsOjfjr+gO8q+HV4qPWuIRB8S4z//jCEpKypyCRR9sA0W
 IDHG6OqG5fO1bP6VsHvSx32E8YUf0bi8eGgpKj5gJ9jmausRvRHtUHJ0pvZRBw51
@@ -1277,7 +1277,7 @@
 
 sub    8183E80D264EE073
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBE8YNGIBEADEgcfvs8TL3X2Ql62HJ6SrXWAOoHw5CquJxUQkvBGesIT1Hk24
 exiPwrlNE1qUjbVlef1Cwk9ZfwMOpJdfP2MQQbx0nxxqv+JtsoeXUy9bTSvZYBUL
@@ -1322,7 +1322,7 @@
 
 sub    21200D723F53CE38
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFy+swoBCADGyV4k02OjVCrziziYIvIO+qDm8Yqxt4KVd+ISw2DvmKVcP7lx
 z5WVGvxVdAl+Xy7FdcrIJYFCsYfFFxPz+BM6+np2c477HkdIcDwBWiHEoOqMehax
@@ -1351,7 +1351,7 @@
 
 sub    9C4C23E6FFE405BD
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBE+xZxIBCACzKctn4ez8xOC0pGThhAwjYWGkzcwK4HNaC1usHThBFz3/t8JN
 OqUXRixLyi5wELN6GHlsGVUQS3IfB4JtuhScsieSB8PTree68/knMq6JI08mJqZr
@@ -1379,7 +1379,7 @@
 uid    Tobias Warneke (for development purposes) <t.warneke@gmx.net>
 
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGNBFJQhigBDADpuhND/VUQwJT0nnJxfjAIur59hyaZZ3Ph/KIgmCneyq7lzYO6
 xa1ucH8mqNBVNLLBhs4CjihBddU/ZKTX3WnZyhQKQMZr3Tg+TCNFmAR4/hnZ3NjZ
@@ -1397,7 +1397,7 @@
 pub    A730529CA355A63E
 sub    D5A25EF82542C54A
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGiBEUQYOcRBADsCu4zTVaB4TOhV7NyTvHhG1bqN+3Va5t4vpGQJg4M4U0Yu0ut
 4bCZP8I6rlXGj+TqDKVUx9kfGpIKX6Kw2TvZUYbHIDWh3UhQO1hD4xy4b8rOak1w
@@ -1427,7 +1427,7 @@
 pub    A7764F502A938C99
 sub    F20DB7FEF61CE1E8
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFc7oMQBCADaIPEUzMrwF9gnEC+PRn2cSPG8OV4RxXxa88TZm0L7NF7D+F5N
 MNUAZ58oVqFUW+ytgb5iey3X7KjlJXZnuqES4m2Id4N7FlnvrmpeOg7MUc9VmNkt
@@ -1455,7 +1455,7 @@
 
 sub    FB4C179C9305F3B1
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGNBGJZox0BDAC/pjQlGW0w4nlUz/pJo69HlaFXNcTw8B6oGwIAhzer/iJIYaPM
 OYM44uifatxD16n4eFk3ZLHkIYbU+2wfprLlfsMhBuh+esY5qIHqFlhos0yQATGE
@@ -1492,7 +1492,7 @@
 
 sub    4044EDF1BB73EFEA
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFELz9cBCAC1cr1c5jWUreRdPYYvk6DK7DwF6dgt7iN4rN2QT75M6ob9Yxow
 QeO709C7V0JXpVCOJ+7gCxnllmktpchRpj7hj3iDdvhVuKMEF4pl+tDyoyzK4Xvh
@@ -1527,7 +1527,7 @@
 
 sub    D36DB5C489BAAC5B
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGNBGBoC2ABDACyCWLqqAo9NeThE90hBoYomtgLci5I8+7PxSYeQfzUYjXzZcnh
 6d/zHaeC0zxGhT2LNe5i3p2e36xSeFDobjG2Il/nv+4jFCgbn3TZ2hEingPuPsg5
@@ -1565,7 +1565,7 @@
 
 sub    1A94B14C6A03458D
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBGI8r9sBEACZJBV2TNUSsLRo89uC4lfmQxfNDqkE0uZghfFY/p0fr6fkBybO
 WDkPFskAPD32fzrWxZd2kkyCRyUrOmAUC22q8hw96t28+RqZymvetIa0f8GQGgkO
@@ -1610,7 +1610,7 @@
 
 sub    3737A3AACF645E77
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBGZPgeABEACy60J6lwPVmvj7LnAwkaggbBVA2kZ3P+YxWLV/hhdMQplYGJKR
 mwd3bnBdR8duAwyEh+VlEsw7+FP14bCV6DihTOhzKwVliprV8Jkt6cog4ccFIjHI
@@ -1656,7 +1656,7 @@
 sub    501B5ADEF57CE6A3
 sub    5D9FFE7B8E3DEA8B
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBF0YzcYBCADmNIEEzvSsnJnxH0u89Hb5vCCkl+45dWHyCMsCLNty8yL214LV
 B35gnU+6BvRXN3DmTpreCV8/wgI2h1eq83dTO2AsnJTxTjvYpiwAtWhONxWxCU1Y
@@ -1704,7 +1704,7 @@
 
 sub    7B92B768F9D37337
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBGHu5IUBEAC5appY0S1OLTgUnwbM49Y5Km/pL0SWE1nLwGPQKG/YBpcVaKhE
 zn1w7/3gtqrfQr811OpMVjrV0LAKh+gPg25m4GIYpqtqgO1u3T7e5Za5dq8f0fAP
@@ -1749,7 +1749,7 @@
 
 sub    3F7EB3ADB58CF1E0
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mDMEYlrX6hYJKwYBBAHaRw8BAQdAuMmfV7N5GrH0mrA6JbgOFXi5Qx4V+DN6DiEJ
 yQWXOcu0JlBpZXJyZS1ZdmVzIFJpY2F1IDxweS5yaWNhdUBnbWFpbC5jb20+uDgE
@@ -1765,7 +1765,7 @@
 
 sub    38185785755267BD
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQMuBFKTz1wRCADOdMCDOKXlBuQpG7mnQ/5rppqhS0SXdKvNZ5pYrJKib1LLtlS/
 LOeABja3E1ky+znvTqnEEtai7fNhw36zPdUjhPKE0TZwn2aK5fyctkcfqBFsja3E
@@ -1806,7 +1806,7 @@
 
 sub    C707929E5065E0BC
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBGJm9OEBEAClTz80QmRmi9bpX4m77aas5Q+x+gRtlEg6IWU6QfrGdazVO/3S
 brF3KmsEnxW8fjqv5drswed8FmUVdEsTcco31jxeD+fiBFCAU8BnrpL/+iIALMRY
@@ -1851,7 +1851,7 @@
 
 sub    7892707E9657EBD4
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFdbSfIBCACrFI0ai/abnV2U2Wa9QQZwGk3Fegc8laiuTKc0GoYdyptd83/H
 hD5S61ppdkOugBjVTHdgda3xJ7zBZdnwjZvV/TyayQltbh6hU+BMlEolzXLgyvY7
@@ -1878,7 +1878,7 @@
 pub    B16698A4ADF4D638
 sub    32784D4F004B405B
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFM1v9ABCADD0KoXq2ZKlUHeIVovQy3gFmW9oFAaraV48ouv8cYvqdf+s91H
 NyqeyNPT/ihFeNqZJUAMyPdwN5xrWD6gxMrOCR7BFhA5kLmAKz4HfFCQ05ViyQdI
@@ -1904,7 +1904,7 @@
 pub    B341DDB020FCB6AB
 sub    315693699F8D102F
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGiBEowbDsRBAD2jx/Q2jNuCkgiS3fzIj6EzDP+2kipIKH2LEnpnTiBlds2PFYM
 xYibVab/grgQODxTdDnAKifbJA/4h1/T7ba+OV+xIUoSI5MbgaF3USidiDHPX0pY
@@ -1934,7 +1934,7 @@
 pub    B57BD58EF6D0A713
 sub    781D1F35916E0113
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGNBFsZf3oBDADUgeJsq9asQLaUajkGON9KmxKBtJS+IbGa0jgvx37T4LDigKS/
 wh4axvdJ0mE31uXKitBVDkr5TptyxA0jojYwlt5YLXsotnskdHrIg35Q8xpMp72K
@@ -1968,7 +1968,7 @@
 pub    B5A9E81B565E89E0
 sub    28FA4026A9B24A91
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBFIsmpIBEACzV3plLr6UEdvMiarCYzoK3W0Gzzd6BWtEuQdOsDkR/XCGOEkY
 hNQ9sB7QdA3ysFdRGf9IFcd7E4Y9dQABFXDlLEDGewPdZ1ahMTz9kK5k6R/1mxeu
@@ -2010,7 +2010,7 @@
 pub    B7C3B43D18EAA8B7
 sub    02A4A6FB70018AD9
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQQNBFT3aMQBIACl/07e2aAdqLGTocp3J694BSGxjH1M4T8BevXH0UTRTXbge0l2
 3IONp63KF1tmHg0skzUu/1Ybau6Zw7k+jRFN+9VmslRprk4fjHjgxmT5U8p1ualk
@@ -2084,7 +2084,7 @@
 pub    BAC30622339994C4
 sub    FC9BDC25FB378008
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFlMExYBCACmdTDSXPwSJeYbfYvHoDl5C7vx/0+LOTunDGJN38pNQHYQAZnv
 Gyoc9ZmChrhLoim7z4ILqmNo8eegknepQ3dGdUij4NVIhR+m+8irayTbsNHvo3UG
@@ -2110,7 +2110,7 @@
 pub    BB2914C1FA0811C3
 sub    7AEAF265B448E2F3
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGiBFHwyNYRBACkCXpipiMx0lCEccXXzv0bE7LHHbcQYtb1vT/o9WXYoP8JMChJ
 cvuAe8Tvg+s7EUjKHJRhu7I7kie+IJ2wtH5uVARkYxoP2OslYN6MSXa/bmwU8fwQ
@@ -2142,7 +2142,7 @@
 
 sub    C9F04E6E2DC4F7F8
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFKneXIBCACtnX3ZQmPujf6ocvdnhsBheze71DSl34TfebyW2Qt+g9NhMxo4
 DaJy+iFNnsaMwLZRr6k/qf+ISE3A4opWAQlbk+Wb5s6DPPA2cHH6W4GdkxtuJzqt
@@ -2171,7 +2171,7 @@
 
 sub    E05A9780475FAB55
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFFGZXQBCADeZK9xuCrDwJ7v37y8RITlchzBfJEWv7cSbrSIBlFNAsUUoshW
 Y8U6xYKe0GdiLVta2F8bzs0Si4LcDeglQNi9Fxvh3/jfs0MEJUfSeZ4z1Mn5WY35
@@ -2199,7 +2199,7 @@
 pub    BEABCFBEE059E4E5
 sub    6579F3D193AD0019
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFOv78cBCACj4w72ksYDdLAY3GzwpRa1fo6S4aF7r96PitlETY83ct7AVF7j
 XaBGk5ylNAZXan3vlsSAKtxlI7skZOE5iKjqDo7SUfohs1WXdmL765mUNsSmkbG+
@@ -2227,7 +2227,7 @@
 
 sub    4BE257B370130000
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGNBFv1EEwBDAC61jyEM99KH18hI3zlfuqvGoNjTLIh0wge5vXAH8VxMR0ndOID
 HYSBT2+L6OeiqKlyhCgF1km48F/dMzyJdTASkNO1Ni+B2Ric1sBxjsSPufkjl4en
@@ -2264,7 +2264,7 @@
 
 sub    C163B490C5CDC967
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQQNBFT3VuYBIADPQxdM6fJajMSyeiKbfpSjllBkGA16DE9IFJ76B6281k8sfya2
 k6UOAKNIprxY3JCRulbnkn3BcdbY1vZDhaf/fbdkvJ+o/XVzrxojq1jS3tvSq95L
@@ -2340,7 +2340,7 @@
 pub    BF984B4145EA13F7
 sub    84761D363E7B0FC4
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBF7rgogBCADU9OwoEFdIgN5U0JU5pI7s3T1T1LeDMzAQ8l2Hq4jFrhnrjcEA
 ieDSut1YIv5NTBoZv4CrklaKvvQNUXPvKrFImA4OKhBodKV3wsq2efCATDGa1JAw
@@ -2366,7 +2366,7 @@
 pub    BFFC9B54721244AD
 sub    788E173C196BC673
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGNBFRRGVMBDADAQcmG+x0mHZwJ3uKgODjUZXkGRkuz7aP/qRmuQVn93tl8DmA1
 lgvXndvChUjzYt4DJnQhRsapAXEmP5/YYIkWOzuk9EpXGtqUieocylvNXP9eDF9y
@@ -2402,7 +2402,7 @@
 
 sub    3F078B16810B4EA4
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBGRmS+sBEADKHnDWmf5NP1/WPGmBLTEDv/mSGZx7jpfjbaEcCFH3hiGbspbK
 3wgGE1OzFf6JRBurs8GS0gD4aXoQFz8saVASPHlKK/LYc7f6vYAAWj6Tlm1j2qwe
@@ -2448,7 +2448,7 @@
 
 sub    606CC6C4533E81A2
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGNBGAic/4BDACtIv4a32pL+84jJNhJ1yb6GFgoWknJSJ6IELIL0Z7m+FYsymRs
 lTJ/QwBgjZlgS3HS7IBhEl5o+kEt2/U5lPkz/krP8By8EvRv18PpfBzmXNT8rGqc
@@ -2485,7 +2485,7 @@
 
 sub    97149CA7141687A7
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBFwVgzkBEADF3gGO9iBXW9g7+yRjwTKuadaSW/32gDyREjKNSa7NA0HSCtnU
 dKapw6AaCFpznhfjPQL+bZX/YJUdrIXrSJ9iL//2Ay/JET7UhYBsHxaMm8VURpIK
@@ -2529,7 +2529,7 @@
 pub    C3BAB45F4AF71FAB
 sub    34FEB51E33761BEA
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFkeN88BCAC4rvR3Dc6nDYhbXUC5IQ6SJWvV98+tvZ117J/VD07el7dicryY
 H3OAWl62iLjHJFP/+AEra1plpiWbPioDlzjOWC2AJjUCtqVLHdyVbY0Gv3sSRZXJ
@@ -2555,7 +2555,7 @@
 pub    C4C8CB73B1435348
 sub    EA2A558279B36E6B
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBFSwGboBEADoHgtdw+OVEAIF1SiRju8QDuhePZbpSgRLrt25AmowHJhOQUI1
 EP7+RWoCWW9gWAGas5mGDBxhPw8NgFv1nMUWFAsj0rkViuRD4qpJbChvlqw7YkOq
@@ -2597,7 +2597,7 @@
 pub    C51E6CBC7FF46F0B
 sub    4006CBA6D352F1FC
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFbgSbABCADGGENSy3oWLjW7zfYMSsR0pm3l3eMA7ptyU5C0U/MoIYjbXwyX
 XtlGwKnNgngATh1SMpX4WDbD8tn6vdeP4uHQsDb40t0XN7/HISFcLhV5pCgz2wNR
@@ -2623,7 +2623,7 @@
 pub    C71FB765CD9DE313
 sub    DFF2D25E2CD6139E
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBGOV0eQBEADTe/ljLAoBp+z84NkWHDBqbBmEsBxcGa0VDQxGsaMMi2f6wkO2
 VDkRFNzNQbmw5xFqLisZ9ywzuVc9xmZ6qoMWLJaYs9RdsJSgD9+4hL5IkmjClxc9
@@ -2667,7 +2667,7 @@
 
 sub    29E792953D515FC5
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGNBF8pVB0BDADcwRGpJUDe8eVSlJ0yPQl/CyeYc0RWq2f1seUMQO0xFW1xPIeL
 IE68D9VdgarA88qDLYesfBqzn57/r/ztj2aLEKt8IRunJzd0w0G2rrgSCZQ8RmzL
@@ -2705,7 +2705,7 @@
 
 sub    96123FA2B8E17FF9
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGNBGU//oQBDADDJ42aKLuJyYL2ZfG0ob/XxdYRZhP7/OO64Jf4WJtX7vgoVUif
 iSytAikRT707EshXRMtw8tx3H/jM2O7o/gJl592IQ2gYppMh4boNO7lc7dd9F6gv
@@ -2742,7 +2742,7 @@
 
 sub    7679164AA2590985
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGiBErg1IARBACVbmwMwp4p0ldolUYSkGl7XFJHwtEWmuikGcM4lp72h/YhAXpf
 RVsKE3aCy6HSTt7KJrcUuOL8BB67riZXLOIZtA9kDyC+0EUbnW2EbVfJXskPLP5X
@@ -2787,7 +2787,7 @@
 
 sub    64863FF4D1BF1809
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGiBEdUhrIRBADCU9cuKc92CWQlZxwtRuSIV/36Qmj264YD+Lix+r1Qe1PqRr1I
 /MObOo83ulorWigSkx1k81Mnr56NwmIeo2bMhjmgRgf7EG6XEbKdRKfJcJRR1lDV
@@ -2820,7 +2820,7 @@
 
 sub    AFF3E378166B1F0F
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFeWvEwBCAC7oSQ7XqcGDc6YL4KAGvDVZYigcJmv0y5hWT4wv9ABP4Jhzr1H
 NDmmGyWzhzTeMxwuZnc9vhxCQRwyxj3gGI5lYPEARswbi2fWk//78/3Wk+YMHJw3
@@ -2849,7 +2849,7 @@
 
 sub    B2D8461AB7A7DF27
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mDMEYo/OhhYJKwYBBAHaRw8BAQdAStj5losyChV0W0clNh6HwDgaGgmypqqVICtN
 K+Vy0oy0JlBpZXJyZSBZdmVzIFJpY2F1IDxweS5yaWNhdUBnbWFpbC5jb20+uDgE
@@ -2863,7 +2863,7 @@
 pub    CB43338E060CF9FA
 sub    C59D5D06CF8D0E01
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBE0NT+kBEAD1hzO+dXStXYJj8M6FBn9fxw+grddjM9rqaEgJ2omSdpZZOPBs
 DRor7v0Rm23Ec17y/7Dd6oR1CvyAeQwhJvNBaAW4LQmUcvvqep4hfkWDhlRvh/QS
@@ -2907,7 +2907,7 @@
 
 sub    BE04F93C75A3B493
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFRIQyEBCADYOc8Y4bOkLGh5NFwQ1JJwGzPY/mV9kndWy2tudEs89Poo4cQD
 A/wndJqO2PrdvDvt+kxKQGra0RzUNW3Te5gaePo7+3H297BAWar8+KiX8RRu3uB1
@@ -2934,7 +2934,7 @@
 pub    CE8B1D1D2530EDC5
 sub    7ECBD740FF06AEB5
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBFuX5CkBEADkTgn4nzuq0lWR+7kFGYLKvmPLjes4j2nmygIafUjVbNmD70gY
 DPpbSP02HxgicM6xSSqzZuBVxpbcffqjMPXf8LkVX4iWKZtyzLpf34yaojigU3qF
@@ -2986,7 +2986,7 @@
 
 pub    CF9F3090CE4CB752
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBE7E4m4BCADCkqre+MJRRn+yBa8PqDHFIpfxOk8lQeueZTrU0Hw14wMkkOW6
 XFBb4hDeezStNNP6s2TS7bf5YRXZwqOwwgg33WYVVH4jPldaP1m+Z3GtYSLKEjTl
@@ -3002,7 +3002,7 @@
 
 sub    57CE36BB68F1BC57
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mDMEYYx3eRYJKwYBBAHaRw8BAQdAV7zh1T+xL7mD2O63rTIvRfQ9kwL2Gvq/Q6PD
 9apCe2K0LkpldEJyYWlucyBDb21wb3NlIFRlYW0gPGNvbXBvc2VAamV0YnJhaW5z
@@ -3018,7 +3018,7 @@
 
 sub    5199F3DAE89C332D
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGNBGCtdhoBDADdopjDt4eUNEqLJSw1ZICSR0oq09SOVtJSaSYdF8UiXjBfL1Ds
 fhTDqSv5pT2a2gLj0OU3tFhWHvINLaKKCjQnHVcFXi2LTxt+XBOjRYkFjHVisbaZ
@@ -3053,7 +3053,7 @@
 pub    D364ABAA39A47320
 sub    3F606403DCA455C8
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBGH0NlsBEACnLJ3vl/aV+4ytkJ6QSfDFHrwzSo1eEXyuFZ85mLijvgGuaKRr
 c9/lKed0MuyhLJ7YD752kcFCEIyPbjeqEFsBcgU/RWa1AEfaay4eMLBzLSOwCvhD
@@ -3097,7 +3097,7 @@
 
 sub    D826E3935EE9DC71
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBGETEF0BEADoVhSwI5d3PZTca1W/1HvIf5UiTJrSlZby9xRdSbfJ0dj7V0QG
 aY1tsOcLLuIkj+/wDJuATokYx6IiGnntorQcLg3b0XMoPqzTVDl4lnKcNIsh/kxD
@@ -3140,7 +3140,7 @@
 pub    D57506CD188FD842
 sub    63F72A7A8658D653
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFj2NXwBCADPJcGfWz4Zsfa/UEUF6a4aAIjqCy+rNmLf9Vs3HD6B5p1r7VkC
 e0HhxrfbkDkQu6aEmAwV6GwYiwWBf/LQYNdKm1FYZFhKLhyuTPiirFqIouEFqiK2
@@ -3174,7 +3174,7 @@
 
 sub    9D49CFE20A7A3EE7
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBF7rvIMBEACkH8bOlnIXAH9nQYFcihkcJvv73pw66YMz4aMPJe5PzaJU6kkV
 2lbEgEOnfoFLqgnJVY/KsPf00BXaP5uMzqNfJTK+HO9I7m3BTqmjLBgUegQig4K/
@@ -3219,7 +3219,7 @@
 
 sub    A23FC45C6F9E2F57
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGNBF0uFrIBDADbJkwrWs0qPrv4bNmPZMWHcryANAwodvFF4f51Z6S3pBkuBxx0
 vW8ZKC9/scJiAzSqJRf4im70GPNE3MZjNyfuRdaedXw2rFc4Ip7lBsCtklYmTWmC
@@ -3256,7 +3256,7 @@
 
 sub    B4C70893B62BABE8
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBFMvQKsBEAC3/wuVMv4ia132SA1Y/KnuZYkSNDaRH/Ie1WTAX9X0KrWA5fx2
 WmzKfaLNyBHU5aI0BjoE9DW3zkZcLEcL/cxRzoXoavUGRhRsaHbj4PhQkEqV35L1
@@ -3357,7 +3357,7 @@
 pub    D945E643368FEF62
 sub    A8D88140C35897AD
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGNBFzJyTIBDADO8siKg1NQb8jNPo2DPC5CpPwYDPUjlX7Nq/FMBYeY51JlxKLD
 jmH/R5u6LuY0v7gSodrJqE0FUjz8LgN9+Yp1f1szqxeYHLsAVahO4cafG/sITYvr
@@ -3393,7 +3393,7 @@
 
 sub    9121AD263441EEDD
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGNBFrjUQUBDADTMQL/4d9EyVhsO4XBH9wbGWxcEJvsu/HvppN5fY8hpMV0+Cr9
 wjAeJ7d9zdFJVB8vPLN7bb5dm6SNyK3KiOugqVgZrQ+ZPTvCCgFbFyEXuZwDiOa1
@@ -3431,7 +3431,7 @@
 
 sub    66A2CBDE49E8A25D
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBGAwdRsBCADCXfWdHhywp8Rcgt834W/Z3MFEAxYdxjAJOTQhc/In1SJfIqi/
 xD7OKHA2fbwzRnS/UmXkmElTK7JI3/1gWRm8kEaaHTnlI63Z9MZV0DHMpJMgvpFM
@@ -3460,7 +3460,7 @@
 
 sub    50C6CC55C6F24FB1
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBF8tnmMBCADROe7j1ZvgiMgfsQKqCSuSqgMkfMT2DEXwZKdHqkj0gfx8MPQg
 OP1pmMgpIwIXKr5kZ9KMGiGULNnS+WU2SNqjyKeq3MlnSYW5Di52MoAD7W4cHmry
@@ -3489,7 +3489,7 @@
 
 sub    A947A3FCB1697B4F
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBF7H/6gBCACbEuIbxWAfHEYViPqdpwxDYauxsYwk6FgA9sSO1nS95KRwx+Cs
 X6F8nRGnfLtbo6Ffcp6r58fNi9RvY7ueRGiL0kQd6c5GYx6dH1b91Q1qrdVOeEdj
@@ -3518,7 +3518,7 @@
 
 sub    E8D0C72FC5A02B28
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBGAlt80BEACftpFzUCGm2u5sV4UgAysobdqZywkUKP147toek4ULQRYpADig
 AI9J3BCmHbcApLek1U7vj8geB6T7V0c4ELLFPQ+4lQlCPC8Siv5c2gDaZvoMzTlw
@@ -3561,7 +3561,7 @@
 pub    DEE12B9896F97E34
 sub    9A716F957BC42546
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFAxQKwBCADJGPv6pmFEq0SDwAKESEgCdnXycbR0bNXpNa/3VGboNto1xKgd
 AQ/sI5x+CmN0hpUjklEwff6QIt3MlofEMkAzSfRmTobhJTK9W7r4+p5DuhJpi5Wz
@@ -3593,7 +3593,7 @@
 pub    E0130A3ED5A2079E
 sub    0AE7BBD7FEE66E0C
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFlMSXMBCADcgN0/57D/gU5cDobPiRuDT6qAxb/NWhQiqwAocKd274r4gPJm
 RbffUEZEgKhjH6l0CQfilC4R4x2QtU9sNC9kB/D6zumoS1uI0Hmx1pC4UseUy55r
@@ -3621,7 +3621,7 @@
 
 sub    F3DBCE882C3A01AA
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFsNoY0BCADIvRrJEX3k7UeuT6zt+F4++xH+5Qo7QzdicjFhhyb22PLPyIsI
 Ema+T4QqiPDegUv8yKKTTBmHNw/vSUHTPX9ZUpglckopuOgdfnuQjTKEOEzrN7V/
@@ -3650,7 +3650,7 @@
 
 sub    5A34A5E06B936F93
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFF/4bYBCADTeOLZiVGNbjlPrwG7UcMl+yXmEqpf9dB1A9cuicH3PWXj0WOb
 LSzHjzoRvRekEqSUmgoveey1lPuA2qjOUkXY6Kiyx+oLiG0/ObJHUQW2O+tjSQ0R
@@ -3680,7 +3680,7 @@
 sub    60EB70DDAAC2EC21
 sub    3D5839A2262CBBFB
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGNBF/RX/MBDADSqelDQKobURExWUKALq86yTPMxMasxmDlccKFpk5xjWrryL7z
 qg4Fnb7IK5fKDtcnTANtOv2hlIli1h131+SmjJdD3qhfly7QoszOpr5izDS+FOCj
@@ -3761,7 +3761,7 @@
 
 sub    4697DFC8F2696A57
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBEzdTPIBEADki1HMFzssqhU2l3jJr0zNE/gyPohjzI5ugw1dNWUd/ht6oUnm
 2StYcsRnFHlY7aIp56v6cZtAKYDZTlEArIurH5xyQXQ3PLfxQZPVS6HDUghaa0rJ
@@ -3806,7 +3806,7 @@
 
 sub    52410ED7B05AD2E9
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGNBGKRNiwBDAC56nNMaU1QEHCpOnvOHK1rjDKGDolxSyx9rgoTTWpaI9y7JbUT
 iajEkzrtTsqjrabCltAY6QGQUz/TdS9MikCPUZM+l9EYKoBACDeKrYMcApHj4eVw
@@ -3842,7 +3842,7 @@
 uid    Rolf Lear (JDOM) (Used to sign JDOM Packages) <jdom@tuis.net>
 
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFCPD00BCAC4tY8wMQTsCKyII/mMkUDAkXA2cLM47fY1Wn+iohtgtalUdA0v
 AhGvTdFU6/St35rOKNoyLC7Sy30FBYpAEfMB/x9j/CaQtdtGhaQU0hCvtWGhhS3J
@@ -3859,7 +3859,7 @@
 
 sub    BB09D73166EEF1AD
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBFEqVnEBEADZhnnAV62dwYvq5CxvEO9N7m7vrYMosc8PCEafxJqrDMbWWfv2
 tD3EaHAERt/UFVEo2U5FV1hELUvFISPhh/DpOWYuc7pwA75do7ul6dhwgi5FcyjR
@@ -3913,7 +3913,7 @@
 pub    ECDFEA3CB4493B94
 sub    3BD211F725778C36
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGiBERFeVERBACjfASThn15ynIICr0Gu8quGCl2rSSRar8TsjrbiwYB2MTW35Rg
 NjLU6MN5Nq4d5G8D5aMeoyGODstIHH8zA52sDGeHOMKfDaAraL+lGzElbpmaqP2s
@@ -3943,7 +3943,7 @@
 pub    EE92349AD86DE446
 sub    E68665C8F91BDE69
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBGO91akBCADDDpIrW/IohUSJNDu9VOUlnfEOm5VS49uqM0uucLi0BeAhy1Fo
 P6Yg1cJkcK66DtnUoTM/JJLyDzJRlKnniLrYCkw8ScvtPdA5cQKJTY5ecn+9ouR2
@@ -3969,7 +3969,7 @@
 pub    EE9E7DC9D92FC896
 sub    3B7272A25F20140F
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBE/oyDcBCACgYsHtmWmtUzqyr/JN+orfJaTl2363qiS+NJ1lt2CNxUWOqldc
 VcIGyjmzokxTRpGdCFmT1Lh/hzZhcDPLjrtxf+f6njIibt80OiEbX39gjwZRIikd
@@ -3997,7 +3997,7 @@
 
 sub    AE7B5A78012824FE
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGNBGFUnmoBDADItKvcmnwP6xsF7EnS+gKxUBU+M+x1sdzLJGyOL4laakwgUx3m
 RhKwDfT6tIQjTAVpHpORa2LNYikoYYodIHshTuwN9Gba/pybeRdazWguOv4pizTx
@@ -4035,7 +4035,7 @@
 
 sub    EF375EEBBDEFD775
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFS2J+0BCADZI8RYk32YeO9gnEkY9RN+4dKb+H1AR4v+IGxmy0UYy+O8bo4m
 YzkQHTlPpEPGe10/quKk1embDifEfNa9mwcSJl+XUPFlTrSA97SR31mdyK/Ua146
@@ -4064,7 +4064,7 @@
 
 sub    1C9F436B883DCCF6
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBGAhOxEBEADdB5Jy2sSOndOMCTyk8IFIJYPogjXtN7CnyIlqr4jEB5G87TJf
 m7OxB95aIVS1vSA5ghCm88N1mKtW6jyYjgLFQbbyD9/X3ShVZjh8B2R4atL93SSK
@@ -4108,7 +4108,7 @@
 pub    F406F31BC1468EBA
 sub    4BB1ED965FF68B71
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFmnALcBCAD1KazT9eswNXzML5+M72qhdIX4VlJrrOzeiQtTW9vbXj7DZUnw
 U8m2bNmKHtpnyXQ3Vl7FE/e8CKGUVKmB854VJGDSyjToeAnt8A0Lg4smaSfgbEim
@@ -4136,7 +4136,7 @@
 
 sub    6064B04A9DC688E0
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGiBEtsF2oRBACcai1CJgjBfgteTh61OuTg4dxFwvLSxXy8uM1ouJw5sMx+OKR9
 Uq6pAZ1+NAUckUrha9J6qhQ+WQtaO5PI1Cz2f9rY+FBRx3O+jeTaCgGxM8mGUM5e
@@ -4169,7 +4169,7 @@
 pub    F6D4A1D411E9D1AE
 sub    B5CB27F94F97173B
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBE89LqsBCAC/C7QToaRF8eZgGOxcvp9aG+mFFCMjaRAb4Mh59OYdmUb6ZjfO
 9388HPebGbPNR8SHYs0dBIuWY4ZJ7oUTYPswasL8vB0iPFdyHhvkCca+yk0b8ZBM
@@ -4195,7 +4195,7 @@
 pub    F800DD0933ECF7F7
 sub    592C39141EB02A78
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQMuBEvQhhQRCADQ2MH2FpQD7pbCTDJ4uvPSeaOz0IUhkX9bK4sKvIISx8MbHhR4
 k4sXi+vVkLngWCMUV4nB4WcCibk2S184SzL0TstTDrudxe4eJFVbmZw0GrgASugQ
@@ -4236,7 +4236,7 @@
 
 sub    012F07EDD27CB2E2
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mDMEZI8otBYJKwYBBAHaRw8BAQdAL5VNS8O2NJbsTZaMphHGdxsSaLUj0tZLI6+R
 /pve51q0HlNlYW4gTGVhcnkgPHN0bGVhcnlAZ21haWwuY29tPrg4BGSPKLQSCisG
@@ -4252,7 +4252,7 @@
 
 sub    5F68B9B2F1725F16
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFFCLwoBCADxtcGi0nfolr1kGWe3jQ7n18roJFwBs4Q52nx0h4+a8ZGr7/1E
 1brakrz3t/cTSZIrhfru8kirP8cJtXBxpd/nCeRrB/4ZtXPUJiGwKx6sVGr0ix6U
@@ -4279,7 +4279,7 @@
 pub    012579464D01C06A
 sub    CB6D56B72FDDF8AA
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFgnlA8BCACVtx3oLXcanfvwtMRwal6pLQ8IVMG9+fr4xGdbSHXCRNbosDa5
 agU7WeQMPhusSxJGaA3w7NOdjAwD/LeHADhDPeI6llJg1Fb3EyqH0NZaODKU/Or/
@@ -4307,7 +4307,7 @@
 
 sub    C753427AB202DB9B
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBFBdqooBEADuV8IhDi4Xvs1oYAnTXQz9MW+bU5uaxQyQcFzUwxacSdgAv+pj
 dZRFli8qs31HsddRmW6qCkCua/QXNQWCOcylcwAKmumct1Z/ZumYTRVGbsagneBa
@@ -4350,7 +4350,7 @@
 pub    02216ED811210DAA
 sub    8C40458A5F28CF7B
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGNBGADx6IBDADoHin1LGQ8dhnlhfNCBZ3IyXS2NpR1VjmYtHSlh1hGsPcmHuwo
 1mLA6JzXF7NuK3Y52pbTr6vz9bAap8Ysjq/3UJeiDbf7FvmO5xAEVUhrpc7AEY7G
@@ -4386,7 +4386,7 @@
 
 sub    7CD1B9BD808646B7
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBFqzjCgBEADfFggdskGls5KqMnhvePTtS4Bn/2t9Rl+Wg3ylXgy4IFd4bnI2
 9f82dVM/nobNqAnhOp0wEaAcw+57xBx3rjjKQbrMzUweWeL3uJdTwtPWoyzzsUP0
@@ -4431,7 +4431,7 @@
 sub    0181B45EA58677BC
 sub    944EC8D1A08CF77A
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mDMEYiljShYJKwYBBAHaRw8BAQdA4ativA3OtR15B4YnoRwpm9rRgHdd0A0lzJ4u
 6q7gsMO4MwRiKWQYFgkrBgEEAdpHDwEBB0A8fHRuwUbuvdnDexkJzQZVUg+nFrcA
@@ -4456,7 +4456,7 @@
 
 sub    F2E4DE8FA750E060
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGiBEmoKU8RBADEN0Q6AuEWEeddjARAzNXcjEx1WfTbLxW5abiiy7zLEht63mhF
 kBlbyxEIRnHCSrPLUqY5ROWdyey8MJw+bsQn005RZmSvq2rniXz3MpcyAcYPVPWx
@@ -4489,7 +4489,7 @@
 
 sub    9757C89E39C828B7
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mDMEZUJpBRYJKwYBBAHaRw8BAQdAMUi1X0odyTiUuXIgDEYZZ4Pf4FQifp2UgYln
 s/XkBjO0KFViZXIgT3BlbiBTb3VyY2UgUHJvZ3JhbSA8b3Nwb0B1YmVyLmNvbT64
@@ -4503,7 +4503,7 @@
 pub    049FE94F2D5DAD9D
 sub    953E02E4F573B46F
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBFxlMc4BEADbWFmOqHBqUUAcO9nPRSqtrmIdjBCzqsRosPk80n3Nd+jWc44T
 /O5TObVbn4NxCmbLxklWpIU7eTEo3u5LnwhkgcsxMykWYdq6DqyzENO9PeE/McrN
@@ -4559,7 +4559,7 @@
 
 sub    DECB4AA7ECD68C0E
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGiBEoo3BYRBACXE2oGRA58Ml6s+kvfk6n/AJ+5OFeRT/Xelco/cpdxOVF5LkRk
 yd+vR2+F9ldBlH7CSTCmrdZIN3M3zrcWndrk/OQkCxNWVnE/a1li7L3G9nYr011k
@@ -4586,7 +4586,7 @@
 sub    6A0975F8B1127B83
 sub    3FF44D37464BBB7E
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGNBFzy4ngBDAC4mz6ELMWjfJ8GZtolq3E96T7qjfp4J9FxGVxdbJxkEDnn6MTg
 V8zhD7yeSZcUSvwzPiDlB/b4RYnh+5LjzKHTsrtr9ja0SupuCkVGkMGWeHhpIGV9
@@ -4667,7 +4667,7 @@
 
 sub    11F4CE313A637CC1
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBF3HgdMBCAC3ET5ipFXdZ9GGMbtsCQ3HGT40saajsNDOdov2nMJxzKkVe3wk
 sN3bpgbsqBU9ykVkIhX8zV5+v8DOBzkV0pJ2eLjFa9jBPvNjV+KoK2BAI5pzNzYg
@@ -4696,7 +4696,7 @@
 
 sub    8118B3BCDB1A5000
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBFu1EwUBEADAXapH49L1Lwt28iK737X/+4bRDE+lkMxehnUZ7QJs5zkFz5Sh
 9K2rQO0PpvoMSdadGplFyhKdDP/iEUpzxTTbqMs5UjbJr0MoFfE957Vz59mNf9WY
@@ -4753,7 +4753,7 @@
 
 sub    5FB8CE6F93DDEB23
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBGAjI8sBEACtiX+/sDZDNo9M42xWgMDEUUBGkObE0opLPe9N15OHQt8Ve2yJ
 VW5yW0X0hcBIkaxAG7F/NpjVRN1bLGM3J3URR+XD+Ubq2KJkKW/39RHcP0m60tL2
@@ -4798,7 +4798,7 @@
 
 sub    A9E4161147556D82
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBF+EGtgBCAC/KXNQAl1rz3VBbqm6ssjzR+5Su1QWHI7oYDS+YHCLOaqfE3jO
 zQd+8iNgniVNtX2n7bt1hido5B94VmaqD+zjjSu2UV/eZoYhCOQ5NgvxIr7WZe9t
@@ -4825,7 +4825,7 @@
 pub    0D3B328562A119A7
 sub    C45D01093DCFC371
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBE4rG7gBEADo5n849j3hlKrvFzt6y65grIxTlbLDXEB7+6sw0Xwuh4NrK/Zg
 0+eF0vvCCZrl3lHE2duD2ng9ZXz8EvUSNfwKMQz+cwF0klhP92u6mykKJ3/DZ4yo
@@ -4902,7 +4902,7 @@
 pub    0DA8A5EC02D11EAD
 sub    71499A87DC1FF84B
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGiBE3LMfMRBAD90h69D8yyPWaSoAyh2mOOOZ/XH0isuBpDZCWptemlMHgImqdQ
 2sXLXYT1bJKmSaMw+yKjp8J/NYk69EbmSK1C2nypLQtWhUmXXd3XVYw6hrG/dGvi
@@ -4932,7 +4932,7 @@
 pub    0E91C2DE43B72BB1
 sub    83552A552A0D431C
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFBIm/wBCACgqvegptBhfKbyBXZiW+7XchIJCOpwq0/9QgSehKMwELbUKqNM
 sIVrywANqYn32S9hNRvBiKGm/KY7VwN9p1Cr6Ey3XuGSbRo/xN6tqfV/rV5YClL5
@@ -4958,7 +4958,7 @@
 pub    0F9FE62F88E938D8
 sub    BF6D15D3F1BF7BCF
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGNBGGNmd8BDADSpbdIfqzkUNAeYlP0nUw/HFU/v+/aydtjUioAi/KxYt2FOMi6
 gk1LOJzHBubv8bF79mlN6sXrnq2lV/MuqvN9DrTAQ4u4Dh0pgbLK6jbxDWPGrYIo
@@ -4992,7 +4992,7 @@
 pub    10066A9707090CF9
 sub    2B9F5DBAEAB53FE8
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFGKp5ABCADTyMhDq+7Kcv2wXOpOmZgp++JNO1erNUjVqFX7n9bT77DciEML
 LNxWVF1tkNqgkn0ughZTXK5EGdjUfZaJaDDfG4BIsox/ng4nDvIp4CtXqHbWqrlc
@@ -5024,7 +5024,7 @@
 pub    102E05D8DA6C286D
 sub    7680B2343D1CF013
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFOZyw0BCADj6eDnIjaug0RJQCi/HLw5jJ2kORPaegxFuE5IhpN9pZCPASax
 aTROfUSnys7cbxZxh3Sri3spQ0j+ejod0MhVX9ajTg508YAJUaCBbM7CGZJZtVFL
@@ -5051,7 +5051,7 @@
 uid    Thai Duong <thaidn@google.com>
 
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGNBFrY3D4BDADSiDX16IC+236IeUiqi7Nbt2wlsBS0zqqaXi43QwXwcf7aYn4+
 qrn+4JvsyMrDgkRgOElz134B1i5OSzP/32w2JCnj90XUjO5N1KD0QqoSops7NLhZ
@@ -5070,7 +5070,7 @@
 
 sub    DEDF3A7EB400D53A
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBFnu01oBEADvITy7wT3dfEh6GKbW58giiB+JM3ikYNsK6LWaOa9Pi4/ZPpBT
 ZxNfY90xp7U8lklmiOZ80XzXfKdnQySdW0GlGkRnzL8c3FayN97TlmMeRouRo64q
@@ -5115,7 +5115,7 @@
 
 sub    0888B86856F9D71A
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBF2hcBkBCAC2H5WcFoeByKBUAjRDjmP+5P6FRsZjLe6c1wy7G1ha6/EQUVK4
 gZUZYE9W7l/4QKHvAu4PvFWdD+5FXGZuB/2kw348CtabAlJTehm1QlPt5//ODkxB
@@ -5143,7 +5143,7 @@
 sub    F2EA967B5B8FD0FC
 sub    F860F86A8AA8521B
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFolWewBCACurWoOCed1W8Ut0tmqkSTpaz1AvPrYvZxmNqSVbxGjd8S/Bpxm
 uypKQ/KIF88a8QbePYa6e/I9g8HiuA2Bg91T9khc1mztXvutkiFNaldecg2rFHZK
@@ -5201,7 +5201,7 @@
 
 sub    8B794AD8CE1926C6
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBF8LXXYBCACuy3HnrpWl7boi98G4wG1ZrhBiYImyfQd1M+dvH3GF3Vqt2NYv
 Nv8vryhUkMi8uu233KrYx2/kVK0RomMYWtUrSbQIdykytd0/VsoEk82ysN21ld9P
@@ -5230,7 +5230,7 @@
 
 sub    0190A8A50D88C2C9
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGNBF1wCjUBDADAQDQrGd1ul3QLVj5zbl72zNWVNsRVF98JLSXYMmxsY/A0YNzT
 B8LR58QCNF/xcjDyFt6+9jDEVjkKnJTHduzxddF/cQ9pw+0BOOwyfIkC2ryHzGUH
@@ -5265,7 +5265,7 @@
 pub    15C71C0A4E0B8EDD
 sub    891E4C2D471515FE
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBFcyNOoBEACj0zTN3GkRNAY3jihHZdGvi70i4R8mUfcQUwWGRsGGlzSwyJfe
 20qNOHqwHaxVCAIp4e5paNf9cEKepOv5IqMkmaRdiC2W+BHDxcJgBot/IrC81ube
@@ -5314,7 +5314,7 @@
 sub    D101F7899D41F3C3
 sub    E074D16EB6FF4DE3
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBFf0j5oBEADS6cItqCbf4lOLICohq2aHqM5I1jsz3DC4ddIU5ONbKXP1t0wk
 FEUPRzd6m80cTo7Q02Bw7enh4J6HvM5XVBSSGKENP6XAsiOZnY9nkXlcQAPFRnCn
@@ -5865,7 +5865,7 @@
 
 sub    EFE8086F9E93774E
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFPU8TIBCADGNvExYTJpVuNGCF9NuWw+IkitjAD7WzF7QkvFCSw9VftzgTUZ
 3PYrThRiaDdmHQAke4Sp+nYyAJ7iUcQqg/5/ONiMdzXEv5Kwy5WJN8+o2aXSunIT
@@ -5900,7 +5900,7 @@
 
 sub    5F6BA89D4B0869B9
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGNBF3TQCcBDAD177B+Btl8XBEkBQ5jFSezFrpEl4arwCEa7htCp6T3h55HvYwz
 P7Y9zWYXfhAC8XJlPQJYpqaQiiYtdlmOrOS4wbp5Lr+z/0XpFlJFzdKglxKYcdfP
@@ -5935,7 +5935,7 @@
 pub    1861C322C56014B2
 sub    9A347756830C4541
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGiBEGVK0ERBADwhGhmOMvSgvGaqHW3ial0NS80ZXyE1EeNL6ke/WrXHB4dT6if
 inoAuUgRz3v9Na4rjSQ8YVFjn3NaZq1i8RM2KJOUU8ZkJ2AsrH6fqStjofLTd5ng
@@ -5967,7 +5967,7 @@
 
 sub    D068F0D7B6A63980
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFHNxM8BCADYmt+HKkEwu89KQbwV7XIbgwZSfWc7y1HvA2YJpJRXJQsU/Pzv
 BhsHnm9ZIScBLIlgE5OUnMNz8ktPDdsFg3j/L0HREXOAqkOFxWx2kANsRo2HmkM3
@@ -5996,7 +5996,7 @@
 
 sub    A3F393B5D034A0A3
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBEzxj6sBCADGV4szLvjBwrAOKYWw3efASDI2yo5Aq4oevm9cUB4G9G/D/fuR
 XhodLaG2smZLd8sNafWTSbPHswsZtMAjHGzka9Uj4Ow0etl3+kTh0DE6Loezkj7s
@@ -6079,7 +6079,7 @@
 pub    1B2718089CE964B8
 sub    A182F48D9C2C0825
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQMuBE4CPoURCACWBMGV/j1pioJPWkD9K9NdeRvld8sBorFBZo99DF3mcJvrXo/t
 We7gmvcx2n/8P5lL27sYPuj6WSRgtVBlSMXllJm3NL3Hu/7XRILfJEKVeLLTdxc/
@@ -6123,7 +6123,7 @@
 sub    7999BEFBA1039E8B
 sub    A7E989B0634097AC
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBF3Ep5QBEADZfs6o1IpZbZ1qlBkoJ7oWL0vFCcdPUgF/PRFXWKlsuFHVVV/N
 oZF9SDiCJxfvsVXmI+IHTVMR2SszU2xDF2SlScRfZQwrLhBsDP9nv9N1eGIoA5Ny
@@ -6202,7 +6202,7 @@
 sub    C2148900BCD3C2AF
 sub    CFF46EE3C17E53E9
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGNBGBP58sBDADYRZmxLOkqrz0QZ/yESRpv7IeHGLqDE1a8QfFtFb14MJCLSAAS
 3nMD6Szi9mEjEqYdJURRcMjbUBhePgbhzGa3FYkjAB8lj6IKbu+ogCwVm1S8+caZ
@@ -6283,7 +6283,7 @@
 
 sub    B7D9C5C3EEC4A9A9
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFkyw7oBCACtGFos6g11ycruiWMuXwrE4+XbU85+1jR99AN5PcKjgXo/J3T9
 XaZLjJ+oTWCVgEHu5PTxAftbkq9+lmDAUEWZ1Q8dKrnVgBLsFNn+G2pcvVschorz
@@ -6312,7 +6312,7 @@
 
 sub    8DC6F3D0ABDBD017
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBFAJOeEBEACn8aGYTnhyLS9SNi+SAdRU+pMPiqxdpxDMZczVee50y3LiRnCX
 biWqZyhzuHZTccgV9IMYFwxD490BioH8M80escHrMh2C50FCFglVYsZQG93jYJJR
@@ -6368,7 +6368,7 @@
 
 sub    AD9CEBA0521B1945
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBEry8yoBEADnhvT3m/zzzuiUKyAeIfnN9CeN0ilQx4P0kFMhyZchRR4Ekb41
 iKw7tDL9q+g7xSo3yUT9dKjDWJ3yhDpdAhp6d4y8GAuWqlOu8CQdEHJOKK0yxTzX
@@ -6413,7 +6413,7 @@
 
 sub    B4A1D8D630480593
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBFI6WiwBEAD+kkswnsY8eaqvYkS+ZB5MJr7juWrv9Lw9OGsIXFlTvD1XK01c
 E8k4+uA2sOtaXQ5wTMdc5N3YzAXqFxplWuafQgEvhyTTq37M5YCxvtYEZy/EHQYT
@@ -6456,7 +6456,7 @@
 pub    218FA0F6A941A037
 sub    9FF24F51B06DCC19
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFjDR2UBCADDfzBacBg664xalF55ghVkhxxwLaTNUdvTJ9o0IH+cGTRj7EYr
 7QvLVa68PKigj0q7SVVwhPT7fzBLDosGjHef0UWap10ynqACBoAYSFocT9m3Www1
@@ -6484,7 +6484,7 @@
 
 sub    A98BD25BE464EA45
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBFxmwqABEADNTTxqFiBcLLQwARbc0bmPUlxFl0A0Di9dTycUEjn0wTGS2xgF
 dFxWomZd8R4b/lVb9jHf0r+AEul7U7sBoKinjwk0EuPDAZK5PEy3P8ILcAulwQqW
@@ -6529,7 +6529,7 @@
 
 sub    D658968EFD5E9F85
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQQNBFMPOkYBIACdXZi+34dvl+8q0IGIjLzFP7JvUH8ail4vrf2zwliW/QZskB/7
 pFXCpV2/hX+0n+kJz0eqenl1l/+lT6p0MQ1TMCtiMccnX7WseQM+xSv4ug82nAwa
@@ -6607,7 +6607,7 @@
 
 sub    BFE9E301CD277BAF
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFpqN94BCACaAb8Afmng1QPu5k5uzLoA1FJnF6Wf31ZU1FzDxHFHLNUYSWN2
 Bg6k95QH5ruZ+Z/QOJSoIB+b3htDklyxd8m+G2KsMIqnQs0BaTN18hb3PFyMIknM
@@ -6636,7 +6636,7 @@
 
 sub    EDB3D937B0C94C3E
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGiBDwczzwRBADyR8BVt1SUMHxjSG1AAekABO0YQHJG/XwEHYk7zPH3aU14/ocf
 g6M8gxZXumM2f3oCCkmOpnW6uKxqTclQX44GyaMDETcAU5/bjWenWNj4INDlTjFS
@@ -6668,7 +6668,7 @@
 
 sub    B4E75C15C3C701AE
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFPsGJIBCADOxQoTLxpZVRIbLaRfsHa2y/TEIGvxLP7TgqTwspZYnwBd0cOW
 OHAvF8yGfdk5gvkGTlQ/xchwu2Ix05FO2c+fBoOgIG1Gn2Q+PwheZklS7S+V+GFk
@@ -6694,7 +6694,7 @@
 
 pub    280D66A55F5316C5
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFOOGVgBCACiDwUZOc6943aBGUrxikkfUnsyZfHtF9jihYmA1pSgfsye+JxR
 oG9QWW9+3qx4L/d4ZEqBftTWpsjyrY7NyMaeXtJEjE0vhiWNehgXB1z4XTJ66zCX
@@ -6708,7 +6708,7 @@
 pub    29579F18FA8FD93B
 sub    9DF7F2349731D55B
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFYFiMABCADYpblWssqGxbjTwsyroPh48BwdSKl59zbFKoEHDw87NeWq7fik
 h95RkbdeWsQSvduXWgQZsUDq9cLOkuS/ChAMkAAd3MPp1NMdFmAqS7BX5wU5s5I7
@@ -6736,7 +6736,7 @@
 
 sub    D95ECEC170500D9F
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGNBFsHC7gBDADlkoJglNVbX9MShcAm6jvS5atCZwWT63gSasObXFxswsJQd1NK
 qryHNcj9tKBfLbSpMOoHeyyIKDdwdxN+6+N9Hi4hf0j1Ub6deJyI8ace8VERWaxF
@@ -6773,7 +6773,7 @@
 
 sub    74C249541619FF0B
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQMuBGJIi4URCADFspeHyziASBuPXpLpikWjmC3D6VtTaDT17ogOyGLf6/sjsQUz
 0KS3PzWBuPoqRGRpTtZxJ5yr10apr8mJF9Po5LFkrtcexaiYmUWAZAik894OhKt1
@@ -6815,7 +6815,7 @@
 
 sub    673B436865B87E35
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBGKVyb8BEAC+qG+3tDrZkCJlJwiU72OrX/R+cKQ8Jvp2lzwgJg2Sw/S0xXAz
 KqoxvfkcM/egEWbxUsbuYVVXlAuGwTJeg8QtiuqIVXyoEEmUoWIqjOsCcNDbQ8Of
@@ -6859,7 +6859,7 @@
 pub    2BE5D98F751F4136
 sub    C7FDDD147FA73F44
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBEwMV84BCAD0u42clJ3hghKlMGwFA8PPlPgSEZjyvs2dRCF+dKWBaPUnR88K
 kGfWB66jX6PBtHzeiVRa078lL002S1lSth2A+s1UfYGS5wVbE938wO6PCMwgoXJ6
@@ -6885,7 +6885,7 @@
 pub    2C7B12F2A511E325
 sub    10DA72CD7FBFA159
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBE+ZO+EBCAC3fZOOuYKthr0GcUge0PH2bh18sbM9XUmPKQz/W15l1NA/2ARS
 2gUXM0R+SunMlun9KsqjnojJ2ObVPvbm1Hg/66JSRgR3JWfIpSlJxLicpfu8rCfN
@@ -6911,7 +6911,7 @@
 pub    2D0E1FB8FE4B68B4
 sub    FCF74AFDF5947ABA
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBFYVT4EBEACqm1qKc6Twp2Iw0tjUqr3hrZ7mjZMWg5MemH9ZiQ9iVIqV4Lee
 KmgjVWk5jnTslriymDilDIMk0YaT67JokhgSdqMIavI29tJ6quOp0K7Rj/rNBc6p
@@ -6953,7 +6953,7 @@
 pub    2E2010F8A7FF4A41
 sub    E4D15F24364C7906
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGiBEnOgPURBADYutfvXAtNgf67BQ2gWTI6+nKfILIwMPzCbQPMd7pykzF5nPMu
 Nswt3E7efo5IP1Zsv6DRrLafAW0OJSmL/oo8/ta0AfqcxCCbJ6CUyViifRZ5T4nU
@@ -6985,7 +6985,7 @@
 
 sub    C4725C965E0455E9
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFPSiQsBCADcgBiaKkIG5jVFbQ0NyG//y18S84/OT1X1I82OwtTryxNqxT9A
 q6HuTJqRPi5Qd0BwmQB6dG0mug9AEp58L8W5udiDysHeUvBKY6zTOprSSFvFg/Y8
@@ -7012,7 +7012,7 @@
 pub    30E6F80434A72A7F
 sub    C30F4CB428DDFC28
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGiBEaNL+QRBACYhfwZdDNXVeU9G5/XsxrUgQGKkhfOaB1CyPHAd02Jyc5oHR0a
 nu7dHb6QBlY8b47pX8ii+uTCOX2yyFlJt2cuKYqN1TwHrMspDTC9K1x8WJMmKdM5
@@ -7044,7 +7044,7 @@
 
 sub    D79E291A1BF549DC
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBFZ1ptUBEADVzx4LjDmWHK4gY03VBGRh/A+1CAjwdDtcrHPnoFYCYC0uoe8m
 z/iESYlAHRqVo0nMItZgjqGTPD6GhQvJn/fzXTjIpYIDLZgPMXxImHCSRAFnduI6
@@ -7089,7 +7089,7 @@
 
 sub    5CE9BCD2ED28F793
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGNBF0vfHYBDADEDPY9ub98c7jQe4yMbPke3A/sxNHnn0WuA9JN880DPs3L7lrv
 9VHTOlFXslDNBPYSbgFXH5YlMGg8ZY8bhngjc+Z3dtrCX1cAjUXOnibi7fBFomLB
@@ -7126,7 +7126,7 @@
 
 sub    7494750BDF4F8FAE
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBE1/v9YBCADaUiBecDzwU5g9Gmn3T9pAa17OlUl2iH0zn8tNTUg++bW/A9m3
 lWykQBlvPOi32lqZ5q7yewSNBGHl/pHRRVsIE6hhkVigNQbMztRFPshKCU/0RvKu
@@ -7155,7 +7155,7 @@
 
 sub    B8EB751F2C19011D
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGNBGA2h7oBDADtWcow8HEnabHf+poCBJR+MG8JybFpgOQ5ns1e6b3xnD51kzqv
 0I1orkmIfhCVU4nPGp2jy0JHQUvf3NDIDobt/O/C7+3BvNanfw7sJeHXrCy90o3I
@@ -7192,7 +7192,7 @@
 
 sub    FE694B892910DD22
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBErygmoBEADbs8zVUn5ZwbsG3tqT4x6U7SZYOtd3WXOtHjuu9Cyp74rZ19Pi
 XNbYwIAoCgOI/nXVWwuOrNJH0pHaQ73slbNzLxo2ahQIkw9PbK4V3YXLai1r/W6T
@@ -7232,10 +7232,47 @@
 =n4Zz
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    36AB7ACFFF2027B1
+uid    krzema12 (Piotr Krzeminski) <sonatype@krzeminski.it>
+
+sub    958D552911BCFB32
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGNBGBM2rMBDAC/vuwIsVD0yQhNK5GF6eFRSxQxfG/XPXBQldx/+xTJaUtuItZe
+qxBTjmkwDP8m8jMm4iNtjHNOyfbN698nRC7QRRIheAw6MvqcTJNw+6WJku2vsxh4
+jceeGogIgAXRVQmOGApcLkD1+tYxbTcSU7wXrD8dxspAy14Fh1ZmyxhmhrbhxdKp
+4Z5rQPnQdDmzu/CuaN7qQyz5JDcwql5DGvXbbBVxBdYb34rkF2WvxZMEMuHIYoLP
+BWcHWsmNrY07+46O6oudiKk0f6mIyMbHbqAyskarmeXUQrWPMmHT7Ni6KDANRZLB
+m49VJV/3mYpmIZZq4QmWrIM/kg2lw94nwtn1WCseeH4kt2TSB1UX0FnukRYVoSM4
+d2SwDoBsW/HedO8A4nlNCYqrURTLkcgoy1EyegdlmRn2q/FAnCIUjjm4hIeoy2vk
+QeaaQg7lCljHAZtvzWjtN7WBRG34XwNGAXiBXdITeMo335tzqxruDCKGdkRnWFIF
+URf4O+WsZ3cc/kcAEQEAAbQ0a3J6ZW1hMTIgKFBpb3RyIEtyemVtaW5za2kpIDxz
+b25hdHlwZUBrcnplbWluc2tpLml0PrkBjQRgTNqzAQwArw0OrUg0it4NxA4JqEQ3
+Y4cVwc9FPSpCpR79k+CUXPmmrwlO35Q2VvZ/nxGYL4M1CnLfrt46nnylUL+oX5Gy
+dAu2cyqCL1rH3OLrk+q0KEexkulWhLJfaOUXV3PZBkYoFRleZHvFn8Qfhlo7eK67
+LQ6vWLTBCqWwNbE5kbmZTiwBLkL0ajZOXP4rMP0o3aBkiMj0Qiq5DEzrYjpjGtUm
+CZZwf4X9c86tkbSS+i/VgHQfR7MUwg2zXswJu/t8cc+PPW7qpyfmyRhnKBFK4DqH
+PsqDVFAnWUqyV+Mp51wiUbTH8AvlKCk+xNAGhNH93/m2pBWLHjDFQFNwqiTwLdj7
+OVLaokE4kjRXYow7TrjbeSfY4VI1ZWkIFw5MdDQ4VnzRS7lRGPn3Y9Ortpu0wRFR
+gygnRF75AWqBtoqSjtsdUL2X2kx8UleOE0NAVF7MwdlsUruBbnh/TFcudJFjAEdU
+YmfJhoL2PyUpsK2itHZTArXFLooEwRCQGWWxUYqFZ7NzABEBAAGJAbYEGAEKACAW
+IQSCR/iJM8LVb4MK9zQ2q3rP/yAnsQUCYEzaswIbDAAKCRA2q3rP/yAnsf/qC/wO
+Ou/ZIQGNZe7ebemklst9m2PHngB9TGljixu3M8QHhDaH1eIYOhzhMMNwtJQmDBHy
+EWuYurwEJVV62vgyl2/S7SmxXDE7Kp4DRuwJAvMI08vCKLNpwHBp2HogCON6nVAv
+BOedrDhFNfeBXMx5Ig5CPcGb3DWBKCnZiebtyRMQyXq9z0wC9ArS6FNmzXOfZgBA
+xSAuoIgGOHBOF6nOQAoQdAqHpIKJWa0kvBEyRU5vzTJHwVCNtrCDMtgfgYWXouVs
+cljqKyXTSeO0wdiIfDelnZXS0gU3kNgxW8kFumlHiubOnzn8ClLdL8piGFxOXbcm
+cMWh0+SndYzZ9SbnUbUKEbR7GDH39uqrZ8r3YugBwwUut71uWtu6EEhvLAS+jRo7
+qKx+doc5xpCPMyHPpo539DTLeowcp5O/tdkaqypfeSPf+ZOzLWBbMj9zsq48mSWV
+4NzrdvDj2rIvs02a2YMsdpNyt/kQbDbZiOrPuFWwdIw7pNuwCpt66Zu3V6d9dCQ=
+=B5lt
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    36D4E9618F3ADAB5
 sub    C4935FA8AC763C70
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGNBGGiftwBDAC94Yhhh/5yO8jYFkg01MPnooXKZEPwxAbAg9wn5iM0tHxhEpkU
 zJVYZ+JYq013+Ldp8Of7A/d6hKTtZ0xwSeY7S/WFykIk6tc0P5j0sfFS3pGPDk+W
@@ -7269,7 +7306,7 @@
 pub    379CE192D401AB61
 sub    0CFE993CDBE1D0A2
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBFTi8JIBEACcN1ucQ1uCOZ1owTELQV/6i4q7NbYdJ5wf7yPYfEugSo3yfbo3
 Pw/XEvlnpDZmT155sGNOkteZtZMdcm5XhFbdtquLlrkjAcUGatq5rAt3eLAlvU7u
@@ -7313,7 +7350,7 @@
 
 sub    D908A43FB7EC07AC
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBFu07rsBEADYizNlY0FYNZ6q2wx7AmWLw6PHje55uFhYM8Saqtwg/rm1tl78
 j28E/coP2zMFf/ec+zqKsfYi4DMmLZ9ESIngMUOIE7mY0Pp4WN7oYFRtvU0ARWyp
@@ -7370,7 +7407,7 @@
 
 sub    9B2A1B698A113AAD
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBFzwo60BEACg1rgL5jUtKkFE5DiwqJwxzJyJDH00TBSN6ZT+nXh1UxgC9q2h
 olF9V+2+LV1Jcmnc946xzIMiWLG33QB0NKVCdU5jNuLahOcViQQjNfGXwNzYoNCR
@@ -7413,7 +7450,7 @@
 pub    3C0A8F4744F37328
 sub    D17266C6E05F9993
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFSQ6LEBCADnoAfQsg2uDYMnEPqt7tlnZxzyLVKiHXdJzT6OHA0FUdsB9H/9
 vWI863v20dsk4+tf1pXLa1AWBusInf7FM1JBCQBc/By3fR3JRhJU0QSoEcwtOQSa
@@ -7439,7 +7476,7 @@
 pub    3C27D97B0C83A85C
 sub    4BC7B9A81C39EBA0
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGNBGEdX1MBDACuRDzoPMh3CyUHQydFo363R6OdXqMZ8mJQMdysIJCXOXZGRwUC
 uyPOUfH6uSG24RU2zvD72D2SGAehQKLXLQeN6XCt9PRAszP18dJADm10xgkXJm+G
@@ -7475,7 +7512,7 @@
 
 sub    575D6C921D84AC76
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBGL4BxIBEAC+lX44fd/zrVQPzdKygarBd/X0bBpGakT++Kfk4UBGl3q+wd2G
 R9puB9R377ds8hU7U3To8sHguUZo6DbD9Gb/is/WajSb9g92z+rMow3KbqfCYqWr
@@ -7521,7 +7558,7 @@
 
 sub    7ECD484BE871E4BC
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFhV2aoBCACyHcEuTUn5nVo1ODvWvgBgV8b6Aju4cVAhMNIvAdcOYf+N9Rgo
 Y/669/P371uN2hc4SxJeORBjHyzkAX2sJZQj+FwdvGl60YX9Zv/NQaTzC1WFMRp2
@@ -7549,7 +7586,7 @@
 
 sub    6B7EF7B18190F4A9
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBF2KLsIBEADgVw/j0Loslv+pBDEfYemeObeKCWBhEdAiGznT23XFb4eOa4oL
 Yk8FTL5SYV+Ylm5Pv4zUGV1JUggzb4mS5+/k0kl2OHzZpJTLz45E9Qe4KI5vk6jT
@@ -7592,7 +7629,7 @@
 pub    3F36885C24DF4B75
 sub    97859F2FE8EAEB26
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFmfSwYBCADdZEuR8cs2ejLLW3+Glxiq15rVbHbxaWmmZApGNijFro/LzFrR
 z+99N1mnA5+Ar/yKmn8lsCiTWukGQzWbdH/QSRUdyHtzxbCSeONdMhdKl3sJY1h2
@@ -7618,7 +7655,7 @@
 pub    3FAAD2CD5ECBB314
 sub    3260CB2DEF74135B
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBFhqdSMBEACmveOOsQrTky8b5M+Cq6lbhqRB4+INnfigxr7+EMpswo4AxYuA
 Op/YG+G7NU5h6EK6Tj2dVfXga90GYFkehtFRZgOUJUGKPU/53upsbnsWS8qjJD8g
@@ -7662,7 +7699,7 @@
 
 sub    C0B9C2CC3DD97C16
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBE5zrtcBCADFfU0ugIGUCM44fqPJKrsB3TaDu5EpauvFfYqUfyookzMHSKtB
 4YqBSKzBEiZ1rFB/KCn7XJTh5epoCau4DsG4U0XZjsx+esDR4ZtL42LEzeMTuluV
@@ -7691,7 +7728,7 @@
 
 sub    01F3A913FB698736
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFLmWO0BCADfxkkFnwj5uOALP07g8yArQpu6zbNr+5dtDvJe8Y51V1leb74U
 Eh4U1IeosCRdKUCg0XlAjDmjrUkG6W/5AMUZM676JVHL5tVG1F+dsKhCrFOZoMHj
@@ -7721,7 +7758,7 @@
 
 sub    47624A56526BF2F2
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFAZ8yMBCAD+elPZR4dx7RHLErbQadUXmxxh15JTZ7A/OmARW0ZA1kbkRven
 4b3rXQKtWhZqxHh9Vb1FMgOnrbOi9984J3REJzLWEFM+REB6GJ3/ZAQvaAmrjDtV
@@ -7750,7 +7787,7 @@
 
 sub    8A57131A07E0911E
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBGB980QBEADLBOfY981RbUf7zI9AoXcxGignXkYbeSvxIMML9vAbnhmuHwa6
 h+81ZTY2XK7Rz211y129YidPykkiLX9mY+OWvJsj7dTyVTcIm6MU5ETDvovfmKWg
@@ -7795,7 +7832,7 @@
 
 sub    1364C5E2DF3E99C5
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBF1Vn08BEADgfOupXhJxyb3t1kzDNa595spJptjF5ViyXuEJtlMQlmobPP9L
 2gZH83gNe7Ro1TsLesgWTtin3hGANSKITdi/wVH4ET6lPInv1k/8hXe0zlF11Zmi
@@ -7840,7 +7877,7 @@
 
 sub    2C8E4A350000730C
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBFQMn6cBEACn5RegEd6pYnrIwFMpf/SKP1aIp+rF657o4zP2eQtCyU2Kxiyd
 VXyvUqIN9kv8exnNUOHnjQzUyVFmcaYaQTxf6D+DVkSlusHk4yq+6I4K7g42Ghvw
@@ -7883,7 +7920,7 @@
 pub    44CE7BF2825EA2CD
 sub    E01173141D06B1BF
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBEzQQMUBCACbwbw7tuTWgwPsDAdQTWGO355jP75oBLHwGgEwV+OCKtxkNXNw
 wrJqXst83vmD1dEJyHflQww+d+Olj90IefQGfR+K7O005C2nky7eNGIomxaP52Y/
@@ -7910,7 +7947,7 @@
 sub    8067ECAA8D58321C
 sub    750F9A735EECF640
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBFkgff4BEADQW10I1gEirYflEkNU9ukvBD/UFzsNxtKKxiDB58O1j9/o8bJN
 uM56B/skfFg1V4Gkpmnf9sJyakI8jHIvZ720dPHB8nVRBKV+sUD7hoI2QYVJMJMV
@@ -7977,7 +8014,7 @@
 
 sub    D74B959DFA1D84F2
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFkW7RoBCAC7NMtr/e27nrUuIcEZEJBZS3TbZYId80UNQXgYmqPhy/sfCyMc
 87eKzOalauwLbr5+VGuKqhvKrihV1WCt2+FUjOtnCf1GutpAUH9plfSs8IpRog0h
@@ -8006,7 +8043,7 @@
 
 sub    4CE6E05D128BCFAD
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFE0soEBCADAy/iIRT/lpb+vfDjWs/k1XQNU3mzXoMm1mmS/Z8VOc0jF7sVB
 A5z2pC6u2OmEr1oJkhWefX+mU//7kXs6VvUCReE4uheGBlisg/ELEXkTm342TcwS
@@ -8035,7 +8072,7 @@
 
 sub    868FF6CCEF26A83C
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBF5CDMYBCADC1/aWU6ZbGZEphRbmjUPNfqh3N5goSnDCou97mmQ9Uq8iBuKS
 UXJnGSOHudXK56f+Drx5lGZdLAzveZdqaqb1o3yLFO3PJxwj3Ulhab3O3uTG2eR0
@@ -8064,7 +8101,7 @@
 
 sub    FCB1A11865F6A17A
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFVB0KABCAC8YRgcTIomAMw865DHxS/tbFgqN9i7M+tgpih1ETJbb4enhIBj
 Upeq+MoFCtxN86zGu2gsA4DOMEXVCReJ4O5n0F8E03+NUraCnJjbXLW9eEyRQRaU
@@ -8093,7 +8130,7 @@
 
 sub    3EA98BD451E4B457
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBF36fYEBCADU+1b8TH2AhJuJXebg5D3UbR9rk8/9kEfiF7ifbb3nCB9tnF5M
 7NnNocEdAq3XezNuSj9LtEpWUu6P4JdpXcfZiQO6wrobzSJRUWDc7X8D8NyhGpd8
@@ -8122,7 +8159,7 @@
 
 sub    726F4E5C34CFD750
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGNBF8QwXwBDADKNLAHhjWUqnLYiO+ws3Hy1du6tMvkR3nfsnIDqpCvSjb+3/rI
 OHSyq8TbaGLLuHOM4K/KvrKgjhTbXQxvx1WR5IpoylcINzI959yAbaywBj6gVQB3
@@ -8159,7 +8196,7 @@
 
 sub    5686B45C142551D3
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBF1EtnUBCAChtyYd/4eMAxTz5DVmO+8QOrTA1cf9bprQhtXD5pVbw8/IGKN+
 EqXmvt7AGy+4O633g7ec5iyirwCfEP+4YDv8k1LOvY9C5+tOwfK+FxAPRVc1AAB5
@@ -8188,7 +8225,7 @@
 
 sub    A568CCD291175902
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFUpCooBCACj6t0qOEGqMpX3puhk5W1TXZ1ewSXPS1yaoiFD2rysxjVWmXxG
 wvon31ed6PaZqtv+CUCIjbCjJN50dQF6g1I4FLvDcpF8LuLGriYtFW43lJ/GW//G
@@ -8218,7 +8255,7 @@
 
 sub    25EB2A6CB1459233
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFBm+zUBCACsrBpO6mOsZ/B6PdPPV/Hj87m2GHeEYEHt2o2l8X2BdbZKbVW1
 FIKnpYe3+TsFCe/qNxlR6vk0Jpy3ChD3nW/J0rmU0ju1SZnS7rdSMj3AI5M5xxpy
@@ -8247,7 +8284,7 @@
 
 sub    BE0F021FCB5F68A0
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGNBGBFmccBDADIusjFY82nMHFXYxY1b5eIWtyaXTQxv/bXfjR2Yb16dURgFjai
 OeuYzapF7vVqNV8/H7Sya0W9z4OWf0ZttWhtQFcmhF90586OArXEikKcFgO8EL+l
@@ -8281,7 +8318,7 @@
 
 pub    55C7E5E701832382
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mI0EVdDLQQEEAJMtYCaTA56YsP5RzQzPvqVTaR2nZ27qRk36blHB9WmXK+NHpGeH
 PHgq59mLPVueo2/M5k/fFrCe36jHePP31gYpFtueeYDfsofHwod0WhsHyC7JfG8d
@@ -8294,7 +8331,7 @@
 sub    D89D05374952262B
 sub    B5681E477AD61C38
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGNBF+7lwIBDACcXIXAwFDoWvCCWn+OImyyJQvSnnte93Mc1ZJtlArkrjeGU7Mu
 5giUH+FOyiXlj7CU4G9RTnAzDgM8XPncWOERgRG2dXtO03Li7iUEX4Z8PCUGsTxP
@@ -8372,7 +8409,7 @@
 
 pub    571A5291E827E1C7
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGiBE9iFawRBACJb4OMk3zqMDNvSJKYZ8fGYrPq7yCcf/ykKDkGb2dtPnAZGkSp
 3mmNlTsU6s9ARn7BtkhIuM5TdbLs+z+okX62h3F0WW3h+CpfIXyKSgl7uWbhZ5G8
@@ -8389,7 +8426,7 @@
 pub    5796E91EE6619C69
 sub    153E7A3C2B4E5118
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBFri3Q8BEAC90D8TTu6C05m/eq6HbU8gOHFc+2VJriVmnoyODTlEk/LAsT6h
 BRok7nzY0LpNUzUREjJy/w80YTOjLs25IFhnqA6mq8BGLjFwjhBPA4piCyhW/Elh
@@ -8444,7 +8481,7 @@
 
 sub    2E74CACB6918A897
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGiBE1VSkkRBACkCgvt26sMi+0X+EOJDMqdK0Sziy06k47LJf1jOg4tTZ2T9QtP
 OZ8fD+va/O5+q8Kna993jzcO5n0Nv+R/K3+MvUqSmdITshCIjBt3cC0n6FWndGyl
@@ -8477,7 +8514,7 @@
 
 sub    92BD2D0B5B21ABA2
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFUBG7QBCADRWXf0Fw05qRhM4cRnGKlOW1ecue1DCxHAtFwoqmAXyTCO+tI0
 MEW5SyXUkX6FsWLl6A2y+KgOs669ogzfQ0rnZMEt4HisRp8wpgk3GWR1/9aKYz/c
@@ -8505,7 +8542,7 @@
 
 sub    990B862E2E89C087
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBGGugdABCACl8r69cybA9Xv4mVUXH2UErQutkOsCxXJCb6KcL5Ucn7+0RGxc
 PRdw+sw2VBJsBctdUeCvNA6o1126O0gSgbQPTojvdyYtq4J9OAjS11RoiiQ269Zc
@@ -8534,7 +8571,7 @@
 
 sub    8857595B73BFD468
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mDMEYuRVGhYJKwYBBAHaRw8BAQdA2Dp4m1Yhtb1g94pQzzL24FuP6b9KXF8lP9Dh
 hZnynhe0M1Rhcm8gTC4gU2FpdG8gKEZvciBHaXRIdWIgQWN0aW9ucykgPGxlb0B4
@@ -8550,7 +8587,7 @@
 
 sub    4E5C59DBFF7DACF9
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBGPcwwABEADTw/gqmHh4LTSDsBP0KMoXFtFQnv7xmVPPrPjt0NxGn3w2WIou
 7UaLUTViKkgm92h72gyM7N9JfNBLcYrqVf9ed75MPdGQgzIhkVg3SLWZGFoIQUJ4
@@ -8594,7 +8631,7 @@
 pub    5B05CCDE140C2876
 sub    9D29AE4A6B50E01F
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQMuBEwVZOURCADNnKQzSjFuI9/IGj3WTJcPU2B/H8NbZaTsz5WE91WumgZulK2q
 YeD4u6zdOyFK7DEScgxk7dicox9cNEgYKQnQXctDhfqER9bnvA2iJ+AFxjRAWyvs
@@ -8633,7 +8670,7 @@
 pub    5D67BFFCBA1F9A39
 sub    DBE749136BF76809
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFUHdtcBCAC5xFdAcSc5qQsPkujcRdzeldrESZBo1/SfGwFV0T+lgp99QJuI
 LDwZ1OEG/lQck59J0JRdAgxlUj1um5LzNYexIJSdxRz2DffQ/z9R+hw4DF2h0fyP
@@ -8661,7 +8698,7 @@
 
 sub    A7CC6488427379A4
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFgRFtYBCADud9fmvTI8Dbs+9GcZUIVzxkL84QYHSDxI9fF+sxfAviq1U+YJ
 a+ZLIW7HsXx8vpn3hqIqAbDxHjrb6MEJ3OWD5Ks7O9Lq7HOhtqAT/mpV3fZmf6pF
@@ -8689,7 +8726,7 @@
 uid    Sebastiano Vigna <vigna@di.unimi.it>
 
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFijpzMBCACxAT3jijwXbI6b7LIF/k8oSGyM8ZNJpb6AQvPqKIqCzxNFXzow
 EBCasKMhIWgGy+293Tpt/DY4btJie4u+igMBS86iXrF8CUnOLPgTlAIyil/oREGJ
@@ -8706,7 +8743,7 @@
 
 sub    91A4BA316974A467
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGNBGHvIbQBDACpPdbz5UIVIWR4cfXyyZEMOG0ayCzJQPsT4eq8XR0o5Y9egfAq
 dRXC8paInsaF/iVL8BJY6CNq4B3dUfJwKDcJiCiPbiQgknqF1HDBqQtCb4akW8f4
@@ -8741,7 +8778,7 @@
 pub    5ED22F661BBF0ACC
 sub    31ADCD8BFCB760B4
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGiBExyNhsRBAC/W5cMapoP7NUn8S22iWG5bPw0bconApJHP4kQdT17gT2JgNJz
 BmuGWV59ZOGQkc6woeFKc1s6twlsgIL51jMeVOtgLJRGTS4So2hthNqDcgO4j8Lm
@@ -8773,7 +8810,7 @@
 
 sub    0440006D577EAE4B
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBE7JURcBCADO+9Dc4/JnB+wX+fq+Fr2zUGSPOT6/qjE5kXL4FEbJKsqDSAKG
 VnbtRrsIUdmNIFQmz71bBDFhRBbrSrkz927k8eUPhYtxE2NmmWSuKgrjF4qviPQv
@@ -8802,7 +8839,7 @@
 
 sub    73F7734B17EC71F4
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBGEVsM0BEADiZwFLiyjeOLeGS0jAso0pOwUigT9PpwQq7JFAuJP2i9C4Eunc
 J2HWRdMhnAY12C2MVetSwhI/4QID+rIreB7ooC4xv8sz1PIC30t2oSYtXF4w5DYh
@@ -8847,7 +8884,7 @@
 
 sub    FD2D3AEF63B97A64
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGNBF/kpOgBDADKuK/xrCb39AAmyzVkFTP03ZNCAVhDnmx/1bSHTwvXFWQ2topE
 IgqlMpKmjuEH03gfOP2ibbgeJ3WOJcijqfeHNZ7wGDcslbKOnFVrcN7DuJx9LDYc
@@ -8882,7 +8919,7 @@
 pub    62C82E50836EB3EE
 sub    2AC7BF2F3349DE80
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBFeOGY0BEADIr99yL4ahwgM3KB7zMVzDk/PEkzUWpm1BSxqUxuQtzWArFj13
 Y3Zi6g1tw5jKESfxtmpXx7j7xR3qVdJbsYJMU0zQi+FehwnKox3Go3UnIKt7kydz
@@ -8926,7 +8963,7 @@
 
 sub    D547B4A01F74AC1E
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBE3XFIUBCADcj1zw8m1evCgEMqxgOfl6L8y1tsYWsX7tVPvHEkYlXHrdcpkB
 fGuWPrauvhBmB9sBkFfxzU98Ilz3Xk9pfISYiaMUk9Mk1ZxsCoYPVhxvOSvk5LgS
@@ -8954,7 +8991,7 @@
 sub    D3DBC823BE4819ED
 sub    0162FE0CF6E18BD4
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBE7sdQQBEACsLaqrIiSlsJIWpalL9i+i6x8Yg6l+bw8qaH/i7kjZKFLf6Xrq
 PFHo9dpF3LPOguvPLP5fs04KIShl0IhJuArSxvwfH8GnqPAaM0TZpfJQ9uqAcvxk
@@ -9033,7 +9070,7 @@
 
 sub    1E8F1D57A4450BCB
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFbqsT0BCADwERe1Rc9qNWwXOvwZHsjauVDy0TpqNVY8I3S+OYm4rX1dkjyh
 +6bTEH1ys6bKevvR+PLhYzTGKboHnMT0RIINY/DQQSzHr/GRyCiiRlRvULbt9Fnz
@@ -9062,7 +9099,7 @@
 
 sub    DCF4B49B4D5845D2
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGiBEmhev8RBACz56FVQ9l701+PE7Nr6+6Lsoy5tK6wmV89pEvUDgDjT0VTs4EI
 dupAk4a0dLn8Lu87AloEYuSzbCxv5cH5vyDcvLDK6g3/sRC1LPQPydD+UlCvG8LI
@@ -9095,7 +9132,7 @@
 
 sub    0AC07D0BBD11498C
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGNBGBVUWMBDACXALXWXSrB2V95lR1L+i+sQsTQt8tCIgX0iX9UZ7Vw2K/lLnLw
 WYtM3oTxYox4OdgkK9tK6771EdCH5wQtRdUQJjlsBfZDPMiGqmh1jrAxAugEkFyC
@@ -9129,7 +9166,7 @@
 
 pub    66B50994442D2D40
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBGDoYisBEACqUDZnT4h6ma6XIzdC6KR++uDbR2VKdhCuv0Og/sHEKkm6ZbG0
 OFB8tAaQx/WlsoQyf3DlLfUEOGDai875Aqor3fbM+E1hrZbQNfsOySKEE52k7PYe
@@ -9150,7 +9187,7 @@
 
 sub    A1766BE5F812AC2E
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mJMEYvEGpBMFK4EEACMEIwQA6knc/2gtbqDhPh5EzrymR4Hwi1Xf2S0aqMopA1zg
 IeZzBgSfL+4fEfpXL4eAzvrk29jIXSizDEOgFpw3PW3Om1gASxub4Jo6EQrRgOdd
@@ -9171,7 +9208,7 @@
 
 sub    CA7AE93399B1ED99
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFqHCi8BCACgRpCaVCiJ2MccCN01SbHYowmM255nSYKOnfItBmXYAMtc4rL9
 n1y1qFtc4LBbkIrPH8CO2zpEImUTZel4W93BQkluPOO3EX/hLCTCFfXrO89L1u4V
@@ -9200,7 +9237,7 @@
 
 sub    C0058C509A81C102
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGNBGAofm8BDADhvXfCdHebhi2I1nd+n+1cTk0Kfv8bq4BQ1T2O85XlFpp1jaIR
 70GAm2MOt8+eEXt/TuPkVBWnJovDpBbkUfYWxSIpPxJzcxWV+4WJi/25fBOq2EuP
@@ -9237,7 +9274,7 @@
 
 sub    4083687620E57086
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFfAYzkBCADRFsmQXLC6UbFNjCKrwy+AwiMNUchJdsPkbFrvueWKq0nPB6Rh
 D2YGNdCdLlkeybHHaSjYi/Xdxv7Vgfp4d32tzoqQJe8Q8oYYW7KbTkfzwH7TNLcw
@@ -9267,7 +9304,7 @@
 sub    EA8543C570FAF804
 sub    CA890A5FA09CFD80
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBFgMcBMBEAC/xcIVVOOh+F7S0OTzBlFH34s5fDbi6Zto469tZyW1peyWtXAZ
 m+2jzFfeTCHaUQO3YjoTy2fPygS4tVD+ew4EAzMG5Uti4kwWZw0PYKz2JO/gl1JY
@@ -9333,7 +9370,7 @@
 pub    6A97BB242496B68A
 sub    374A2ECC99F4A7A0
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGNBGK88f8BDACqAfnTaZazrzbO9vM+3nAdmcW1QR84zwUKneFML/I45kihIW2t
 zhcx5JIwl7gK6q9kzRGClMCkSGhq0y9Q8UGR+wAmLJ8bexS998c3rtFfg2/c1zBC
@@ -9369,7 +9406,7 @@
 
 sub    FA6831EE37606774
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFTDM4oBCAC9cUMAjkP1dD7tt0JUI5kVORKagn4/zG6+Y2MUwGgJs481xsFC
 jXPuNZMucAVtXmw5Sl7FbsfSxR/9jJ2pnbXL918eRFbUqY4LnuOTZjcgNWo8PWPc
@@ -9396,7 +9433,7 @@
 pub    6CCC36CC6C69FC17
 sub    C694465FAACEE66F
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBEtrDFABCADLXGAhjPxdh+naC6XU5kficZYEVAURNRa8MTnaMKr+31v2zcAk
 nyqyjihcXGQBCeaNsz2mQkc/MrKdnFNVSwp715JcmcqDJGfR9aIDMUs9PvoNkkqv
@@ -9422,7 +9459,7 @@
 pub    6ED0F678B90EB06E
 sub    3605922A9B0C4A82
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFTCZ/YBCAC/AX5Uve8E97kKLWumtArjcouxHzENzNez3/wjiuIdCTchm/G6
 fUKHNTqo9sdcnvAO4mfJbysXh1tqXl6zxjw1QdQGCyy8klGRlpEiper0eS5heDhV
@@ -9457,7 +9494,7 @@
 
 sub    E2F840B227D3C024
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBF2ClL8BCADs2bbaF1ZMiMkTUUb59NTlyAbOOVWoIh7cnKeNjMWBUTP0kLFI
 XpoKiyccQLP4rFdbP2yI6h+LJR0Kj/lJmKpCaAooNlooxfIyPUX5TMvDTRutzwBO
@@ -9484,7 +9521,7 @@
 pub    72385FF0AF338D52
 sub    458AAC45B5189772
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBEr8kngBEACvK2oDnKTCGQWUEMxCgQPYTTaWVHzaRFZCn8po/DnKMh8llPuU
 GRdi5O7ChLjsg7qlNJKhi//ZoSnNBdPfT7EGNaKxUO13BVNBvXDiNNbUTWGBY2W7
@@ -9526,7 +9563,7 @@
 pub    7457CA33C3CE9E15
 sub    ABE9F3126BB741C1
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFIXyRQBCADe285y3Pu7KzoKyP6wqeNXtvvuwMatAmPm5x/i+S8MlryqzsYa
 x6twUmXV1yKjjtGrO+9fHvTOWBfSSP+fP9KTaTQYSasoJq2Mw4cQDy1i0zrxNZUw
@@ -9562,7 +9599,7 @@
 sub    6494C6D6997C215E
 sub    E88979FB9B30ACF2
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBFcMjNMBEAC6Wr5QuLIFgz1V1EFPlg8ty2TsjQEl4VWftUAqWlMevJFWvYEx
 BOsOZ6kNFfBfjAxgJNWTkxZrHzDl74R7KW/nUx6X57bpFjUyRaB8F3/NpWKSeIGS
@@ -9755,7 +9792,7 @@
 
 sub    FA84183FDD6A6B98
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBF6RvwcBCADIVU7oxOiljoWxNTkZ00PKVwyqhahYpN/4lamULtECCS+HAF+J
 DsNy/6QCl7lKAGrSyn9dvsI56KEkGvUJfpQrpRlg+uIQDMxS8JF7p9n49DNc8Q88
@@ -9784,7 +9821,7 @@
 
 sub    DBC5123E2E98FEFE
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGNBGSsZCsBDADJZoPoHGJNAB3sn/kFQ3zlj+vZ7OY5aWoH2nL3tHQYZvN/pJRs
 8wu4Cw1ApatqLIaur6S6LR+s4xB7HxnMvpiF3NMwr6ZeZBUUTGEJbRgFhY9TqZam
@@ -9821,7 +9858,7 @@
 
 sub    AC9F6F1991913E30
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGiBEqXMWkRBACnsxVroe9ojc2AnRn/85KJi/Ntsbku5iJ5z72B6I+VGn/b1Xln
 kuvRJ41RLG13lKVmHtSTq2pajjmAr9jY5gS8nJ3JUES9bG3yKNN1IDswXExfAUJp
@@ -9864,7 +9901,7 @@
 
 sub    9F7335D63326E7F9
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFWdcSoBCADK8j+0eVZKUGctZo/VaJ/K2Wppx4jEFgih8xiIWREQ9B3QEugJ
 mJMWZHhrnHB+sjVx5No482ch6sVhYmC+VMyTdzepItZ8beYa0pnNGJnrFT+HcTOS
@@ -9893,7 +9930,7 @@
 
 sub    C3E640F38D845FA2
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFZUsiQBCADGmoidvh3VvXWGdwbAtHPtDPKEebE/MfFVO+QTRbjJxphzKwAt
 mxHruikafaSTnC9FWizj99e/Yc45YZHcnt5Htmy0a7DSOQXL37rrnieZxg86tYmC
@@ -9922,7 +9959,7 @@
 
 sub    C189C86B813330C4
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBEvxja8BEADAzZOup1X0B12zJsNsDvXVIwmM6bB+uhEsUHoFTvmsEVwRoZtn
 i7Q0WSFoY+LDxbvC4Bg1+urCrUrstRJYRyF/pMqPYq/HokRlPjtrli/i3mUSd0zN
@@ -9967,7 +10004,7 @@
 
 sub    926DFB2EDB329089
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGiBEPonucRBACtbhYckAoyz1tuSXYX4XiqGa5390gIMcxe2hJ+Ncx9o3zX09Im
 f8PW27BnMrz7EIydgB2wphhjfK4vkNNtm5ZDWH/zJStsk1Fe7lNuuxs8XorX1+8D
@@ -10001,7 +10038,7 @@
 sub    3967D4EDA591B991
 sub    0588BC69A286FF16
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGNBF+TCd4BDACbIA94MfIWL0SpvZwBddXgx36Lp9GYOWNgGoQCWSvk9vaMrLaI
 rEll0xnoP98CfBQYrVSAmHDMhSLBCjNB3V1Sdz8GRdOG7HUffF7Cqwbm3Fxo3H/h
@@ -10083,7 +10120,7 @@
 
 sub    9842FE565AA0601E
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQGiBEvsZw4RBADH20nX+H1xvMBYmXRj1Aae4dRr6Y6qI7QRWHO6Z7/dxr9bk/NN
 Yjq5KsVOQxZzloVdtqx75rznT7fZq98g7Nq9IeEtB6k4tnh6XQLhljJMk0a3mzdt
@@ -10116,7 +10153,7 @@
 
 sub    D7913335BFA51814
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQINBF99kCMBEADE22W+h7w4R9fHyqEQV1NpgY2qI1S1HlwSQLQnf1pt1k3ZvMzX
 Eh2q9lNAn96O5TqpiMhHm2ZEDORqXqAx6hEVpA5iy+7NrIaSpxcbM0crUxSqoceW
@@ -10156,12 +10193,82 @@
 =oANj
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    7FAC222BF1FC0C12
+uid    Erik C. Thauvin <erik@thauvin.net>
+
+sub    776702A6A2DA330E
+sub    3565C12F190E4CB2
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGiBDZlGC4RBAD71K/vOcX69tHOv4e6nuIGqbqooKxURWJhe1OvoK9Z1pgadt5D
+Ct0HDuSGydkA91cAM3a2QzZmGepGS8r3s3ldTf83uBfsriYM+yXmalmHYNdMVrPL
+CDFUNMH7A+2rnKvhQ7phmMVBdeEtRcrncfXMHmFvfq0h2y2V/NQ6VfJq5wCg/xd4
+gARVHy7gIE9VtVMg3W9D6xsEAOxmB+PxSjD0y5/NN81EMeOYc3INakbQtjkQ0KoO
+jlkWot6OidFBpUA/ssLRUpmBGN4nTztXiESjz4n79cW3bRAG3b1XtOxbCkNltlrD
+DKqpy4FwBsnslKFEAOIwttWJKXkebtWIw5Jm+HHIENH+IzoE43JFmKhtTS/427Rn
+FIi6A/4l/WesI6bUZDVXuicWh4KYrArARpuK59Cycz17lZmAES7nramBCK7uNEi1
+XlZwWhKz/tYL8o2y2cwuUv45EOl+mv7sF88z65Vt60N9u6HXu1STFyl85q09g2Vs
+il+/P8Hlh71t53yrTtmAwkugBB4mbdi6uvVFlWN0kkxQhtXGlrQiRXJpayBDLiBU
+aGF1dmluIDxlcmlrQHRoYXV2aW4ubmV0PrkCDQRZDPiYARAAtzgweuKZHqTHK8mZ
+2TC0ySaUYTRskl4L8JetdXpnnYVXb6qcyYHSyyzxyR2SrSj2sjdyK2svU3FSxYbc
+OswyFlBjJsapQydE0ZcWrzhQbMgm/3hhQdzzCB49W3nl6m7pjFxtZTZvrxvjxPIF
+iLQUIbphrMyH8ZoxjS/nfMc/k0q29B4qT6heICZQJoOEZ/kgPC8SNKoFRhuVSp5A
+fBRMGe04dQYqxUYGnub/ik0dKXKJLapk6OVDgTr0daDH/awpc2RWM17Ct4qzmnWF
+BFDHcUNlkvYoQYf3xEoLA0hiTJc/gT0IB22Bush4cSoPv+JHV8QnY56Nnliv3Kdl
+4YYdiFLIAfFwjP41QsNbEJsY74e9sDuh1ZofGQh7g5ejDBDGo7frHSEM5QC/nIWZ
+b5XzPO6uL027NwqHn6ILQVlSo6pZcBH3I8wPGX/lXX0oVELBUJiCGSvDFaK6qzkQ
+QdljUiNiq7RW+EuNr3ut+8zviruzTFWXs1psnQK5TenxIjS6ewb57byJv3jhq/G9
+hHqNlmaaSA2FQU4oN0lgyAVC8N6dIgIQt0nNJQKfIgAhDFgpmBhCk1WgNL554jr3
+CkHdmjFf+hFTJzGdE8g2pIDWh5QTBL0sy47mfInfnA0TDhUnpb/luZHBPrKa6arU
+c2Gk0Axdski8T3mQDqmGY8cGC8EAEQEAAYkCaAQYEQIACQUCWQz4mAIbAgIpCRB/
+rCIr8fwMEsFdIAQZAQgABgUCWQz4mAAKCRB3ZwKmotozDoOjEACpSTVTZKmuEcOJ
+tD1RQIKIxVIPu4tatD5nU0IzhsLYPB98CZJTbDm1zuHpjEB5qRRVwsbBDvQ2cZnt
+Sz4PKqALT+xx+kxrEjO+Ubv7JLaA+z/InwiMVppipJ9F7WpRRqhSOCcgkFjzKtsq
+Qa4V5SUq4fy5piHimj367u/aV6/Psz2mNkS6cFWYuKSwDy/uGtm3m4xvUs1y+YpX
+7zzdeWaMRcdNAbkfTk0tbc6Ij+20l/jDbADO+5KGuIlah7GZcT8k3uNzO+ZRLyQN
+mlbgupyH2NvRNGhc3loYgcwfDtmM5B0Wd6clkWH5Yc6uPt+6N5a037/4pkTngzUR
+L8rQcY7seC5um6ouVCXdVkCeazFAHNQg/Q0zqN2Gr25uDpzP3s8y+A2ucOcNSQgM
+YIPy6CAeLnE9CpnudlNGbRCVWT9B+pIjKLI3AZo/9geaW0JLc9S9+HXGQn0RO00W
+EYX7zfkuX8KtDznjw5JnyDbxRAPiKJjoIoz16UehtqzhBWJzmk9+kqH+IfQ6IIsi
+HJRqJD4veGHem9ZN9+5XdVOgsiSx0BB7UrjqXBu15JTQRwg2gmy6N5XPuV5yM36h
+paRG8FOlYCmOOnFmpzzEBJv4Z8oT5PNWdhhwTugaxv1yWlTzFDbg/va5/NFhwtDi
+v3XnqjFTesbBFwMWIhRRMpCwl+J5oM2lAJ4p7U6+8andiWS6tuMns/mDTJ3LJwCf
+dgb+Mx8gFFGCQpvy4DTYfDtXbkCJAmgEGBECAAkFAlkM+JgCGwICKQkQf6wiK/H8
+DBLBXSAEGQEIAAYFAlkM+JgACgkQd2cCpqLaMw6DoxAAqUk1U2SprhHDibQ9UUCC
+iMVSD7uLWrQ+Z1NCM4bC2DwffAmSU2w5tc7h6YxAeakUVcLGwQ70NnGZ7Us+Dyqg
+C0/scfpMaxIzvlG7+yS2gPs/yJ8IjFaaYqSfRe1qUUaoUjgnIJBY8yrbKkGuFeUl
+KuH8uaYh4po9+u7v2levz7M9pjZEunBVmLiksA8v7hrZt5uMb1LNcvmKV+883Xlm
+jEXHTQG5H05NLW3OiI/ttJf4w2wAzvuShriJWoexmXE/JN7jczvmUS8kDZpW4Lqc
+h9jb0TRoXN5aGIHMHw7ZjOQdFnenJZFh+WHOrj7fujeWtN+/+KZE54M1ES/K0HGO
+7HgubpuqLlQl3VZAnmsxQBzUIP0NM6jdhq9ubg6cz97PMvgNrnDnDUkIDGCD8ugg
+Hi5xPQqZ7nZTRm0QlVk/QfqSIyiyNwGaP/YHmltCS3PUvfh1xkJ9ETtNFhGF+835
+Ll/CrQ8548OSZ8g28UQD4iiY6CKM9elHobas4QVic5pPfpKh/iH0OiCLIhyUaiQ+
+L3hh3pvWTffuV3VToLIksdAQe1K46lwbteSU0EcINoJsujeVz7lecjN+oaWkRvBT
+pWApjjpxZqc8xASb+GfKE+TzVnYYcE7oGsb9clpU8xQ24P72ufzRYcLQ4r9156ox
+U3rGwRcDFiIUUTKQsJfieaDNpQCg2uWEeylyeb7fxS8xwZJNvwLabfcAoN9rHTJ7
+Z3ZeNKUlYL7uHGivlZh/uQINBDZlGC8QCAD2Qle3CH8IF3KiutapQvMF6PlTETlP
+tvFuuUs4INoBp1ajFOmPQFXz0AfGy0OplK33TGSGSfgMg71l6RfUodNQ+PVZX9x2
+Uk89PY3bzpnhV5JZzf24rnRPxfx2vIPFRzBhznzJZv8V+bv9kV7HAarTW56NoKVy
+OtQa8L9GAFgr5fSI/VhOSdvNILSd5JEHNmszbDgNRR0PfIizHHxbLY7288kjwEPw
+pVsYjY67VYy4XTjTNP18F1dDox0YbN4zISy1Kv884bEpQBgRjXyEpwpy1obEAxnI
+Byl6ypUM2Zafq9AKUJsCRtMIPWakXUGfnHy9iUsiGSa6q6Jew1XpMgs7AAICB/9I
+2phs8YFrOxKv9lwdRFT1DLg5AlK3aOhLeDMfe4oPdcfu2YBslX2xJaZK8tq5J0YB
+JjOz+FPGlSLFdBYgcsf+Wf7fm8xhYYoaZpFbBkBwNZUNOTg0QCpJwYUqeiwjIzqo
+FciFKL+esSRdRLur6C80Knepl4LHuOZAcjKeukHzUxjISZICIvSNzJe/FWoa4p7J
+oJuG2ScUXWhae0OF2ulWHmN0lw/c3NDkysTuwaVHl3jm9xL/8aLXAblzQqAuuOr/
+7V1/wvU92Ir31b2+BIRb6SLSjKdZfoyCQd19KBP5DjJtV3/mMLEvT0eMhMp9NdaC
+Z/DQtQ0jYYgDwvv2yGogiEYEGBECAAYFAjZlGC8ACgkQf6wiK/H8DBIhHgCdFfHu
+2whpwaX1/YaS03SxvtT8hegAnRSdQ88UIcXYj2PkFOiuFPrFBvee
+=crZ+
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    7FE9900F412D622E
 uid    Wouter van Oortmerssen <aardappel@gmail.com>
 
 sub    AE6B5325E74ED034
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.77.00
+Version: BCPG v@RELEASE_NAME@
 
 mQENBFnyVlkBCACe8zGkIlDV0dUKmk9PWe2Hw8qM9DdPbtpUOpmUOidGY5svQDL3
 eqvHk85TbxqFEe3Qbjjt+R+iApFuXy5kmueXTvwCm7nAU+k/pZtPuzHyhDs3iFFH
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 2d28c739..3cbe2f3 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -121,6 +121,7 @@
          <trusted-key id="1F47744C9B6E14F2049C2857F1F111AF65925306" group="io.github.classgraph"/>
          <trusted-key id="1FA37FBE4453C1073E7EF61D6449005F96BC97A3" group="de.undercouch"/>
          <trusted-key id="20723A6399BC060154283B37CFAE163B64AC9189" group="org.jetbrains.skiko"/>
+         <trusted-key id="217BFC8CA98788CB33198A8E7FAC222BF1FC0C12" group="net.thauvin.erik.urlencoder"/>
          <trusted-key id="22B79F456B06F4E75B8B579DB57BD58EF6D0A713" group="com.google.protobuf"/>
          <trusted-key id="24D04176586361FDA94EE0315F7786DF73E61F56" group="com.google.devtools.ksp"/>
          <trusted-key id="26063B04869F7D235CCC057447586A1B75EF0DE5" group="com.squareup.wire"/>
@@ -310,6 +311,7 @@
          <trusted-key id="7FE5E98DF3A5C0DC34663AB7C1ADD37CA0069309" group="org.spdx" name="spdx-gradle-plugin"/>
          <trusted-key id="808D78B17A5A2D7C3668E31FBFFC9B54721244AD" group="org.apache.commons"/>
          <trusted-key id="80F6D6B0D90C6747753344CAB5A9E81B565E89E0" group="org.tomlj"/>
+         <trusted-key id="8247F88933C2D56F830AF73436AB7ACFFF2027B1" group="it.krzeminski"/>
          <trusted-key id="8254180BFC943B816E0B5E2E5E2F2B3D474EFE6B" group="it.unimi.dsi"/>
          <trusted-key id="82C9EC0E52C47A936A849E0113D979595E6D01E1" group="org.apache.maven.shared" name="maven-shared-utils"/>
          <trusted-key id="82F833963889D7ED06F1E4DC6525FD70CC303655" group="org.codehaus.mojo"/>
diff --git a/graphics/graphics-core/src/androidTest/java/androidx/graphics/surface/SurfaceControlCompatTest.kt b/graphics/graphics-core/src/androidTest/java/androidx/graphics/surface/SurfaceControlCompatTest.kt
index 9ba4c00..86da8db 100644
--- a/graphics/graphics-core/src/androidTest/java/androidx/graphics/surface/SurfaceControlCompatTest.kt
+++ b/graphics/graphics-core/src/androidTest/java/androidx/graphics/surface/SurfaceControlCompatTest.kt
@@ -77,9 +77,7 @@
     @Test
     fun testSurfaceControlCompatBuilder_parent() {
         val callbackLatch = CountDownLatch(1)
-        val scenario =
-            ActivityScenario.launch(SurfaceControlWrapperTestActivity::class.java)
-                .moveToState(Lifecycle.State.CREATED)
+        val scenario = ActivityScenario.launch(SurfaceControlWrapperTestActivity::class.java)
 
         try {
             scenario.onActivity {
@@ -97,7 +95,7 @@
 
                 it.addSurface(it.getSurfaceView(), callback)
             }
-            scenario.moveToState(Lifecycle.State.RESUMED)
+
             assertTrue(callbackLatch.await(3000, TimeUnit.MILLISECONDS))
         } catch (e: java.lang.IllegalArgumentException) {
             fail()
@@ -110,9 +108,7 @@
     @Test
     fun testSurfaceControlCompatBuilder_parentSurfaceControl() {
         val callbackLatch = CountDownLatch(1)
-        val scenario =
-            ActivityScenario.launch(SurfaceControlWrapperTestActivity::class.java)
-                .moveToState(Lifecycle.State.CREATED)
+        val scenario = ActivityScenario.launch(SurfaceControlWrapperTestActivity::class.java)
 
         try {
             scenario.onActivity {
@@ -136,7 +132,6 @@
 
                 it.addSurface(it.getSurfaceView(), callback)
             }
-            scenario.moveToState(Lifecycle.State.RESUMED)
             assertTrue(callbackLatch.await(3000, TimeUnit.MILLISECONDS))
         } catch (e: java.lang.IllegalArgumentException) {
             fail()
@@ -170,9 +165,7 @@
     fun testSurfaceTransactionOnCommitCallback() {
         val listener = TransactionOnCommitListener()
 
-        val scenario =
-            ActivityScenario.launch(SurfaceControlWrapperTestActivity::class.java)
-                .moveToState(Lifecycle.State.CREATED)
+        val scenario = ActivityScenario.launch(SurfaceControlWrapperTestActivity::class.java)
 
         try {
             scenario.onActivity {
@@ -180,7 +173,6 @@
                     .addTransactionCommittedListener(executor!!, listener)
                     .commit()
             }
-            scenario.moveToState(Lifecycle.State.RESUMED)
 
             listener.mLatch.await(3, TimeUnit.SECONDS)
             assertEquals(0, listener.mLatch.count)
@@ -197,9 +189,7 @@
         val listener = TransactionOnCommitListener()
         val listener2 = TransactionOnCommitListener()
 
-        val scenario =
-            ActivityScenario.launch(SurfaceControlWrapperTestActivity::class.java)
-                .moveToState(Lifecycle.State.CREATED)
+        val scenario = ActivityScenario.launch(SurfaceControlWrapperTestActivity::class.java)
 
         try {
             scenario.onActivity {
@@ -209,8 +199,6 @@
                     .commit()
             }
 
-            scenario.moveToState(Lifecycle.State.RESUMED)
-
             listener.mLatch.await(3, TimeUnit.SECONDS)
             listener2.mLatch.await(3, TimeUnit.SECONDS)
 
@@ -228,9 +216,7 @@
     @Test
     fun testSurfaceControlIsValid_valid() {
         val callbackLatch = CountDownLatch(1)
-        val scenario =
-            ActivityScenario.launch(SurfaceControlWrapperTestActivity::class.java)
-                .moveToState(Lifecycle.State.CREATED)
+        val scenario = ActivityScenario.launch(SurfaceControlWrapperTestActivity::class.java)
         try {
             scenario.onActivity {
                 val callback =
@@ -250,7 +236,6 @@
                 it.addSurface(it.mSurfaceView, callback)
             }
 
-            scenario.moveToState(Lifecycle.State.RESUMED)
             assertTrue(callbackLatch.await(3000, TimeUnit.MILLISECONDS))
         } catch (e: java.lang.IllegalArgumentException) {
             fail()
@@ -263,9 +248,7 @@
     @Test
     fun testSurfaceControlIsValid_validNotValid() {
         val callbackLatch = CountDownLatch(1)
-        val scenario =
-            ActivityScenario.launch(SurfaceControlWrapperTestActivity::class.java)
-                .moveToState(Lifecycle.State.CREATED)
+        val scenario = ActivityScenario.launch(SurfaceControlWrapperTestActivity::class.java)
         try {
             scenario.onActivity {
                 val callback =
@@ -287,8 +270,6 @@
 
                 it.addSurface(it.mSurfaceView, callback)
             }
-
-            scenario.moveToState(Lifecycle.State.RESUMED)
             assertTrue(callbackLatch.await(3000, TimeUnit.MILLISECONDS))
         } catch (e: java.lang.IllegalArgumentException) {
             fail()
@@ -301,9 +282,7 @@
     @Test
     fun testSurfaceControlIsValid_multipleReleases() {
         val callbackLatch = CountDownLatch(1)
-        val scenario =
-            ActivityScenario.launch(SurfaceControlWrapperTestActivity::class.java)
-                .moveToState(Lifecycle.State.CREATED)
+        val scenario = ActivityScenario.launch(SurfaceControlWrapperTestActivity::class.java)
         try {
             scenario.onActivity {
                 val callback =
@@ -327,7 +306,6 @@
                 it.addSurface(it.mSurfaceView, callback)
             }
 
-            scenario.moveToState(Lifecycle.State.RESUMED)
             assertTrue(callbackLatch.await(3000, TimeUnit.MILLISECONDS))
         } catch (e: java.lang.IllegalArgumentException) {
             fail()
@@ -1220,41 +1198,37 @@
         var scCompat: SurfaceControlCompat? = null
         var surfaceView: SurfaceView? = null
         val scenario =
-            ActivityScenario.launch(SurfaceControlWrapperTestActivity::class.java)
-                .moveToState(Lifecycle.State.CREATED)
-                .onActivity {
-                    it.setDestroyCallback { destroyLatch.countDown() }
-                    surfaceView = it.mSurfaceView
-                    val callback =
-                        object : SurfaceHolderCallback() {
-                            override fun surfaceCreated(sh: SurfaceHolder) {
-                                scCompat =
-                                    SurfaceControlCompat.Builder()
-                                        .setParent(it.getSurfaceView())
-                                        .setName("SurfaceControlCompatTest")
-                                        .build()
+            ActivityScenario.launch(SurfaceControlWrapperTestActivity::class.java).onActivity {
+                it.setDestroyCallback { destroyLatch.countDown() }
+                surfaceView = it.mSurfaceView
+                val callback =
+                    object : SurfaceHolderCallback() {
+                        override fun surfaceCreated(sh: SurfaceHolder) {
+                            scCompat =
+                                SurfaceControlCompat.Builder()
+                                    .setParent(it.getSurfaceView())
+                                    .setName("SurfaceControlCompatTest")
+                                    .build()
 
-                                // Buffer colorspace is RGBA, so Color.BLUE will be visually Red
-                                val buffer =
-                                    SurfaceControlUtils.getSolidBuffer(
-                                        SurfaceControlWrapperTestActivity.DEFAULT_WIDTH,
-                                        SurfaceControlWrapperTestActivity.DEFAULT_HEIGHT,
-                                        Color.BLUE
-                                    )
+                            // Buffer colorspace is RGBA, so Color.BLUE will be visually Red
+                            val buffer =
+                                SurfaceControlUtils.getSolidBuffer(
+                                    SurfaceControlWrapperTestActivity.DEFAULT_WIDTH,
+                                    SurfaceControlWrapperTestActivity.DEFAULT_HEIGHT,
+                                    Color.BLUE
+                                )
 
-                                SurfaceControlCompat.Transaction()
-                                    .addTransactionCommittedListener(executor!!, listener)
-                                    .setBuffer(scCompat!!, buffer)
-                                    .setVisibility(scCompat!!, true)
-                                    .setCrop(scCompat!!, Rect(20, 30, 90, 60))
-                                    .commit()
-                            }
+                            SurfaceControlCompat.Transaction()
+                                .addTransactionCommittedListener(executor!!, listener)
+                                .setBuffer(scCompat!!, buffer)
+                                .setVisibility(scCompat!!, true)
+                                .setCrop(scCompat!!, Rect(20, 30, 90, 60))
+                                .commit()
                         }
+                    }
 
-                    it.addSurface(it.mSurfaceView, callback)
-                }
-
-        scenario.moveToState(Lifecycle.State.RESUMED)
+                it.addSurface(it.mSurfaceView, callback)
+            }
 
         assertTrue(listener.mLatch.await(3000, TimeUnit.MILLISECONDS))
 
@@ -1568,49 +1542,43 @@
     @SdkSuppress(minSdkVersion = Build.VERSION_CODES.Q)
     @Test
     fun testClearFrameRate() {
-        ActivityScenario.launch(SurfaceControlWrapperTestActivity::class.java)
-            .moveToState(Lifecycle.State.CREATED)
-            .onActivity {
-                val callback =
-                    object : SurfaceHolderCallback() {
-                        override fun surfaceCreated(sh: SurfaceHolder) {
+        ActivityScenario.launch(SurfaceControlWrapperTestActivity::class.java).onActivity {
+            val callback =
+                object : SurfaceHolderCallback() {
+                    override fun surfaceCreated(sh: SurfaceHolder) {
 
-                            val surfaceControl =
-                                SurfaceControlCompat.Builder()
-                                    .setName("testSurfaceControl")
-                                    .setParent(it.mSurfaceView)
-                                    .build()
-                            SurfaceControlCompat.Transaction()
-                                .clearFrameRate(surfaceControl)
-                                .commit()
-                        }
+                        val surfaceControl =
+                            SurfaceControlCompat.Builder()
+                                .setName("testSurfaceControl")
+                                .setParent(it.mSurfaceView)
+                                .build()
+                        SurfaceControlCompat.Transaction().clearFrameRate(surfaceControl).commit()
                     }
+                }
 
-                it.addSurface(it.mSurfaceView, callback)
-            }
+            it.addSurface(it.mSurfaceView, callback)
+        }
     }
 
     private fun testFrameRate(frameRate: Float, compatibility: Int, strategy: Int) {
-        ActivityScenario.launch(SurfaceControlWrapperTestActivity::class.java)
-            .moveToState(Lifecycle.State.CREATED)
-            .onActivity {
-                val callback =
-                    object : SurfaceHolderCallback() {
-                        override fun surfaceCreated(sh: SurfaceHolder) {
+        ActivityScenario.launch(SurfaceControlWrapperTestActivity::class.java).onActivity {
+            val callback =
+                object : SurfaceHolderCallback() {
+                    override fun surfaceCreated(sh: SurfaceHolder) {
 
-                            val surfaceControl =
-                                SurfaceControlCompat.Builder()
-                                    .setName("testSurfaceControl")
-                                    .setParent(it.mSurfaceView)
-                                    .build()
-                            SurfaceControlCompat.Transaction()
-                                .setFrameRate(surfaceControl, frameRate, compatibility, strategy)
-                                .commit()
-                        }
+                        val surfaceControl =
+                            SurfaceControlCompat.Builder()
+                                .setName("testSurfaceControl")
+                                .setParent(it.mSurfaceView)
+                                .build()
+                        SurfaceControlCompat.Transaction()
+                            .setFrameRate(surfaceControl, frameRate, compatibility, strategy)
+                            .commit()
                     }
+                }
 
-                it.addSurface(it.mSurfaceView, callback)
-            }
+            it.addSurface(it.mSurfaceView, callback)
+        }
     }
 
     @SuppressLint("NewApi")
@@ -1653,86 +1621,84 @@
     fun testSetExtendedRangeBrightness() {
         val destroyLatch = CountDownLatch(1)
         val scenario =
-            ActivityScenario.launch(SurfaceControlWrapperTestActivity::class.java)
-                .moveToState(Lifecycle.State.CREATED)
-                .onActivity {
-                    it.setDestroyCallback { destroyLatch.countDown() }
-                    val display = it.display
-                    assertNotNull(display)
-                    if (display!!.isHdrSdrRatioAvailable) {
-                        assertEquals(1.0f, display.hdrSdrRatio, .0001f)
-                    }
+            ActivityScenario.launch(SurfaceControlWrapperTestActivity::class.java).onActivity {
+                it.setDestroyCallback { destroyLatch.countDown() }
+                val display = it.display
+                assertNotNull(display)
+                if (display!!.isHdrSdrRatioAvailable) {
+                    assertEquals(1.0f, display.hdrSdrRatio, .0001f)
+                }
 
-                    it.window.attributes.screenBrightness = 0.01f
-                    val hdrReady = CountDownLatch(1)
-                    val listenerErrors = arrayOfNulls<Exception>(1)
-                    if (display.isHdrSdrRatioAvailable) {
-                        display.registerHdrSdrRatioChangedListener(
-                            executor!!,
-                            object : Consumer<Display?> {
-                                var mIsRegistered = true
+                it.window.attributes.screenBrightness = 0.01f
+                val hdrReady = CountDownLatch(1)
+                val listenerErrors = arrayOfNulls<Exception>(1)
+                if (display.isHdrSdrRatioAvailable) {
+                    display.registerHdrSdrRatioChangedListener(
+                        executor!!,
+                        object : Consumer<Display?> {
+                            var mIsRegistered = true
 
-                                override fun accept(updatedDisplay: Display?) {
-                                    try {
-                                        assertEquals(display.displayId, updatedDisplay!!.displayId)
-                                        assertTrue(mIsRegistered)
-                                        if (display.hdrSdrRatio > 2f) {
-                                            hdrReady.countDown()
-                                            display.unregisterHdrSdrRatioChangedListener(this)
-                                            mIsRegistered = false
-                                        }
-                                    } catch (e: Exception) {
-                                        synchronized(it) {
-                                            listenerErrors[0] = e
-                                            hdrReady.countDown()
-                                        }
+                            override fun accept(updatedDisplay: Display?) {
+                                try {
+                                    assertEquals(display.displayId, updatedDisplay!!.displayId)
+                                    assertTrue(mIsRegistered)
+                                    if (display.hdrSdrRatio > 2f) {
+                                        hdrReady.countDown()
+                                        display.unregisterHdrSdrRatioChangedListener(this)
+                                        mIsRegistered = false
+                                    }
+                                } catch (e: Exception) {
+                                    synchronized(it) {
+                                        listenerErrors[0] = e
+                                        hdrReady.countDown()
                                     }
                                 }
                             }
+                        }
+                    )
+                } else {
+                    assertThrows(IllegalStateException::class.java) {
+                        display.registerHdrSdrRatioChangedListener(
+                            executor!!,
+                            Consumer { _: Display? -> }
                         )
-                    } else {
-                        assertThrows(IllegalStateException::class.java) {
-                            display.registerHdrSdrRatioChangedListener(
-                                executor!!,
-                                Consumer { _: Display? -> }
-                            )
+                    }
+                }
+                val extendedDataspace =
+                    DataSpace.pack(
+                        DataSpace.STANDARD_BT709,
+                        DataSpace.TRANSFER_SRGB,
+                        DataSpace.RANGE_EXTENDED
+                    )
+                val buffer =
+                    getSolidBuffer(
+                        SurfaceControlWrapperTestActivity.DEFAULT_WIDTH,
+                        SurfaceControlWrapperTestActivity.DEFAULT_HEIGHT,
+                        Color.RED
+                    )
+                val callback =
+                    object : SurfaceHolderCallback() {
+                        override fun surfaceCreated(sh: SurfaceHolder) {
+                            val scCompat =
+                                SurfaceControlCompat.Builder()
+                                    .setParent(it.getSurfaceView())
+                                    .setName("SurfaceControlCompatTest")
+                                    .build()
+
+                            SurfaceControlCompat.Transaction()
+                                .setBuffer(scCompat, buffer)
+                                .setDataSpace(scCompat, extendedDataspace)
+                                .setExtendedRangeBrightness(scCompat, 1.0f, 3.0f)
+                                .setVisibility(scCompat, true)
+                                .commit()
                         }
                     }
-                    val extendedDataspace =
-                        DataSpace.pack(
-                            DataSpace.STANDARD_BT709,
-                            DataSpace.TRANSFER_SRGB,
-                            DataSpace.RANGE_EXTENDED
-                        )
-                    val buffer =
-                        getSolidBuffer(
-                            SurfaceControlWrapperTestActivity.DEFAULT_WIDTH,
-                            SurfaceControlWrapperTestActivity.DEFAULT_HEIGHT,
-                            Color.RED
-                        )
-                    val callback =
-                        object : SurfaceHolderCallback() {
-                            override fun surfaceCreated(sh: SurfaceHolder) {
-                                val scCompat =
-                                    SurfaceControlCompat.Builder()
-                                        .setParent(it.getSurfaceView())
-                                        .setName("SurfaceControlCompatTest")
-                                        .build()
 
-                                SurfaceControlCompat.Transaction()
-                                    .setBuffer(scCompat, buffer)
-                                    .setDataSpace(scCompat, extendedDataspace)
-                                    .setExtendedRangeBrightness(scCompat, 1.0f, 3.0f)
-                                    .setVisibility(scCompat, true)
-                                    .commit()
-                            }
-                        }
-
-                    it.addSurface(it.mSurfaceView, callback)
-                }
+                it.addSurface(it.mSurfaceView, callback)
+            }
 
         try {
-            scenario.moveToState(Lifecycle.State.RESUMED).onActivity {
+            scenario.onActivity {
                 SurfaceControlUtils.validateOutput(it.window) { bitmap ->
                     val coord = intArrayOf(0, 0)
                     it.mSurfaceView.getLocationInWindow(coord)
diff --git a/graphics/graphics-core/src/main/java/androidx/graphics/lowlatency/CanvasFrontBufferedRenderer.kt b/graphics/graphics-core/src/main/java/androidx/graphics/lowlatency/CanvasFrontBufferedRenderer.kt
index 598c67e..2110acd 100644
--- a/graphics/graphics-core/src/main/java/androidx/graphics/lowlatency/CanvasFrontBufferedRenderer.kt
+++ b/graphics/graphics-core/src/main/java/androidx/graphics/lowlatency/CanvasFrontBufferedRenderer.kt
@@ -70,13 +70,15 @@
 @JvmOverloads
 constructor(
     surfaceView: SurfaceView,
-    private val callback: Callback<T>,
+    callback: Callback<T>,
     @HardwareBufferFormat val bufferFormat: Int = HardwareBuffer.RGBA_8888
 ) {
 
     /** Target SurfaceView for rendering */
     private var mSurfaceView: SurfaceView? = null
 
+    private var mCallback: Callback<T>? = null
+
     /**
      * Executor used to deliver callbacks for rendering as well as issuing surface control
      * transactions
@@ -185,6 +187,7 @@
 
     init {
         mSurfaceView = surfaceView
+        mCallback = callback
         surfaceView.holder.addCallback(mHolderCallback)
         with(surfaceView.holder) {
             if (surface != null && surface.isValid) {
@@ -253,7 +256,7 @@
                                     }
                                     canvas.drawColor(Color.BLACK, BlendMode.CLEAR)
                                 }
-                                callback.onDrawFrontBufferedLayer(canvas, width, height, param)
+                                mCallback?.onDrawFrontBufferedLayer(canvas, width, height, param)
                             }
 
                             @SuppressLint("WrongConstant")
@@ -293,7 +296,7 @@
                                             transformHint
                                         )
                                     }
-                                    callback.onFrontBufferedLayerRenderComplete(
+                                    mCallback?.onFrontBufferedLayerRenderComplete(
                                         frontBufferSurfaceControl,
                                         transaction
                                     )
@@ -460,7 +463,7 @@
             if (transform != BufferTransformHintResolver.UNKNOWN_TRANSFORM) {
                 transaction.setBufferTransform(parentSurfaceControl, transform)
             }
-            callback.onMultiBufferedLayerRenderComplete(
+            mCallback?.onMultiBufferedLayerRenderComplete(
                 frontBufferSurfaceControl,
                 parentSurfaceControl,
                 transaction
@@ -566,7 +569,7 @@
                     with(multiBufferedRenderer) {
                         mMultiBufferedRenderNode?.let { renderNode ->
                             val canvas = renderNode.beginRecording()
-                            callback.onDrawMultiBufferedLayer(canvas, width, height, params)
+                            mCallback?.onDrawMultiBufferedLayer(canvas, width, height, params)
                             renderNode.endRecording()
                         }
 
@@ -671,6 +674,7 @@
             mSurfaceView?.holder?.removeCallback(mHolderCallback)
             mSurfaceView = null
             releaseInternal(cancelPending) {
+                mCallback = null
                 onReleaseComplete?.invoke()
                 mHandlerThread.quit()
             }
diff --git a/graphics/graphics-core/src/main/java/androidx/graphics/surface/SurfaceControlCompat.kt b/graphics/graphics-core/src/main/java/androidx/graphics/surface/SurfaceControlCompat.kt
index b06c22c..182f845 100644
--- a/graphics/graphics-core/src/main/java/androidx/graphics/surface/SurfaceControlCompat.kt
+++ b/graphics/graphics-core/src/main/java/androidx/graphics/surface/SurfaceControlCompat.kt
@@ -530,12 +530,13 @@
             @ChangeFrameRateStrategy changeFrameRateStrategy: Int
         ): Transaction {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                mImpl.setFrameRate(
-                    surfaceControl.scImpl,
-                    frameRate,
-                    compatibility,
-                    changeFrameRateStrategy
-                )
+                val strategy =
+                    when (changeFrameRateStrategy) {
+                        CHANGE_FRAME_RATE_ALWAYS -> changeFrameRateStrategy
+                        CHANGE_FRAME_RATE_ONLY_IF_SEAMLESS -> changeFrameRateStrategy
+                        else -> CHANGE_FRAME_RATE_ONLY_IF_SEAMLESS
+                    }
+                mImpl.setFrameRate(surfaceControl.scImpl, frameRate, compatibility, strategy)
             }
             return this
         }
diff --git a/health/connect/connect-client/build.gradle b/health/connect/connect-client/build.gradle
index 9b1779f..b212af5 100644
--- a/health/connect/connect-client/build.gradle
+++ b/health/connect/connect-client/build.gradle
@@ -77,8 +77,7 @@
     }
     testOptions.unitTests.includeAndroidResources = true
     namespace "androidx.health.connect.client"
-    compileSdk = 34
-    compileSdkExtension = 10
+    compileSdk = 35
     // TODO(b/352609562): Typedef with `toLong()`
     experimentalProperties["android.lint.useK2Uast"] = false
 }
diff --git a/health/connect/connect-client/samples/build.gradle b/health/connect/connect-client/samples/build.gradle
index 08b7839..fb7bcef 100644
--- a/health/connect/connect-client/samples/build.gradle
+++ b/health/connect/connect-client/samples/build.gradle
@@ -51,4 +51,5 @@
     defaultConfig {
         minSdkVersion 26
     }
+    compileSdk = 35
 }
diff --git a/health/connect/connect-client/src/androidTest/java/androidx/health/connect/client/impl/HealthConnectClientUpsideDownImplTest.kt b/health/connect/connect-client/src/androidTest/java/androidx/health/connect/client/impl/HealthConnectClientUpsideDownImplTest.kt
index 14f303c..ee854d9 100644
--- a/health/connect/connect-client/src/androidTest/java/androidx/health/connect/client/impl/HealthConnectClientUpsideDownImplTest.kt
+++ b/health/connect/connect-client/src/androidTest/java/androidx/health/connect/client/impl/HealthConnectClientUpsideDownImplTest.kt
@@ -95,7 +95,7 @@
                 context.packageName,
                 PackageManager.PackageInfoFlags.of(PackageManager.GET_PERMISSIONS.toLong())
             )
-            .requestedPermissions
+            .requestedPermissions!!
             .filter { it.startsWith(PERMISSION_PREFIX) }
             .toTypedArray()
 
diff --git a/health/connect/connect-client/src/androidTest/java/androidx/health/connect/client/impl/platform/aggregate/HealthConnectClientAggregationExtensionsTest.kt b/health/connect/connect-client/src/androidTest/java/androidx/health/connect/client/impl/platform/aggregate/HealthConnectClientAggregationExtensionsTest.kt
index 05fe60c..653ea0c 100644
--- a/health/connect/connect-client/src/androidTest/java/androidx/health/connect/client/impl/platform/aggregate/HealthConnectClientAggregationExtensionsTest.kt
+++ b/health/connect/connect-client/src/androidTest/java/androidx/health/connect/client/impl/platform/aggregate/HealthConnectClientAggregationExtensionsTest.kt
@@ -78,7 +78,7 @@
                 context.packageName,
                 PackageManager.PackageInfoFlags.of(PackageManager.GET_PERMISSIONS.toLong())
             )
-            .requestedPermissions
+            .requestedPermissions!!
             .filter { it.startsWith(PERMISSION_PREFIX) }
             .toTypedArray()
 
diff --git a/health/connect/connect-client/src/test/java/androidx/health/connect/client/HealthConnectClientTest.kt b/health/connect/connect-client/src/test/java/androidx/health/connect/client/HealthConnectClientTest.kt
index a03c963..e38be6e 100644
--- a/health/connect/connect-client/src/test/java/androidx/health/connect/client/HealthConnectClientTest.kt
+++ b/health/connect/connect-client/src/test/java/androidx/health/connect/client/HealthConnectClientTest.kt
@@ -312,7 +312,7 @@
         @Suppress("Deprecation")
         packageInfo.versionCode = versionCode
         packageInfo.applicationInfo = ApplicationInfo()
-        packageInfo.applicationInfo.enabled = enabled
+        packageInfo.applicationInfo!!.enabled = enabled
         val packageManager = context.packageManager
         Shadows.shadowOf(packageManager).installPackage(packageInfo)
     }
diff --git a/health/connect/connect-client/src/test/java/androidx/health/connect/client/feature/HealthConnectApkImplTest.kt b/health/connect/connect-client/src/test/java/androidx/health/connect/client/feature/HealthConnectApkImplTest.kt
index dea6c6b..47d6fb9 100644
--- a/health/connect/connect-client/src/test/java/androidx/health/connect/client/feature/HealthConnectApkImplTest.kt
+++ b/health/connect/connect-client/src/test/java/androidx/health/connect/client/feature/HealthConnectApkImplTest.kt
@@ -121,7 +121,7 @@
         @Suppress("Deprecation")
         packageInfo.versionCode = versionCode
         packageInfo.applicationInfo = ApplicationInfo()
-        packageInfo.applicationInfo.enabled = true
+        packageInfo.applicationInfo!!.enabled = true
         val packageManager = context.packageManager
         Shadows.shadowOf(packageManager).installPackage(packageInfo)
     }
diff --git a/health/connect/connect-client/src/test/java/androidx/health/connect/client/impl/HealthConnectClientImplTest.kt b/health/connect/connect-client/src/test/java/androidx/health/connect/client/impl/HealthConnectClientImplTest.kt
index f1480f8..2bb9f0c 100644
--- a/health/connect/connect-client/src/test/java/androidx/health/connect/client/impl/HealthConnectClientImplTest.kt
+++ b/health/connect/connect-client/src/test/java/androidx/health/connect/client/impl/HealthConnectClientImplTest.kt
@@ -841,7 +841,7 @@
         val packageInfo = PackageInfo()
         packageInfo.packageName = packageName
         packageInfo.applicationInfo = ApplicationInfo()
-        packageInfo.applicationInfo.enabled = enabled
+        packageInfo.applicationInfo!!.enabled = enabled
         val packageManager = context.packageManager
         Shadows.shadowOf(packageManager).installPackage(packageInfo)
     }
diff --git a/health/connect/connect-client/src/test/java/androidx/health/platform/client/impl/ServiceBackedHealthDataClientTest.kt b/health/connect/connect-client/src/test/java/androidx/health/platform/client/impl/ServiceBackedHealthDataClientTest.kt
index 609c83a5..ff2ea5c 100644
--- a/health/connect/connect-client/src/test/java/androidx/health/platform/client/impl/ServiceBackedHealthDataClientTest.kt
+++ b/health/connect/connect-client/src/test/java/androidx/health/platform/client/impl/ServiceBackedHealthDataClientTest.kt
@@ -186,7 +186,7 @@
         val packageInfo = PackageInfo()
         packageInfo.packageName = packageName
         packageInfo.applicationInfo = ApplicationInfo()
-        packageInfo.applicationInfo.enabled = enabled
+        packageInfo.applicationInfo!!.enabled = enabled
         val packageManager = context.packageManager
         shadowOf(packageManager).installPackage(packageInfo)
     }
diff --git a/health/connect/connect-testing/build.gradle b/health/connect/connect-testing/build.gradle
index 9439dd3..1c1c2b5 100644
--- a/health/connect/connect-testing/build.gradle
+++ b/health/connect/connect-testing/build.gradle
@@ -47,8 +47,7 @@
     }
     namespace "androidx.health.connect.testing"
     testOptions.unitTests.includeAndroidResources = true
-    compileSdk = 34
-    compileSdkExtension = 10
+    compileSdk = 35
 }
 
 androidx {
diff --git a/health/connect/connect-testing/samples/build.gradle b/health/connect/connect-testing/samples/build.gradle
index c93f7cc..a9cb0e5 100644
--- a/health/connect/connect-testing/samples/build.gradle
+++ b/health/connect/connect-testing/samples/build.gradle
@@ -51,6 +51,7 @@
     defaultConfig {
         minSdkVersion 26
     }
+    compileSdk = 35
 }
 
 tasks.withType(KotlinCompile).configureEach {
diff --git a/ink/ink-brush/build.gradle b/ink/ink-brush/build.gradle
index 1137891..2483290 100644
--- a/ink/ink-brush/build.gradle
+++ b/ink/ink-brush/build.gradle
@@ -38,8 +38,6 @@
       it.defaultSourceSetName = "androidInstrumentedTest"
       it.sourceSetTreeName = "test"
     }
-    compileSdk = 35
-    aarMetadata.minCompileSdk = 35
   }
 
   defaultPlatform(PlatformIdentifier.JVM)
@@ -90,7 +88,9 @@
     }
 
     jvmTest {
-      dependsOn(jvmAndroidTest)
+      // TODO: b/362697089 - add `dependsOn(jvmAndroidTest)` to run the tests
+      //   in a JVM environment in addition to on Android emulators, once the
+      //   mysterious SIGSEGV is resolved.
     }
   }
 }
diff --git a/ink/ink-brush/src/androidInstrumentedTest/kotlin/androidx/ink/brush/BrushExtensionsTest.kt b/ink/ink-brush/src/androidInstrumentedTest/kotlin/androidx/ink/brush/BrushExtensionsTest.kt
index b6b5bea..b23e689 100644
--- a/ink/ink-brush/src/androidInstrumentedTest/kotlin/androidx/ink/brush/BrushExtensionsTest.kt
+++ b/ink/ink-brush/src/androidInstrumentedTest/kotlin/androidx/ink/brush/BrushExtensionsTest.kt
@@ -127,14 +127,14 @@
 
     @Test
     fun brushWithAndroidColor_createsBrushWithColor() {
-        val brush = Brush.withAndroidColor(testFamily, testColor, 1f, 1f)
+        val brush = Brush.createWithAndroidColor(testFamily, testColor, 1f, 1f)
         assertThat(brush.colorLong).isEqualTo(testColorLong)
     }
 
     @Test
     fun brushWithAndroidColor_withUnsupportedColorSpace_createsBrushWithConvertedColor() {
         val unsupportedColor = AndroidColor.valueOf(0.6f, 0.7f, 0.4f, 0.3f, adobeRgb)
-        val brush = Brush.withAndroidColor(testFamily, unsupportedColor, 1f, 1f)
+        val brush = Brush.createWithAndroidColor(testFamily, unsupportedColor, 1f, 1f)
 
         // unsupportedColor gets converted to ColorLong (losing precision) and then to Display P3.
         val expectedColor = AndroidColor.valueOf(unsupportedColor.pack()).convert(displayP3)
@@ -183,7 +183,7 @@
     @Test
     fun brushUtilMakeBuilderWithAndroidColor_setsColor() {
         val brush =
-            BrushUtil.makeBuilderWithAndroidColor(testColor)
+            BrushUtil.createBuilderWithAndroidColor(testColor)
                 .setFamily(testFamily)
                 .setSize(2f)
                 .setEpsilon(0.2f)
@@ -199,7 +199,7 @@
     fun brushUtilMakeBuilderAndroidColor_withUnsupportedColorSpace_setsConvertedColor() {
         val unsupportedColor = AndroidColor.valueOf(0.6f, 0.7f, 0.4f, 0.3f, adobeRgb)
         val brush =
-            BrushUtil.makeBuilderWithAndroidColor(unsupportedColor)
+            BrushUtil.createBuilderWithAndroidColor(unsupportedColor)
                 .setFamily(testFamily)
                 .setSize(2f)
                 .setEpsilon(0.2f)
@@ -212,14 +212,14 @@
 
     @Test
     fun brushUtilMakeBrushWithAndroidColor_createsBrushWithColor() {
-        val brush = BrushUtil.makeBrushWithAndroidColor(testFamily, testColor, 1f, 1f)
+        val brush = BrushUtil.createWithAndroidColor(testFamily, testColor, 1f, 1f)
         assertThat(brush.colorLong).isEqualTo(testColorLong)
     }
 
     @Test
     fun brushUtilMakeBrushWithAndroidColor_withUnsupportedColorSpace_createsBrushWithConvertedColor() {
         val unsupportedColor = AndroidColor.valueOf(0.6f, 0.7f, 0.4f, 0.3f, adobeRgb)
-        val brush = BrushUtil.makeBrushWithAndroidColor(testFamily, unsupportedColor, 1f, 1f)
+        val brush = BrushUtil.createWithAndroidColor(testFamily, unsupportedColor, 1f, 1f)
 
         // unsupportedColor gets converted to ColorLong (losing precision) and then to Display P3.
         val expectedColor = AndroidColor.valueOf(unsupportedColor.pack()).convert(displayP3)
diff --git a/ink/ink-brush/src/androidMain/kotlin/androidx/ink/brush/BrushExtensions.android.kt b/ink/ink-brush/src/androidMain/kotlin/androidx/ink/brush/BrushExtensions.android.kt
index c7dd5f7..a1a5bdc 100644
--- a/ink/ink-brush/src/androidMain/kotlin/androidx/ink/brush/BrushExtensions.android.kt
+++ b/ink/ink-brush/src/androidMain/kotlin/androidx/ink/brush/BrushExtensions.android.kt
@@ -68,12 +68,12 @@
 @JvmSynthetic
 @CheckResult
 @RequiresApi(Build.VERSION_CODES.O)
-public fun Brush.Companion.withAndroidColor(
+public fun Brush.Companion.createWithAndroidColor(
     family: BrushFamily,
     color: AndroidColor,
     size: Float,
     epsilon: Float,
-): Brush = BrushUtil.makeBrushWithAndroidColor(family, color, size, epsilon)
+): Brush = BrushUtil.createWithAndroidColor(family, color, size, epsilon)
 
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) // PublicApiNotReadyForJetpackReview
 public object BrushUtil {
@@ -109,7 +109,7 @@
     @JvmStatic
     @CheckResult
     @RequiresApi(Build.VERSION_CODES.O)
-    public fun makeBuilderWithAndroidColor(color: AndroidColor): Brush.Builder =
+    public fun createBuilderWithAndroidColor(color: AndroidColor): Brush.Builder =
         Brush.Builder().setAndroidColor(color)
 
     /**
@@ -120,7 +120,7 @@
     @JvmStatic
     @CheckResult
     @RequiresApi(Build.VERSION_CODES.O)
-    public fun makeBrushWithAndroidColor(
+    public fun createWithAndroidColor(
         family: BrushFamily,
         color: AndroidColor,
         size: Float,
diff --git a/ink/ink-brush/src/jvmAndroidMain/kotlin/androidx/ink/brush/BrushBehavior.kt b/ink/ink-brush/src/jvmAndroidMain/kotlin/androidx/ink/brush/BrushBehavior.kt
index 3b7d766..af765a0 100644
--- a/ink/ink-brush/src/jvmAndroidMain/kotlin/androidx/ink/brush/BrushBehavior.kt
+++ b/ink/ink-brush/src/jvmAndroidMain/kotlin/androidx/ink/brush/BrushBehavior.kt
@@ -345,46 +345,15 @@
     }
 
     override fun equals(other: Any?): Boolean {
-        // NOMUTANTS -- Check the instance first to short circuit faster.
-        if (other === this) return true
         if (other == null || other !is BrushBehavior) return false
-        return (source == other.source &&
-            target == other.target &&
-            sourceOutOfRangeBehavior == other.sourceOutOfRangeBehavior &&
-            sourceValueRangeLowerBound == other.sourceValueRangeLowerBound &&
-            sourceValueRangeUpperBound == other.sourceValueRangeUpperBound &&
-            targetModifierRangeLowerBound == other.targetModifierRangeLowerBound &&
-            targetModifierRangeUpperBound == other.targetModifierRangeUpperBound &&
-            responseCurve == other.responseCurve &&
-            responseTimeMillis == other.responseTimeMillis &&
-            enabledToolTypes == other.enabledToolTypes &&
-            isFallbackFor == other.isFallbackFor)
+        return targetNodes == other.targetNodes
     }
 
     override fun hashCode(): Int {
-        var result = source.hashCode()
-        result = 31 * result + target.hashCode()
-        result = 31 * result + sourceOutOfRangeBehavior.hashCode()
-        result = 31 * result + sourceValueRangeLowerBound.hashCode()
-        result = 31 * result + sourceValueRangeUpperBound.hashCode()
-        result = 31 * result + targetModifierRangeLowerBound.hashCode()
-        result = 31 * result + targetModifierRangeUpperBound.hashCode()
-        result = 31 * result + responseCurve.hashCode()
-        result = 31 * result + responseTimeMillis.hashCode()
-        result = 31 * result + (isFallbackFor?.hashCode() ?: 0)
-        result = 31 * result + enabledToolTypes.hashCode()
-        return result
+        return targetNodes.hashCode()
     }
 
-    override fun toString(): String =
-        "BrushBehavior(source=$source, target=$target, " +
-            "sourceOutOfRangeBehavior=$sourceOutOfRangeBehavior, " +
-            "sourceValueRangeLowerBound=$sourceValueRangeLowerBound, " +
-            "sourceValueRangeUpperBound=$sourceValueRangeUpperBound, " +
-            "targetModifierRangeLowerBound=$targetModifierRangeLowerBound, " +
-            "targetModifierRangeUpperBound=$targetModifierRangeUpperBound, " +
-            "responseCurve=$responseCurve, responseTimeMillis=$responseTimeMillis, " +
-            "enabledToolTypes=$enabledToolTypes, isFallbackFor=$isFallbackFor)"
+    override fun toString(): String = "BrushBehavior($targetNodes)"
 
     /** Delete native BrushBehavior memory. */
     protected fun finalize() {
@@ -454,7 +423,7 @@
      * [BrushBehavior].
      */
     public class Source private constructor(@JvmField internal val value: Int) {
-        public fun toSimpleString(): String =
+        internal fun toSimpleString(): String =
             when (this) {
                 CONSTANT_ZERO -> "CONSTANT_ZERO"
                 NORMALIZED_PRESSURE -> "NORMALIZED_PRESSURE"
@@ -768,7 +737,7 @@
     /** List of tip properties that can be modified by a [BrushBehavior]. */
     public class Target private constructor(@JvmField internal val value: Int) {
 
-        public fun toSimpleString(): String =
+        internal fun toSimpleString(): String =
             when (this) {
                 WIDTH_MULTIPLIER -> "WIDTH_MULTIPLIER"
                 HEIGHT_MULTIPLIER -> "HEIGHT_MULTIPLIER"
@@ -908,7 +877,7 @@
      * [sourceValueRangeLowerBound, sourceValueRangeUpperBound].
      */
     public class OutOfRange private constructor(@JvmField internal val value: Int) {
-        public fun toSimpleString(): String =
+        internal fun toSimpleString(): String =
             when (this) {
                 CLAMP -> "CLAMP"
                 REPEAT -> "REPEAT"
@@ -954,7 +923,7 @@
     /** List of input properties that might not be reported by inputs. */
     public class OptionalInputProperty private constructor(@JvmField internal val value: Int) {
 
-        public fun toSimpleString(): String =
+        internal fun toSimpleString(): String =
             when (this) {
                 PRESSURE -> "PRESSURE"
                 TILT -> "TILT"
@@ -1017,6 +986,8 @@
 
         internal fun toSimpleString(): String =
             when (this) {
+                DISTANCE_IN_CENTIMETERS -> "DISTANCE_IN_CENTIMETERS"
+                DISTANCE_IN_MULTIPLES_OF_BRUSH_SIZE -> "DISTANCE_IN_MULTIPLES_OF_BRUSH_SIZE"
                 TIME_IN_SECONDS -> "TIME_IN_SECONDS"
                 else -> "INVALID"
             }
@@ -1031,8 +1002,22 @@
         override fun hashCode(): Int = value.hashCode()
 
         public companion object {
+            /**
+             * Value damping occurs over distance traveled by the input pointer, and the
+             * [dampingGap] is measured in centimeters. If the input data does not indicate the
+             * relationship between stroke units and physical units (e.g. as may be the case for
+             * programmatically-generated inputs), then no damping will be performed (i.e. the
+             * [dampingGap] will be treated as zero).
+             */
+            @JvmField public val DISTANCE_IN_CENTIMETERS: DampingSource = DampingSource(0)
+            /**
+             * Value damping occurs over distance traveled by the input pointer, and the
+             * [dampingGap] is measured in multiples of the brush size.
+             */
+            @JvmField
+            public val DISTANCE_IN_MULTIPLES_OF_BRUSH_SIZE: DampingSource = DampingSource(1)
             /** Value damping occurs over time, and the [dampingGap] is measured in seconds. */
-            @JvmField public val TIME_IN_SECONDS: DampingSource = DampingSource(0)
+            @JvmField public val TIME_IN_SECONDS: DampingSource = DampingSource(2)
 
             private const val PREFIX = "BrushBehavior.DampingSource."
         }
diff --git a/ink/ink-brush/src/jvmAndroidMain/kotlin/androidx/ink/brush/EasingFunction.kt b/ink/ink-brush/src/jvmAndroidMain/kotlin/androidx/ink/brush/EasingFunction.kt
index b39a502..790cac0 100644
--- a/ink/ink-brush/src/jvmAndroidMain/kotlin/androidx/ink/brush/EasingFunction.kt
+++ b/ink/ink-brush/src/jvmAndroidMain/kotlin/androidx/ink/brush/EasingFunction.kt
@@ -35,7 +35,7 @@
     public class Predefined private constructor(@JvmField internal val value: Int) :
         EasingFunction() {
 
-        public fun toSimpleString(): String =
+        internal fun toSimpleString(): String =
             when (value) {
                 0 -> "LINEAR"
                 1 -> "EASE"
@@ -264,7 +264,7 @@
     public class StepPosition private constructor(@JvmField internal val value: Int) :
         EasingFunction() {
 
-        public fun toSimpleString(): String =
+        internal fun toSimpleString(): String =
             when (value) {
                 0 -> "JUMP_END"
                 1 -> "JUMP_START"
diff --git a/ink/ink-brush/src/jvmAndroidMain/kotlin/androidx/ink/brush/StockBrushes.kt b/ink/ink-brush/src/jvmAndroidMain/kotlin/androidx/ink/brush/StockBrushes.kt
index 5cb0b21..27523e0 100644
--- a/ink/ink-brush/src/jvmAndroidMain/kotlin/androidx/ink/brush/StockBrushes.kt
+++ b/ink/ink-brush/src/jvmAndroidMain/kotlin/androidx/ink/brush/StockBrushes.kt
@@ -38,7 +38,9 @@
  */
 @OptIn(ExperimentalInkCustomBrushApi::class)
 public object StockBrushes {
-    @get:RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+
+    @get:RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) // PublicApiNotReadyForJetpackReview
+
     // Needed on both property and on getter for AndroidX build, but the Kotlin compiler doesn't
     // like it on the getter so suppress its complaint.
     @ExperimentalInkCustomBrushApi
diff --git a/ink/ink-brush/src/jvmAndroidTest/kotlin/androidx/ink/brush/BrushBehaviorTest.kt b/ink/ink-brush/src/jvmAndroidTest/kotlin/androidx/ink/brush/BrushBehaviorTest.kt
index 9fc1779..18d8afe 100644
--- a/ink/ink-brush/src/jvmAndroidTest/kotlin/androidx/ink/brush/BrushBehaviorTest.kt
+++ b/ink/ink-brush/src/jvmAndroidTest/kotlin/androidx/ink/brush/BrushBehaviorTest.kt
@@ -425,7 +425,12 @@
 
     @Test
     fun dampingSourceConstants_areDistinct() {
-        val list = listOf<BrushBehavior.DampingSource>(BrushBehavior.DampingSource.TIME_IN_SECONDS)
+        val list =
+            listOf<BrushBehavior.DampingSource>(
+                BrushBehavior.DampingSource.DISTANCE_IN_CENTIMETERS,
+                BrushBehavior.DampingSource.DISTANCE_IN_MULTIPLES_OF_BRUSH_SIZE,
+                BrushBehavior.DampingSource.TIME_IN_SECONDS,
+            )
         assertThat(list.toSet()).hasSize(list.size)
     }
 
@@ -433,6 +438,11 @@
     fun dampingSourceHashCode_withIdenticalValues_match() {
         assertThat(BrushBehavior.DampingSource.TIME_IN_SECONDS.hashCode())
             .isEqualTo(BrushBehavior.DampingSource.TIME_IN_SECONDS.hashCode())
+
+        assertThat(BrushBehavior.DampingSource.TIME_IN_SECONDS.hashCode())
+            .isNotEqualTo(
+                BrushBehavior.DampingSource.DISTANCE_IN_MULTIPLES_OF_BRUSH_SIZE.hashCode()
+            )
     }
 
     @Test
@@ -440,11 +450,17 @@
         assertThat(BrushBehavior.DampingSource.TIME_IN_SECONDS)
             .isEqualTo(BrushBehavior.DampingSource.TIME_IN_SECONDS)
 
+        assertThat(BrushBehavior.DampingSource.TIME_IN_SECONDS)
+            .isNotEqualTo(BrushBehavior.DampingSource.DISTANCE_IN_MULTIPLES_OF_BRUSH_SIZE)
         assertThat(BrushBehavior.DampingSource.TIME_IN_SECONDS).isNotEqualTo(null)
     }
 
     @Test
     fun dampingSourceToString_returnsCorrectString() {
+        assertThat(BrushBehavior.DampingSource.DISTANCE_IN_CENTIMETERS.toString())
+            .isEqualTo("BrushBehavior.DampingSource.DISTANCE_IN_CENTIMETERS")
+        assertThat(BrushBehavior.DampingSource.DISTANCE_IN_MULTIPLES_OF_BRUSH_SIZE.toString())
+            .isEqualTo("BrushBehavior.DampingSource.DISTANCE_IN_MULTIPLES_OF_BRUSH_SIZE")
         assertThat(BrushBehavior.DampingSource.TIME_IN_SECONDS.toString())
             .isEqualTo("BrushBehavior.DampingSource.TIME_IN_SECONDS")
     }
@@ -1174,27 +1190,25 @@
     fun brushBehaviorToString_returnsReasonableString() {
         assertThat(
                 BrushBehavior(
-                        source = BrushBehavior.Source.NORMALIZED_PRESSURE,
-                        target = BrushBehavior.Target.WIDTH_MULTIPLIER,
-                        sourceValueRangeLowerBound = 0.0f,
-                        sourceValueRangeUpperBound = 1.0f,
-                        targetModifierRangeLowerBound = 1.0f,
-                        targetModifierRangeUpperBound = 1.75f,
-                        sourceOutOfRangeBehavior = BrushBehavior.OutOfRange.CLAMP,
-                        responseCurve = EasingFunction.Predefined.EASE_IN_OUT,
-                        responseTimeMillis = 1L,
-                        enabledToolTypes = setOf(InputToolType.STYLUS),
+                        listOf(
+                            BrushBehavior.TargetNode(
+                                target = BrushBehavior.Target.WIDTH_MULTIPLIER,
+                                targetModifierRangeLowerBound = 1.0f,
+                                targetModifierRangeUpperBound = 1.75f,
+                                input =
+                                    BrushBehavior.SourceNode(
+                                        source = BrushBehavior.Source.NORMALIZED_PRESSURE,
+                                        sourceValueRangeLowerBound = 0.0f,
+                                        sourceValueRangeUpperBound = 1.0f,
+                                    ),
+                            )
+                        )
                     )
                     .toString()
             )
             .isEqualTo(
-                "BrushBehavior(source=BrushBehavior.Source.NORMALIZED_PRESSURE, " +
-                    "target=BrushBehavior.Target.WIDTH_MULTIPLIER, " +
-                    "sourceOutOfRangeBehavior=BrushBehavior.OutOfRange.CLAMP, " +
-                    "sourceValueRangeLowerBound=0.0, sourceValueRangeUpperBound=1.0, " +
-                    "targetModifierRangeLowerBound=1.0, targetModifierRangeUpperBound=1.75, " +
-                    "responseCurve=EasingFunction.Predefined.EASE_IN_OUT, responseTimeMillis=1, " +
-                    "enabledToolTypes=[InputToolType.STYLUS], isFallbackFor=null)"
+                "BrushBehavior([TargetNode(WIDTH_MULTIPLIER, 1.0, 1.75, " +
+                    "SourceNode(NORMALIZED_PRESSURE, 0.0, 1.0, CLAMP))])"
             )
     }
 
diff --git a/ink/ink-geometry/build.gradle b/ink/ink-geometry/build.gradle
index 790375b..7363544 100644
--- a/ink/ink-geometry/build.gradle
+++ b/ink/ink-geometry/build.gradle
@@ -50,6 +50,8 @@
         implementation(libs.junit)
         implementation(libs.kotlinTest)
         implementation(libs.truth)
+        implementation(project(":ink:ink-brush"))
+        implementation(project(":ink:ink-strokes"))
       }
     }
 
@@ -58,7 +60,9 @@
     }
 
     jvmTest {
-      dependsOn(jvmAndroidTest)
+      // TODO: b/362697089 - add `dependsOn(jvmAndroidTest)` to run the tests
+      //   in a JVM environment in addition to on Android emulators, once the
+      //   mysterious SIGSEGV is resolved.
     }
 
     androidMain {
diff --git a/ink/ink-geometry/src/jvmAndroidMain/kotlin/androidx/ink/geometry/BoxAccumulator.kt b/ink/ink-geometry/src/jvmAndroidMain/kotlin/androidx/ink/geometry/BoxAccumulator.kt
index f14b398..79501d8 100644
--- a/ink/ink-geometry/src/jvmAndroidMain/kotlin/androidx/ink/geometry/BoxAccumulator.kt
+++ b/ink/ink-geometry/src/jvmAndroidMain/kotlin/androidx/ink/geometry/BoxAccumulator.kt
@@ -72,23 +72,16 @@
      */
     public fun isEmpty(): Boolean = !hasBounds
 
-    /**
-     * Populates this [BoxAccumulator] with the same values contained in [input].
-     *
-     * @return `this`
-     */
+    /** Populates this [BoxAccumulator] with the same values contained in [input]. */
     public fun populateFrom(input: BoxAccumulator): BoxAccumulator {
         reset().add(input)
         return this
     }
 
-    /**
-     * Reset this object to have no bounds.
-     *
-     * @return `this`
-     */
+    /** Reset this object to have no bounds. Returns the same instance to chain function calls. */
     // TODO: b/355248266 - @UsedByNative("envelope_jni_helper.cc") must go in Proguard config file
     // instead.
+
     public fun reset(): BoxAccumulator {
         hasBounds = false
         _bounds.setXBounds(Float.NaN, Float.NaN).setYBounds(Float.NaN, Float.NaN)
@@ -119,8 +112,7 @@
     }
 
     /**
-     * Expands the accumulated bounding box (if necessary) such that it also contains [point]. If
-     * [point] is null, this is a no-op.
+     * Expands the accumulated bounding box (if necessary) such that it also contains [point].
      *
      * @return `this`
      */
@@ -139,8 +131,7 @@
     }
 
     /**
-     * Expands the accumulated bounding box (if necessary) such that it also contains [segment]. If
-     * [segment] is null, this is a no-op.
+     * Expands the accumulated bounding box (if necessary) such that it also contains [segment].
      *
      * @return `this`
      */
@@ -161,8 +152,7 @@
     }
 
     /**
-     * Expands the accumulated bounding box (if necessary) such that it also contains [triangle]. If
-     * [triangle] is null, this is a no-op.
+     * Expands the accumulated bounding box (if necessary) such that it also contains [triangle].
      *
      * @return `this`
      */
@@ -209,7 +199,7 @@
 
     /**
      * Expands the accumulated bounding box (if necessary) such that it also contains
-     * [parallelogram]. If [parallelogram] is null, this is a no-op.
+     * [parallelogram].
      *
      * @return `this`
      */
@@ -233,7 +223,7 @@
 
     /**
      * Expands the accumulated bounding box (if necessary) such that it also contains [mesh]. If
-     * [mesh] is null or empty, this is a no-op.
+     * [mesh] is empty, this is a no-op.
      *
      * @return `this`
      */
@@ -260,6 +250,7 @@
      */
     // TODO: b/355248266 - @UsedByNative("envelope_jni_helper.cc") must go in Proguard config file
     // instead.
+
     @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) // NonPublicApi
     public fun overwriteFrom(x1: Float, y1: Float, x2: Float, y2: Float): BoxAccumulator {
         hasBounds = true
diff --git a/ink/ink-geometry/src/jvmAndroidMain/kotlin/androidx/ink/geometry/MutableParallelogram.kt b/ink/ink-geometry/src/jvmAndroidMain/kotlin/androidx/ink/geometry/MutableParallelogram.kt
index c700fc1..59f8453 100644
--- a/ink/ink-geometry/src/jvmAndroidMain/kotlin/androidx/ink/geometry/MutableParallelogram.kt
+++ b/ink/ink-geometry/src/jvmAndroidMain/kotlin/androidx/ink/geometry/MutableParallelogram.kt
@@ -66,10 +66,11 @@
 
     public constructor() : this(MutableVec(), 0f, 0f, Angle.ZERO, 0f)
 
-    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) // NonPublicApi
+
     // TODO: b/355248266 - @UsedByNative("parallelogram_jni_helper.cc") must go in Proguard config
     // file instead.
-    private fun setCenterDimensionsRotationAndShear(
+    public fun setCenterDimensionsRotationAndShear(
         centerX: Float,
         centerY: Float,
         width: Float,
diff --git a/ink/ink-geometry/src/jvmAndroidTest/kotlin/androidx/ink/geometry/BoxAccumulatorTest.kt b/ink/ink-geometry/src/jvmAndroidTest/kotlin/androidx/ink/geometry/BoxAccumulatorTest.kt
index fd7ee5b..2957dc5 100644
--- a/ink/ink-geometry/src/jvmAndroidTest/kotlin/androidx/ink/geometry/BoxAccumulatorTest.kt
+++ b/ink/ink-geometry/src/jvmAndroidTest/kotlin/androidx/ink/geometry/BoxAccumulatorTest.kt
@@ -16,6 +16,10 @@
 
 package androidx.ink.geometry
 
+import androidx.ink.brush.Brush
+import androidx.ink.brush.StockBrushes
+import androidx.ink.strokes.Stroke
+import androidx.ink.strokes.testing.buildStrokeInputBatchFromPoints
 import com.google.common.truth.Truth.assertThat
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -666,4 +670,43 @@
 
     private val rect1234 = ImmutableBox.fromTwoPoints(ImmutableVec(1F, 2F), ImmutableVec(3F, 4F))
     private val rect5678 = ImmutableBox.fromTwoPoints(ImmutableVec(5F, 6F), ImmutableVec(7F, 8F))
+
+    @Test
+    fun add_meshToEmptyEnvelope_updatesEnvelope() {
+        val envelope = BoxAccumulator()
+        val mesh = buildTestStrokeShape()
+
+        envelope.add(mesh)
+
+        assertThat(envelope.isEmpty()).isFalse()
+    }
+
+    @Test
+    fun add_meshToNonEmptyEnvelope_updatesEnvelope() {
+        val envelope =
+            BoxAccumulator()
+                .add(
+                    MutableBox()
+                        .populateFromTwoPoints(ImmutableVec(10F, 10F), ImmutableVec(20F, 25F))
+                )
+        val mesh = buildTestStrokeShape()
+
+        envelope.add(mesh)
+
+        // Verify that the original lower-bounds for envelope (10F, 10F) are updated after adding
+        // the
+        // mesh.
+        assertThat(envelope.isEmpty()).isFalse()
+        val box = envelope.box!!
+        assertThat(box.xMin).isLessThan(10f)
+        assertThat(box.yMin).isLessThan(10f)
+    }
+
+    private fun buildTestStrokeShape(): PartitionedMesh {
+        return Stroke(
+                Brush(family = StockBrushes.markerLatest, size = 10f, epsilon = 0.1f),
+                buildStrokeInputBatchFromPoints(floatArrayOf(10f, 3f, 20f, 5f)).asImmutable(),
+            )
+            .shape
+    }
 }
diff --git a/ink/ink-geometry/src/jvmAndroidTest/kotlin/androidx/ink/geometry/IntersectionTest.kt b/ink/ink-geometry/src/jvmAndroidTest/kotlin/androidx/ink/geometry/IntersectionTest.kt
index 390b62d..247b394 100644
--- a/ink/ink-geometry/src/jvmAndroidTest/kotlin/androidx/ink/geometry/IntersectionTest.kt
+++ b/ink/ink-geometry/src/jvmAndroidTest/kotlin/androidx/ink/geometry/IntersectionTest.kt
@@ -16,7 +16,11 @@
 
 package androidx.ink.geometry
 
+import androidx.ink.brush.Brush
+import androidx.ink.brush.StockBrushes
 import androidx.ink.geometry.Intersection.intersects
+import androidx.ink.strokes.Stroke
+import androidx.ink.strokes.testing.buildStrokeInputBatchFromPoints
 import com.google.common.truth.Truth.assertThat
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -267,6 +271,26 @@
         assertThat(rect.intersects(interiorPoint)).isTrue()
     }
 
+    /**
+     * Verifies that [intersects] calls the correct JNI method for [PartitionedMesh] and [Point].
+     *
+     * For this test, the [PartitionedMesh] consists of triangulation of a straight line [Stroke]
+     * from (10, 3) to (20, 5), consisting of 126 triangles. `intersectingPoint` intersects with at
+     * least one of those triangles, while `nonIntersectingPoint` does not intersect with any
+     * triangle.
+     */
+    @Test
+    fun intersects_forPointAndPartitionedMesh_callsJniAndReturnsBool() {
+        val mesh = buildTestStrokeShape()
+        val intersectingPoint = MutableVec(15f, 4f)
+        val nonIntersectingPoint = ImmutableVec(100f, 200f)
+
+        assertThat(mesh.intersects(intersectingPoint, SCALE_TRANSFORM)).isTrue()
+        assertThat(mesh.intersects(nonIntersectingPoint, SCALE_TRANSFORM)).isFalse()
+        assertThat(intersectingPoint.intersects(mesh, AffineTransform.IDENTITY)).isTrue()
+        assertThat(nonIntersectingPoint.intersects(mesh, AffineTransform.IDENTITY)).isFalse()
+    }
+
     @Test
     fun intersects_whenPointBoxDoesNotIntersect_returnsFalse() {
         val rect = ImmutableBox.fromTwoPoints(ImmutableVec(-1f, 3.2f), ImmutableVec(7f, 11.8f))
@@ -454,6 +478,28 @@
         assertThat(farParallelogram.intersects(segment)).isFalse()
     }
 
+    /**
+     * Verifies that [intersects] calls the correct JNI method for [PartitionedMesh] and [Segment].
+     *
+     * For this test, the [PartitionedMesh] consists of triangulation of a straight line [Stroke]
+     * from (10, 3) to (20, 5), consisting of 126 triangles. `intersectingSegment` intersects with
+     * at least one of those triangles, while `nonIntersectingSegment` does not intersect with any
+     * triangle.
+     */
+    @Test
+    fun intersects_forSegmentAndPartitionedMesh_callsJniAndReturnsBool() {
+        val mesh = buildTestStrokeShape()
+        val intersectingSegment =
+            ImmutableSegment(start = ImmutableVec(14f, 3f), end = ImmutableVec(16f, 5f))
+        val nonIntersectingSegment =
+            ImmutableSegment(start = ImmutableVec(100f, 200f), end = ImmutableVec(300f, 400f))
+
+        assertThat(mesh.intersects(intersectingSegment, SCALE_TRANSFORM)).isTrue()
+        assertThat(mesh.intersects(nonIntersectingSegment, SCALE_TRANSFORM)).isFalse()
+        assertThat(intersectingSegment.intersects(mesh, AffineTransform.IDENTITY)).isTrue()
+        assertThat(nonIntersectingSegment.intersects(mesh, AffineTransform.IDENTITY)).isFalse()
+    }
+
     @Test
     fun intersects_forEqualTriangles_returnsTrue() {
         val triangle1 =
@@ -648,6 +694,36 @@
         assertThat(farParallelogram.intersects(triangle)).isFalse()
     }
 
+    /**
+     * Verifies that [intersects] calls the correct JNI method for [PartitionedMesh] and [Triangle].
+     *
+     * For this test, the [PartitionedMesh] consists of triangulation of a straight line [Stroke]
+     * from (10, 3) to (20, 5), consisting of 126 triangles. `intersectingTriangle` intersects with
+     * at least one of those triangles, while `nonIntersectingTriangle` does not intersect with any
+     * triangle.
+     */
+    @Test
+    fun intersects_forTriangleAndPartitionedMesh_callsJniAndReturnsBool() {
+        val mesh = buildTestStrokeShape()
+        val intersectingTriangle =
+            ImmutableTriangle(
+                p0 = ImmutableVec(0f, 1f),
+                p1 = ImmutableVec(10f, 3f),
+                p2 = ImmutableVec(5f, 20f),
+            )
+        val nonIntersectingTriangle =
+            ImmutableTriangle(
+                p0 = ImmutableVec(100f, 200f),
+                p1 = ImmutableVec(300f, 400f),
+                p2 = ImmutableVec(200f, 600f),
+            )
+
+        assertThat(mesh.intersects(intersectingTriangle, AffineTransform.IDENTITY)).isTrue()
+        assertThat(mesh.intersects(nonIntersectingTriangle, SCALE_TRANSFORM)).isFalse()
+        assertThat(intersectingTriangle.intersects(mesh, AffineTransform.IDENTITY)).isTrue()
+        assertThat(nonIntersectingTriangle.intersects(mesh, SCALE_TRANSFORM)).isFalse()
+    }
+
     @Test
     fun intersects_forEqualBoxs_returnsTrue() {
         val rect1 = ImmutableBox.fromTwoPoints(ImmutableVec(0f, 1f), ImmutableVec(31.6f, 10f))
@@ -750,6 +826,31 @@
         assertThat(farParallelogram.intersects(rect)).isFalse()
     }
 
+    /**
+     * Verifies that [intersects] calls the correct JNI method for [PartitionedMesh] and [Box].
+     *
+     * For this test, the [PartitionedMesh] consists of triangulation of a straight line [Stroke]
+     * from (10, 3) to (20, 5), consisting of 126 triangles. `intersectingBox` intersects with at
+     * least one of those triangles, while `nonIntersectingBox` does not intersect with any
+     * triangle.
+     */
+    @Test
+    fun intersects_forBoxAndPartitionedMesh_callsJniAndReturnsBool() {
+        val mesh = buildTestStrokeShape()
+        val intersectingBox =
+            ImmutableBox.fromTwoPoints(ImmutableVec(15f, 4f), ImmutableVec(20f, 5f))
+        val nonIntersectingBox =
+            ImmutableBox.fromTwoPoints(ImmutableVec(100f, 200f), ImmutableVec(300f, 400f))
+
+        assertThat(mesh.intersects(intersectingBox, AffineTransform.IDENTITY)).isTrue()
+        assertThat(mesh.intersects(nonIntersectingBox, AffineTransform.IDENTITY)).isFalse()
+        assertThat(mesh.intersects(nonIntersectingBox, SCALE_TRANSFORM)).isFalse()
+        assertThat(intersectingBox.intersects(mesh, AffineTransform.IDENTITY)).isTrue()
+        assertThat(nonIntersectingBox.intersects(mesh, AffineTransform.IDENTITY)).isFalse()
+        assertThat(nonIntersectingBox.intersects(mesh, AffineTransform.IDENTITY)).isFalse()
+        assertThat(nonIntersectingBox.intersects(mesh, SCALE_TRANSFORM)).isFalse()
+    }
+
     @Test
     fun intersects_forEqualsParallelograms_returnsTrue() {
         val parallelogram1 =
@@ -848,7 +949,120 @@
         assertThat(farParallelogram.intersects(parallelogram)).isFalse()
     }
 
+    /**
+     * Verifies that [intersects] calls the correct JNI method for [PartitionedMesh] and
+     * [Parallelogram].
+     *
+     * For this test, the [PartitionedMesh] consists of triangulation of a straight line [Stroke]
+     * from (10, 3) to (20, 5), consisting of 126 triangles. `intersectingParallelogram` intersects
+     * with at least one of those triangles, while `nonIntersectingParallelogram` does not intersect
+     * with any triangle.
+     */
+    @Test
+    fun intersects_forParallelogramAndPartitionedMesh_callsJniAndReturnsBool() {
+        val mesh = buildTestStrokeShape()
+        val intersectingParallelogram =
+            ImmutableParallelogram.fromCenterAndDimensions(
+                center = ImmutableVec(15f, 4f),
+                width = 3f,
+                height = 2f,
+            )
+        val nonIntersectingParallelogram =
+            ImmutableParallelogram.fromCenterDimensionsRotationAndShear(
+                center = ImmutableVec(100f, 200f),
+                width = 300f,
+                height = 400f,
+                rotation = Angle.QUARTER_TURN_RADIANS,
+                shearFactor = 1f,
+            )
+
+        assertThat(mesh.intersects(intersectingParallelogram, AffineTransform.IDENTITY)).isTrue()
+        assertThat(mesh.intersects(nonIntersectingParallelogram, AffineTransform.IDENTITY))
+            .isFalse()
+        assertThat(mesh.intersects(nonIntersectingParallelogram, SCALE_TRANSFORM)).isFalse()
+        assertThat(intersectingParallelogram.intersects(mesh, AffineTransform.IDENTITY)).isTrue()
+        assertThat(nonIntersectingParallelogram.intersects(mesh, AffineTransform.IDENTITY))
+            .isFalse()
+        assertThat(nonIntersectingParallelogram.intersects(mesh, SCALE_TRANSFORM)).isFalse()
+    }
+
+    /**
+     * Verifies that [intersects] calls the correct JNI method for two [PartitionedMesh]s.
+     *
+     * For this test, `mesh` consists of triangulation of a straight line [Stroke] from (10, 3) to
+     * (20, 5), consisting of 126 triangles. `intersectingShape` consists of triangulation of a
+     * straight line [Stroke] from (14, 3) to (14, 5), and intersects with at least one of these
+     * triangles. `nonIntersectingShape` consists of triangulation of a straight line [Stroke] from
+     * (100, 3) to (200, 5), and does not intersect with any triangle.
+     */
+    @Test
+    fun intersects_forTwoPartitionedMeshes_callsJniAndReturnsBool() {
+        val mesh = buildTestStrokeShape()
+        val intersectingShape =
+            Stroke(
+                    TEST_BRUSH,
+                    buildStrokeInputBatchFromPoints(floatArrayOf(14f, 3f, 14f, 5f)).asImmutable(),
+                )
+                .shape
+        val nonIntersectingShape =
+            Stroke(
+                    TEST_BRUSH,
+                    buildStrokeInputBatchFromPoints(floatArrayOf(100f, 3f, 200f, 5f)).asImmutable(),
+                )
+                .shape
+
+        assertThat(
+                mesh.intersects(
+                    intersectingShape,
+                    AffineTransform.IDENTITY,
+                    AffineTransform.IDENTITY
+                )
+            )
+            .isTrue()
+        assertThat(
+                mesh.intersects(
+                    nonIntersectingShape,
+                    AffineTransform.IDENTITY,
+                    AffineTransform.IDENTITY
+                )
+            )
+            .isFalse()
+        assertThat(
+                intersectingShape.intersects(
+                    mesh,
+                    AffineTransform.IDENTITY,
+                    AffineTransform.IDENTITY
+                )
+            )
+            .isTrue()
+        assertThat(
+                nonIntersectingShape.intersects(
+                    mesh,
+                    AffineTransform.IDENTITY,
+                    AffineTransform.IDENTITY
+                )
+            )
+            .isFalse()
+        assertThat(nonIntersectingShape.intersects(mesh, AffineTransform.IDENTITY, SCALE_TRANSFORM))
+            .isFalse()
+        assertThat(nonIntersectingShape.intersects(mesh, SCALE_TRANSFORM, AffineTransform.IDENTITY))
+            .isFalse()
+        assertThat(nonIntersectingShape.intersects(mesh, SCALE_TRANSFORM, SCALE_TRANSFORM))
+            .isFalse()
+    }
+
+    private fun buildTestStrokeShape(): PartitionedMesh {
+        return Stroke(
+                TEST_BRUSH,
+                buildStrokeInputBatchFromPoints(floatArrayOf(10f, 3f, 20f, 5f)).asImmutable(),
+            )
+            .shape
+    }
+
     companion object {
         private val SCALE_TRANSFORM = ImmutableAffineTransform(2f, 0f, 0f, 0f, 5f, 0f)
+
+        private val TEST_BRUSH =
+            Brush(family = StockBrushes.markerLatest, size = 10f, epsilon = 0.1f)
     }
 }
diff --git a/ink/ink-geometry/src/jvmAndroidTest/kotlin/androidx/ink/geometry/PartitionedMeshTest.kt b/ink/ink-geometry/src/jvmAndroidTest/kotlin/androidx/ink/geometry/PartitionedMeshTest.kt
index 682b88d..10bf22b 100644
--- a/ink/ink-geometry/src/jvmAndroidTest/kotlin/androidx/ink/geometry/PartitionedMeshTest.kt
+++ b/ink/ink-geometry/src/jvmAndroidTest/kotlin/androidx/ink/geometry/PartitionedMeshTest.kt
@@ -16,8 +16,13 @@
 
 package androidx.ink.geometry
 
+import androidx.ink.brush.Brush
+import androidx.ink.brush.StockBrushes
+import androidx.ink.strokes.Stroke
+import androidx.ink.strokes.testing.buildStrokeInputBatchFromPoints
 import com.google.common.truth.Truth.assertThat
 import kotlin.test.assertFailsWith
+import kotlin.test.assertNotNull
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
@@ -82,4 +87,296 @@
         assertThat(string).contains("meshes")
         assertThat(string).contains("nativeAddress")
     }
+
+    @Test
+    fun populateOutlinePosition_withStrokeShape_shouldBeWithinBounds() {
+        val shape = buildTestStrokeShape()
+
+        assertThat(shape.renderGroupCount).isEqualTo(1)
+        assertThat(shape.outlineCount(0)).isEqualTo(1)
+        assertThat(shape.outlineVertexCount(0, 0)).isGreaterThan(2)
+
+        val bounds = assertNotNull(shape.bounds)
+
+        val p = MutableVec()
+        for (outlineVertexIndex in 0 until shape.outlineVertexCount(0, 0)) {
+            shape.populateOutlinePosition(groupIndex = 0, outlineIndex = 0, outlineVertexIndex, p)
+            assertThat(p.x).isAtLeast(bounds.xMin)
+            assertThat(p.y).isAtLeast(bounds.yMin)
+            assertThat(p.x).isAtMost(bounds.xMax)
+            assertThat(p.y).isAtMost(bounds.yMax)
+        }
+    }
+
+    @Test
+    fun populateOutlinePosition_whenBadIndex_shouldThrow() {
+        val shape = buildTestStrokeShape()
+
+        val p = MutableVec()
+        assertFailsWith<IllegalArgumentException> { (shape.populateOutlinePosition(-1, 0, 0, p)) }
+        assertFailsWith<IllegalArgumentException> { (shape.populateOutlinePosition(5, 0, 0, p)) }
+        assertFailsWith<IllegalArgumentException> { (shape.populateOutlinePosition(0, -1, 0, p)) }
+        assertFailsWith<IllegalArgumentException> { (shape.populateOutlinePosition(0, 5, 0, p)) }
+        assertFailsWith<IllegalArgumentException> { (shape.populateOutlinePosition(0, 0, -1, p)) }
+        assertFailsWith<IllegalArgumentException> { (shape.populateOutlinePosition(0, 1, 999, p)) }
+    }
+
+    @Test
+    fun meshFormat_forTestShape_isEquivalentToMeshFormatOfFirstMesh() {
+        val partitionedMesh = buildTestStrokeShape()
+        assertThat(partitionedMesh.renderGroupCount).isEqualTo(1)
+        val shapeFormat = partitionedMesh.renderGroupFormat(0)
+        val meshes = partitionedMesh.renderGroupMeshes(0)
+        assertThat(meshes).isNotEmpty()
+        assertThat(shapeFormat).isNotNull()
+        assertThat(meshes[0].format.isUnpackedEquivalent(shapeFormat)).isTrue()
+    }
+
+    /**
+     * Verifies that [PartitionedMesh.coverage] calls the correct JNI method for [PartitionedMesh]
+     * and [Triangle].
+     */
+    @Test
+    fun coverage_forPartitionedMeshAndTriangle_callsJniAndReturnsFloat() {
+        val partitionedMesh = buildTestStrokeShape()
+        val intersectingTriangle =
+            ImmutableTriangle(
+                p0 = ImmutableVec(15f, 4f),
+                p1 = ImmutableVec(20f, 4f),
+                p2 = ImmutableVec(20f, 5f),
+            )
+        val externalTriangle =
+            ImmutableTriangle(
+                p0 = ImmutableVec(100f, 200f),
+                p1 = ImmutableVec(300f, 400f),
+                p2 = ImmutableVec(100f, 700f),
+            )
+
+        assertThat(partitionedMesh.coverage(intersectingTriangle)).isGreaterThan(0f)
+        assertThat(partitionedMesh.coverage(externalTriangle)).isEqualTo(0f)
+        assertThat(partitionedMesh.coverage(externalTriangle, SCALE_TRANSFORM)).isEqualTo(0f)
+    }
+
+    /**
+     * Verifies that [PartitionedMesh.coverage] calls the correct JNI method for [PartitionedMesh]
+     * and [Box].
+     */
+    @Test
+    fun coverage_forPartitionedMeshAndBox_callsJniAndReturnsFloat() {
+        val partitionedMesh = buildTestStrokeShape()
+        val intersectingBox =
+            ImmutableBox.fromTwoPoints(ImmutableVec(0f, 0f), ImmutableVec(100f, 100f))
+        val externalBox =
+            ImmutableBox.fromTwoPoints(ImmutableVec(100f, 200f), ImmutableVec(300f, 400f))
+
+        assertThat(partitionedMesh.coverage(intersectingBox)).isGreaterThan(0f)
+        assertThat(partitionedMesh.coverage(externalBox)).isEqualTo(0f)
+        assertThat(partitionedMesh.coverage(externalBox, SCALE_TRANSFORM)).isEqualTo(0f)
+    }
+
+    /**
+     * Verifies that [PartitionedMesh.coverage] calls the correct JNI method for [PartitionedMesh]
+     * and [Parallelogram].
+     */
+    @Test
+    fun coverage_forPartitionedMeshAndParallelogram_callsJniAndReturnsFloat() {
+        val partitionedMesh = buildTestStrokeShape()
+        val intersectingParallelogram =
+            ImmutableParallelogram.fromCenterAndDimensions(
+                center = ImmutableVec(15f, 4f),
+                width = 20f,
+                height = 9f,
+            )
+        val externalParallelogram =
+            ImmutableParallelogram.fromCenterDimensionsRotationAndShear(
+                center = ImmutableVec(100f, 200f),
+                width = 3f,
+                height = 4f,
+                rotation = Angle.QUARTER_TURN_RADIANS,
+                shearFactor = 2f,
+            )
+
+        assertThat(partitionedMesh.coverage(intersectingParallelogram)).isGreaterThan(0f)
+        assertThat(partitionedMesh.coverage(externalParallelogram)).isEqualTo(0f)
+        assertThat(partitionedMesh.coverage(externalParallelogram, SCALE_TRANSFORM)).isEqualTo(0f)
+    }
+
+    /**
+     * Verifies that [PartitionedMesh.coverage] calls the correct JNI method for two
+     * [PartitionedMesh]es.
+     */
+    @Test
+    fun coverage_forTwoPartitionedMeshes_callsJniAndReturnsFloat() {
+        val partitionedMesh = buildTestStrokeShape()
+        val intersectingShape =
+            Stroke(
+                    TEST_BRUSH,
+                    buildStrokeInputBatchFromPoints(floatArrayOf(15f, 3f, 15f, 5f)).asImmutable(),
+                )
+                .shape
+        val externalShape =
+            Stroke(
+                    TEST_BRUSH,
+                    buildStrokeInputBatchFromPoints(floatArrayOf(100f, 3f, 200f, 5f)).asImmutable(),
+                )
+                .shape
+
+        assertThat(partitionedMesh.coverage(intersectingShape)).isGreaterThan(0f)
+        assertThat(partitionedMesh.coverage(externalShape)).isEqualTo(0f)
+        assertThat(partitionedMesh.coverage(externalShape, SCALE_TRANSFORM)).isEqualTo(0f)
+    }
+
+    /**
+     * Verifies that [PartitionedMesh.coverageIsGreaterThan] calls the correct JNI method for
+     * [PartitionedMesh] and [Triangle].
+     */
+    @Test
+    fun coverageIsGreaterThan_forPartitionedMeshAndTriangle_callsJniAndReturnsFloat() {
+        val partitionedMesh = buildTestStrokeShape()
+        val intersectingTriangle =
+            ImmutableTriangle(
+                p0 = ImmutableVec(15f, 4f),
+                p1 = ImmutableVec(20f, 4f),
+                p2 = ImmutableVec(20f, 5f),
+            )
+        val externalTriangle =
+            ImmutableTriangle(
+                p0 = ImmutableVec(100f, 200f),
+                p1 = ImmutableVec(300f, 400f),
+                p2 = ImmutableVec(100f, 700f),
+            )
+
+        assertThat(partitionedMesh.coverageIsGreaterThan(intersectingTriangle, 0f)).isTrue()
+        assertThat(partitionedMesh.coverageIsGreaterThan(externalTriangle, 0f)).isFalse()
+        assertThat(partitionedMesh.coverageIsGreaterThan(externalTriangle, 0f, SCALE_TRANSFORM))
+            .isFalse()
+    }
+
+    /**
+     * Verifies that [PartitionedMesh.coverageIsGreaterThan] calls the correct JNI method for
+     * [PartitionedMesh] and [Box].
+     *
+     * For this test, `partitionedMesh` consists of triangulation of a straight line [Stroke] from
+     * (10, 3) to (20, 5), with the total area of all triangles equal to 180.471. `intersectingBox`
+     * intersects three of these triangles with the total area of 103.05. It has a coverage of
+     * 103.05 / 180.471 ≈ 0.57. `externalBox` does not intersect with any of the triangles and has a
+     * coverage of zero.
+     */
+    @Test
+    fun coverageIsGreaterThan_forPartitionedMeshAndBox_callsJniAndReturnsBoolean() {
+        val partitionedMesh = buildTestStrokeShape()
+        val intersectingBox =
+            ImmutableBox.fromTwoPoints(ImmutableVec(10f, 3f), ImmutableVec(15f, 5f))
+        val externalBox =
+            ImmutableBox.fromTwoPoints(ImmutableVec(100f, 200f), ImmutableVec(300f, 400f))
+
+        assertThat(partitionedMesh.coverageIsGreaterThan(intersectingBox, 0f)).isTrue()
+        assertThat(partitionedMesh.coverageIsGreaterThan(externalBox, 0f)).isFalse()
+        assertThat(partitionedMesh.coverageIsGreaterThan(externalBox, 0f, SCALE_TRANSFORM))
+            .isFalse()
+    }
+
+    /**
+     * Verifies that [PartitionedMesh.coverageIsGreaterThan] calls the correct JNI method for
+     * [PartitionedMesh] and [Parallelogram].
+     */
+    @Test
+    fun coverageIsGreaterThan_forPartitionedMeshAndParallelogram_callsJniAndReturnsBoolean() {
+        val partitionedMesh = buildTestStrokeShape()
+        val intersectingParallelogram =
+            ImmutableParallelogram.fromCenterAndDimensions(
+                center = ImmutableVec(15f, 4f),
+                width = 20f,
+                height = 9f,
+            )
+        val externalParallelogram =
+            ImmutableParallelogram.fromCenterDimensionsRotationAndShear(
+                center = ImmutableVec(100f, 200f),
+                width = 3f,
+                height = 4f,
+                rotation = Angle.QUARTER_TURN_RADIANS,
+                shearFactor = 2f,
+            )
+
+        assertThat(partitionedMesh.coverageIsGreaterThan(intersectingParallelogram, 0f)).isTrue()
+        assertThat(partitionedMesh.coverageIsGreaterThan(externalParallelogram, 0f)).isFalse()
+        assertThat(
+                partitionedMesh.coverageIsGreaterThan(externalParallelogram, 0f, SCALE_TRANSFORM)
+            )
+            .isFalse()
+    }
+
+    /**
+     * Verifies that [PartitionedMesh.coverage] calls the correct JNI method for two
+     * [PartitionedMesh]s.
+     *
+     * For this test, `partitionedMesh` consists of triangulation of a straight line [Stroke] from
+     * (10, 3) to (20, 5), with the total area of all triangles equal to 180.471.
+     * `intersectingShape` consists of the triangulation of a straight vertical line [Stroke] from
+     * [15, 3] to [15, 5], and intersects with 6 of these triangles with the total area of 106.95.
+     * It has a coverage of (106.95) / 180.471 ≈ 0.59. `externalShape` does not intersect with
+     * `partitionedMesh`, and has zero coverage.
+     */
+    @Test
+    fun coverageIsGreaterThan_forTwoPartitionedMeshes_callsJniAndReturnsBoolean() {
+        val partitionedMesh = buildTestStrokeShape()
+        val intersectingShape =
+            Stroke(
+                    TEST_BRUSH,
+                    buildStrokeInputBatchFromPoints(floatArrayOf(15f, 3f, 15f, 5f)).asImmutable(),
+                )
+                .shape
+        val externalShape =
+            Stroke(
+                    TEST_BRUSH,
+                    buildStrokeInputBatchFromPoints(floatArrayOf(100f, 3f, 200f, 5f)).asImmutable(),
+                )
+                .shape
+
+        assertThat(partitionedMesh.coverageIsGreaterThan(intersectingShape, 0f)).isTrue()
+        assertThat(partitionedMesh.coverageIsGreaterThan(externalShape, 0f)).isFalse()
+        assertThat(partitionedMesh.coverageIsGreaterThan(externalShape, 0f, SCALE_TRANSFORM))
+            .isFalse()
+    }
+
+    @Test
+    fun initializeSpatialIndex() {
+        val partitionedMesh = buildTestStrokeShape()
+        assertThat(partitionedMesh.isSpatialIndexInitialized()).isFalse()
+
+        partitionedMesh.initializeSpatialIndex()
+
+        assertThat(partitionedMesh.isSpatialIndexInitialized()).isTrue()
+    }
+
+    @Test
+    fun isSpatialIndexInitialized_afterGeometryQuery_returnsTrue() {
+        val partitionedMesh = buildTestStrokeShape()
+        val triangle =
+            ImmutableTriangle(
+                p0 = ImmutableVec(15f, 4f),
+                p1 = ImmutableVec(20f, 4f),
+                p2 = ImmutableVec(20f, 5f),
+            )
+        assertThat(partitionedMesh.isSpatialIndexInitialized()).isFalse()
+
+        assertThat(partitionedMesh.coverage(triangle)).isNotNaN()
+
+        assertThat(partitionedMesh.isSpatialIndexInitialized()).isTrue()
+    }
+
+    private fun buildTestStrokeShape(): PartitionedMesh {
+        return Stroke(
+                TEST_BRUSH,
+                buildStrokeInputBatchFromPoints(floatArrayOf(10f, 3f, 20f, 5f)).asImmutable(),
+            )
+            .shape
+    }
+
+    companion object {
+        private val SCALE_TRANSFORM = ImmutableAffineTransform(1.2f, 0f, 0f, 0f, 0.4f, 0f)
+
+        private val TEST_BRUSH =
+            Brush(family = StockBrushes.markerLatest, size = 10f, epsilon = 0.1f)
+    }
 }
diff --git a/compose/material3/adaptive/adaptive-render-strategy/api/current.txt b/ink/ink-strokes/api/current.txt
similarity index 100%
rename from compose/material3/adaptive/adaptive-render-strategy/api/current.txt
rename to ink/ink-strokes/api/current.txt
diff --git a/compose/material3/adaptive/adaptive-render-strategy/api/res-current.txt b/ink/ink-strokes/api/res-current.txt
similarity index 100%
rename from compose/material3/adaptive/adaptive-render-strategy/api/res-current.txt
rename to ink/ink-strokes/api/res-current.txt
diff --git a/compose/material3/adaptive/adaptive-render-strategy/api/restricted_current.txt b/ink/ink-strokes/api/restricted_current.txt
similarity index 100%
rename from compose/material3/adaptive/adaptive-render-strategy/api/restricted_current.txt
rename to ink/ink-strokes/api/restricted_current.txt
diff --git a/ink/ink-strokes/build.gradle b/ink/ink-strokes/build.gradle
new file mode 100644
index 0000000..7d8cfc8
--- /dev/null
+++ b/ink/ink-strokes/build.gradle
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2024 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.
+ */
+
+import androidx.build.LibraryType
+import androidx.build.PlatformIdentifier
+
+plugins {
+  id("AndroidXPlugin")
+  id("com.android.library")
+}
+
+androidXMultiplatform {
+  jvm()
+  android()
+
+  defaultPlatform(PlatformIdentifier.JVM)
+
+  sourceSets {
+    commonMain {
+      dependencies {
+        api(libs.kotlinStdlib)
+
+        implementation("androidx.annotation:annotation:1.8.0")
+      }
+    }
+
+    jvmAndroidMain {
+      dependsOn(commonMain)
+      dependencies {
+        implementation(project(":ink:ink-nativeloader"))
+        implementation(project(":ink:ink-geometry"))
+        implementation(project(":ink:ink-brush"))
+      }
+    }
+
+    jvmAndroidTest {
+      dependsOn(commonTest)
+      dependencies {
+        implementation(libs.junit)
+        implementation(libs.kotlinTest)
+        implementation(libs.truth)
+        implementation(project(":ink:ink-geometry"))
+        implementation(project(":ink:ink-brush"))
+      }
+    }
+
+    jvmMain {
+      dependsOn(jvmAndroidMain)
+    }
+
+    jvmTest {
+      // TODO: b/362697089 - add `dependsOn(jvmAndroidTest)` to run the tests
+      //   in a JVM environment in addition to on Android emulators, once the
+      //   mysterious SIGSEGV is resolved.
+    }
+
+    androidMain {
+      dependsOn(jvmAndroidMain)
+    }
+
+    androidInstrumentedTest {
+      dependsOn(jvmAndroidTest)
+      dependencies {
+        implementation(libs.testExtJunit)
+        implementation(libs.testRules)
+        implementation(libs.testRunner)
+        implementation(libs.espressoCore)
+        implementation(libs.junit)
+        implementation(libs.truth)
+      }
+    }
+  }
+}
+
+android {
+  namespace = "androidx.ink.strokes"
+}
+
+androidx {
+    name = "Ink Strokes"
+    type = LibraryType.PUBLISHED_LIBRARY
+    inceptionYear = "2024"
+    description = "Create beautiful strokes"
+}
diff --git a/ink/ink-strokes/src/jvmAndroidMain/kotlin/androidx/ink/strokes/InProgressStroke.kt b/ink/ink-strokes/src/jvmAndroidMain/kotlin/androidx/ink/strokes/InProgressStroke.kt
new file mode 100644
index 0000000..6bfd24e
--- /dev/null
+++ b/ink/ink-strokes/src/jvmAndroidMain/kotlin/androidx/ink/strokes/InProgressStroke.kt
@@ -0,0 +1,643 @@
+/*
+ * Copyright (C) 2024 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.ink.strokes
+
+import androidx.annotation.IntRange
+import androidx.annotation.RestrictTo
+import androidx.ink.brush.Brush
+import androidx.ink.brush.InputToolType
+import androidx.ink.geometry.BoxAccumulator
+import androidx.ink.geometry.MeshFormat
+import androidx.ink.geometry.MutableVec
+import androidx.ink.nativeloader.NativeLoader
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+import java.nio.ShortBuffer
+
+/**
+ * Use an [InProgressStroke] to efficiently build a stroke over multiple rendering frames with
+ * incremental inputs.
+ *
+ * To use an [InProgressStroke], you would typically:
+ * 1. Begin a stroke by calling [start] with a chosen [Brush].
+ * 2. Repeatedly update the stroke:
+ *     1. Call [enqueueInputs] with any new real and predicted stroke inputs.
+ *     2. Call [updateShape] when [needsUpdate] is `true` and new geometry is needed for rendering.
+ *     3. Render the current stroke mesh or outlines, either via a provided renderer that accepts an
+ *        [InProgressStroke] or by using the various getters on this type with a custom renderer.
+ * 3. Call [finishInput] once there are no more inputs for this stroke (e.g. the user lifts the
+ *    stylus from the screen).
+ * 4. Continue to call [updateShape] and render after [finishInput] until [getNeedsUpdate] returns
+ *    false (to allow any lingering brush animations to complete).
+ * 5. Extract the completed stroke by calling [toImmutable].
+ * 6. For best performance, reuse this object and go back to step 1 rather than allocating a new
+ *    instance.
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) // PublicApiNotReadyForJetpackReview
+@Suppress("NotCloseable") // Finalize is only used to free the native peer.
+public class InProgressStroke {
+
+    /** A handle to the underlying native [InProgressStroke] object. */
+    internal var nativePointer: Long = nativeCreateInProgressStroke()
+        private set
+
+    /**
+     * The [Brush] currently being used to generate the stroke content. To set this, call [start].
+     */
+    public var brush: Brush? = null
+        private set
+
+    /**
+     * Incremented when the stroke is changed, to know if data obtained from the other functions on
+     * this class is still accurate. This can be used for cache invalidation.
+     */
+    @get:RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+    public var version: Long = 0L
+        private set
+
+    /**
+     * Clears the in progress stroke without starting a new one.
+     *
+     * This includes clearing or resetting any existing inputs, mesh data, and updated region.
+     */
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+    public fun clear() {
+        nativeClear(nativePointer)
+        this.brush = null
+        version++
+    }
+
+    /**
+     * Clears and starts a new stroke with the given [brush].
+     *
+     * This includes clearing or resetting any existing inputs, mesh data, and updated region. This
+     * method must be called at least once after construction before starting to call
+     * [enqueueInputs] or [updateShape].
+     */
+    public fun start(brush: Brush) {
+        nativeStart(nativePointer, brush.nativePointer)
+        this.brush = brush
+        version++
+    }
+
+    /**
+     * Enqueues the incremental [realInputs] and sets the prediction to [predictedInputs],
+     * overwriting any previous prediction. Queued inputs will be processed on the next call to
+     * [updateShape].
+     *
+     * This method requires that:
+     * * [start] has been previously called to set the current [Brush].
+     * * [finishInput] has not been called since the last call to [start].
+     * * [realInputs] and [predictedInputs] must form a valid stroke input sequence together with
+     *   previously added real input.
+     *
+     * If the above requirements are not satisfied, the [Result] will be a failure and this object
+     * is left in the state it had prior to the call.
+     *
+     * Either one or both of [realInputs] and [predictedInputs] may be empty.
+     */
+    public fun enqueueInputs(
+        realInputs: StrokeInputBatch,
+        predictedInputs: StrokeInputBatch,
+    ): Result<Unit> =
+        nativeEnqueueInputs(nativePointer, realInputs.nativePointer, predictedInputs.nativePointer)
+            ?.let { Result.failure(IllegalArgumentException(it)) }
+            ?: Result.success(Unit).also { version++ }
+
+    /** @see enqueueInputs */
+    public fun enqueueInputsOrThrow(
+        realInputs: StrokeInputBatch,
+        predictedInputs: StrokeInputBatch,
+    ): Unit = enqueueInputs(realInputs, predictedInputs).getOrThrow()
+
+    /**
+     * Indicates that the inputs for the current stroke are finished. After calling this, it is an
+     * error to call [enqueueInputs] until [start] is called again to start a new stroke. This
+     * method is idempotent; it has no effect if [start] was never called, or if this method has
+     * already been called since the last call to [start].
+     */
+    public fun finishInput(): Unit = nativeFinishInput(nativePointer).also { version++ }
+
+    /**
+     * Updates the stroke geometry up to the given duration since the start of the stroke. This will
+     * will consume any inputs queued up by calls to [enqueueInputs], and cause brush animations (if
+     * any) to progress up to the specified time. Any stroke geometry resulting from
+     * previously-predicted input from before the previous call to this method will be cleared.
+     *
+     * This method requires that:
+     * * [start] has been previously called to set the current [brush].
+     * * The value of [currentElapsedTimeMillis] passed into this method over the course of a single
+     *   stroke must be non-decreasing and non-negative. Its default value causes all ongoing stroke
+     *   animations to be completed immediately. To have animations progress at their intended rate,
+     *   pass in values for this field that are in the same time base as the
+     *   [StrokeInput.elapsedTimeMillis] values being passed to [enqueueInputs], repeatedly until
+     *   [isInputFinished] returns `true`.
+     *
+     * If the above requirements are not satisfied, the [Result] will be a failure and this object
+     * is left in the state it had prior to the call.
+     */
+    public fun updateShape(currentElapsedTimeMillis: Long = Long.MAX_VALUE): Result<Unit> =
+        nativeUpdateShape(nativePointer, currentElapsedTimeMillis)?.let {
+            Result.failure(IllegalArgumentException(it))
+        } ?: Result.success(Unit).also { version++ }
+
+    /** @see updateShape */
+    public fun updateShapeOrThrow(currentElapsedTimeMillis: Long = Long.MAX_VALUE): Unit =
+        updateShape(currentElapsedTimeMillis).getOrThrow()
+
+    /**
+     * Returns `true` if [finishInput] has been called since the last call to [start], or if [start]
+     * hasn't been called yet. If this returns `true`, it is an error to call [enqueueInputs].
+     */
+    public fun isInputFinished(): Boolean = nativeIsInputFinished(nativePointer)
+
+    /**
+     * Returns `true` if calling [updateShape] would have any effect on the stroke (and should thus
+     * be called before the next render), or `false` if no calls to [updateShape] are currently
+     * needed. Specifically:
+     * * If the brush has one or more timed animation behavior that are still active (which can be
+     *   true even after inputs are finished), returns `true`.
+     * * If there are no active animation behaviors, but there are pending inputs from an
+     *   [enqueueInputs] call that have not yet been consumed by a call to [updateShape], returns
+     *   `true`.
+     * * Otherwise, returns `false`.
+     *
+     * Once [isInputFinished] returns `true` and this method returns `false`, the stroke is
+     * considered "dry", and will not change any further until the next call to [start].
+     */
+    public fun getNeedsUpdate(): Boolean = nativeNeedsUpdate(nativePointer)
+
+    /**
+     * Copies the current input, brush, and geometry as of the last call to [start] or [updateShape]
+     * to a new [Stroke].
+     *
+     * The resulting [Stroke] will not be modified if further inputs are added to this
+     * [InProgressStroke], and a [Stroke] created by another call to this method will not modify or
+     * be connected in any way to the prior [Stroke].
+     */
+    public fun toImmutable(): Stroke {
+        return Stroke(nativeCopyToStroke(nativePointer), requireNotNull(brush))
+    }
+
+    /**
+     * Returns the number of [StrokeInput]s in the stroke so far. This counts all of the real inputs
+     * and the most-recently-processed sequence of predicted inputs.
+     */
+    @IntRange(from = 0) public fun getInputCount(): Int = nativeInputCount(nativePointer)
+
+    /* Returns the number of real inputs in the stroke so far, not counting any prediction. */
+    @IntRange(from = 0) public fun getRealInputCount(): Int = nativeRealInputCount(nativePointer)
+
+    /** Returns the number of inputs in the current stroke prediction. */
+    @IntRange(from = 0)
+    public fun getPredictedInputCount(): Int = nativePredictedInputCount(nativePointer)
+
+    /**
+     * Add the specified range of inputs from this stroke to the output [MutableStrokeInputBatch].
+     */
+    @JvmOverloads
+    public fun populateInputs(
+        out: MutableStrokeInputBatch,
+        @IntRange(from = 0) from: Int = 0,
+        @IntRange(from = 0) to: Int = getInputCount(),
+    ): MutableStrokeInputBatch {
+        val size = getInputCount()
+        require(from >= 0) { "index ($from) must be >= 0" }
+        require(to <= size && to >= from) { "to ($to) must be in [from=$from, inputCount=$size]" }
+        nativeFillInputs(nativePointer, out.nativePointer, from, to)
+        return out
+    }
+
+    /**
+     * Gets the value of the i-th input and overwrites [out]. Requires that [index] is positive and
+     * less than [getInputCount].
+     */
+    public fun populateInput(out: StrokeInput, @IntRange(from = 0) index: Int): StrokeInput {
+        val size = getInputCount()
+        require(index < size && index >= 0) { "index ($index) must be in [0, inputCount=$size)" }
+        nativeGetAndOverwriteInput(nativePointer, out, index, InputToolType::class.java)
+        return out
+    }
+
+    /**
+     * Returns the number of `BrushCoats` for the current brush, or zero if [start] has not been
+     * called.
+     */
+    @IntRange(from = 0)
+    public fun getBrushCoatCount(): Int =
+        nativeBrushCoatCount(nativePointer).also { check(it >= 0) }
+
+    /** @see getBrushCoatCount */
+    @IntRange(from = 0)
+    @Deprecated("Renamed to getBrushCoatCount")
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) // NonPublicApi
+    public fun brushCoatCount(): Int = getBrushCoatCount()
+
+    /**
+     * Writes to [outBoxAccumulator] the bounding box of the vertex positions of the mesh for brush
+     * coat [coatIndex].
+     *
+     * @param outBoxAccumulator The pre-allocated [BoxAccumulator] to be filled with the result.
+     */
+    public fun populateMeshBounds(
+        @IntRange(from = 0) coatIndex: Int,
+        outBoxAccumulator: BoxAccumulator
+    ): BoxAccumulator {
+        require(coatIndex >= 0 && coatIndex < getBrushCoatCount()) {
+            "coatIndex=$coatIndex must be between 0 and brushCoatCount=${getBrushCoatCount()}"
+        }
+        nativeGetMeshBounds(nativePointer, coatIndex, outBoxAccumulator)
+        return outBoxAccumulator
+    }
+
+    /**
+     * Returns the bounding rectangle of mesh positions added, modified, or removed by calls to
+     * [updateShape] since the most recent call to [start] or [resetUpdatedRegion].
+     *
+     * @param outBoxAccumulator The pre-allocated [BoxAccumulator] to be filled with the result.
+     */
+    public fun populateUpdatedRegion(outBoxAccumulator: BoxAccumulator): BoxAccumulator {
+        nativeFillUpdatedRegion(nativePointer, outBoxAccumulator)
+        return outBoxAccumulator
+    }
+
+    /** Call after making use of a value from [populateUpdatedRegion] to reset the accumulation. */
+    public fun resetUpdatedRegion(): Unit = nativeResetUpdatedRegion(nativePointer)
+
+    /**
+     * Returns the number of outlines for the specified brush coat. Calls to functions that accept
+     * an outlineIndex must treat the result of this function as an upper bound.
+     *
+     * @param coatIndex Must be between 0 (inclusive) and the result of [getBrushCoatCount]
+     *   (exclusive).
+     */
+    @IntRange(from = 0)
+    public fun getOutlineCount(@IntRange(from = 0) coatIndex: Int): Int {
+        require(coatIndex >= 0 && coatIndex < getBrushCoatCount()) {
+            "coatIndex=$coatIndex must be between 0 and brushCoatCount=${getBrushCoatCount()}"
+        }
+        return nativeGetOutlineCount(nativePointer, coatIndex).also { check(it >= 0) }
+    }
+
+    /** @see getOutlineCount */
+    @IntRange(from = 0)
+    @Deprecated("Renamed to getOutlineCount")
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) // NonPublicApi
+    public fun outlineCount(@IntRange(from = 0) coatIndex: Int): Int = getOutlineCount(coatIndex)
+
+    /**
+     * Returns the number of outline points for the specified outline and brush coat.
+     * [populateOutlinePosition] must treat the result of this as the upper bound of its
+     * outlineVertexIndex parameter.
+     *
+     * @param coatIndex Must be between 0 (inclusive) and the result of [getBrushCoatCount]
+     *   (exclusive).
+     * @param outlineIndex Must be between 0 (inclusive) and the result of [getOutlineCount] for the
+     *   same [coatIndex] (exclusive).
+     */
+    @IntRange(from = 0)
+    public fun getOutlineVertexCount(
+        @IntRange(from = 0) coatIndex: Int,
+        @IntRange(from = 0) outlineIndex: Int,
+    ): Int {
+        require(outlineIndex >= 0 && outlineIndex < getOutlineCount(coatIndex)) {
+            "outlineIndex=$outlineIndex must be between 0 and outlineCount=${getOutlineCount(coatIndex)}"
+        }
+        return nativeGetOutlineVertexCount(nativePointer, coatIndex, outlineIndex).also {
+            check(it >= 0)
+        }
+    }
+
+    /** @see getOutlineVertexCount */
+    @Deprecated("Renamed to getOutlineVertexCount")
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) // NonPublicApi
+    @IntRange(from = 0)
+    public fun outlineVertexCount(
+        @IntRange(from = 0) coatIndex: Int,
+        @IntRange(from = 0) outlineIndex: Int,
+    ): Int = getOutlineVertexCount(coatIndex, outlineIndex)
+
+    /**
+     * Fills [outPosition] with the x- and y- coordinates of the specified outline vertex.
+     *
+     * @param coatIndex Must be between 0 (inclusive) and the result of [getBrushCoatCount]
+     *   (exclusive).
+     * @param outlineIndex Must be between 0 (inclusive) and the result of [getOutlineCount]
+     *   (exclusive) for the same [coatIndex].
+     * @param outlineVertexIndex Must be between 0 (inclusive) and the result of
+     *   [getOutlineVertexCount] (exclusive) for the same [coatIndex] and [outlineIndex].
+     * @param outPosition the pre-allocated [MutableVec] to be filled with the result.
+     */
+    public fun populateOutlinePosition(
+        @IntRange(from = 0) coatIndex: Int,
+        @IntRange(from = 0) outlineIndex: Int,
+        @IntRange(from = 0) outlineVertexIndex: Int,
+        outPosition: MutableVec,
+    ) {
+        val outlineVertexCount = getOutlineVertexCount(coatIndex, outlineIndex)
+        require(outlineVertexIndex >= 0 && outlineVertexIndex < outlineVertexCount) {
+            "outlineVertexIndex=$outlineVertexIndex must be between 0 and " +
+                "outlineVertexCount($outlineVertexIndex)=$outlineVertexCount"
+        }
+        nativeFillOutlinePosition(
+            nativePointer,
+            coatIndex,
+            outlineIndex,
+            outlineVertexIndex,
+            outPosition,
+        )
+    }
+
+    // Internal methods for rendering the MutableMesh(es) of an InProgressStroke. These mesh data
+    // accessors are made available via InProgressStroke because the underlying
+    // native InProgressStroke manages the memory for its meshes.
+
+    /**
+     * Returns the number of individual meshes in the specified brush coat of this stroke.
+     *
+     * TODO: b/294561921 - Implement multiple meshes. This value is hard coded to 1 in
+     *   [in_progress_stroke_jni.cc].
+     */
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+    public fun getMeshPartitionCount(@IntRange(from = 0) coatIndex: Int): Int {
+        require(coatIndex >= 0 && coatIndex < getBrushCoatCount()) {
+            "coatIndex=$coatIndex must be between 0 and brushCoatCount=${getBrushCoatCount()}"
+        }
+        return nativeGetMeshPartitionCount(nativePointer, coatIndex)
+    }
+
+    /**
+     * Gets the number of vertices in the mesh from the mesh at [partitionIndex] for brush coat
+     * [coatIndex] which must be less than that coat's [getMeshPartitionCount].
+     */
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+    public fun getVertexCount(@IntRange(from = 0) coatIndex: Int, partitionIndex: Int): Int {
+        require(partitionIndex in 0 until getMeshPartitionCount(coatIndex)) {
+            "Cannot get vertex count at partitionIndex $partitionIndex out of range [0, ${getMeshPartitionCount(coatIndex)})."
+        }
+        return nativeGetVertexCount(nativePointer, coatIndex, partitionIndex)
+    }
+
+    /**
+     * Gets the vertices of the mesh at [partitionIndex] for brush coat [coatIndex] which must be
+     * less than that coat's [getMeshPartitionCount].
+     */
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+    public fun getRawVertexBuffer(
+        @IntRange(from = 0) coatIndex: Int,
+        partitionIndex: Int,
+    ): ByteBuffer {
+        require(partitionIndex in 0 until getMeshPartitionCount(coatIndex)) {
+            "Cannot get raw vertex buffer at partitionIndex $partitionIndex out of range [0, ${getMeshPartitionCount(coatIndex)})."
+        }
+        return (nativeGetRawVertexData(nativePointer, coatIndex, partitionIndex)
+                ?: ByteBuffer.allocate(0))
+            .asReadOnlyBuffer()
+    }
+
+    /**
+     * Gets the triangle indices of the mesh at [partitionIndex] for brush coat [coatIndex] which
+     * must be less than that coat's [getMeshPartitionCount].
+     */
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+    public fun getRawTriangleIndexBuffer(
+        @IntRange(from = 0) coatIndex: Int,
+        partitionIndex: Int,
+    ): ShortBuffer {
+        require(partitionIndex in 0 until getMeshPartitionCount(coatIndex)) {
+            "Cannot get raw triangle index buffer at partitionIndex $partitionIndex out of range [0, ${getMeshPartitionCount(coatIndex)})."
+        }
+        val triangleIndexStride =
+            nativeGetTriangleIndexStride(nativePointer, coatIndex, partitionIndex)
+        check(triangleIndexStride == Short.SIZE_BYTES) {
+            "Only 16-bit triangle indices are supported, but got stride of $triangleIndexStride"
+        }
+        // The resulting buffer is writeable, so first make it readonly. Then, because Java
+        // ByteBuffers
+        // defaults to a fixed endianness instead of using the endianness of the device, insist on
+        // ByteOrder.nativeOrder.
+        // TODO: b/302535371 - There is a bug in the combined use of .asReadOnlyBuffer() and
+        // .order(),
+        // such that the returned buffer is NOT readonly.
+        return (nativeGetRawTriangleIndexData(nativePointer, coatIndex, partitionIndex)
+                ?: ByteBuffer.allocate(0))
+            .asReadOnlyBuffer()
+            .order(ByteOrder.nativeOrder())
+            .asShortBuffer()
+    }
+
+    /**
+     * Gets the [MeshFormat] of the mesh at [partitionIndex] for brush coat [coatIndex] which must
+     * be less than that coat's [getMeshPartitionCount].
+     */
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+    public fun getMeshFormat(@IntRange(from = 0) coatIndex: Int, partitionIndex: Int): MeshFormat {
+        require(partitionIndex in 0 until getMeshPartitionCount(coatIndex)) {
+            "Cannot get mesh format at partitionIndex $partitionIndex out of range [0, ${getMeshPartitionCount(coatIndex)})."
+        }
+        return MeshFormat(nativeAllocMeshFormatCopy(nativePointer, coatIndex, partitionIndex))
+    }
+
+    protected fun finalize() {
+        // NOMUTANTS -- Not tested post garbage collection.
+        if (nativePointer == 0L) return
+        nativeFreeInProgressStroke(nativePointer)
+        nativePointer = 0
+    }
+
+    /** Create underlying native object and return reference for all subsequent native calls. */
+    private external fun nativeCreateInProgressStroke():
+        Long // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+
+    private external fun nativeClear(
+        nativePointer: Long
+    ) // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+
+    private external fun nativeStart(
+        nativePointer: Long,
+        brushNativePointer: Long
+    ) // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+
+    /** Returns null on success or an error message string on failure. */
+    // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+    private external fun nativeEnqueueInputs(
+        nativePointer: Long,
+        realInputsPointer: Long,
+        predictedInputsPointer: Long,
+    ): String?
+
+    /** Returns null on success or an error message string on failure. */
+    // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+    private external fun nativeUpdateShape(nativePointer: Long, currentElapsedTime: Long): String?
+
+    private external fun nativeFinishInput(
+        nativePointer: Long
+    ) // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+
+    private external fun nativeIsInputFinished(
+        nativePointer: Long
+    ): Boolean // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+
+    private external fun nativeNeedsUpdate(
+        nativePointer: Long
+    ): Boolean // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+
+    /** Returns the native pointer for an `ink::Stroke`, to be wrapped by a [Stroke]. */
+    private external fun nativeCopyToStroke(
+        nativePointer: Long
+    ): Long // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+
+    private external fun nativeInputCount(
+        nativePointer: Long
+    ): Int // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+
+    private external fun nativeRealInputCount(
+        nativePointer: Long
+    ): Int // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+
+    private external fun nativePredictedInputCount(
+        nativePointer: Long
+    ): Int // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+
+    // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+    private external fun nativeFillInputs(
+        nativePointer: Long,
+        mutableStrokeInputBatchPointer: Long,
+        from: Int,
+        to: Int,
+    )
+
+    /**
+     * The [toolTypeClass] parameter is passed as a convenience to native JNI code, to avoid it
+     * needing to do a reflection-based FindClass lookup.
+     */
+    // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+    private external fun nativeGetAndOverwriteInput(
+        nativePointer: Long,
+        input: StrokeInput,
+        index: Int,
+        toolTypeClass: Class<InputToolType>,
+    )
+
+    private external fun nativeBrushCoatCount(
+        nativePointer: Long
+    ): Int // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+
+    /** Writes the bounding region to [outEnvelope]. */
+    // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+    private external fun nativeGetMeshBounds(
+        nativePointer: Long,
+        coatIndex: Int,
+        outEnvelope: BoxAccumulator,
+    )
+
+    /** Returns the number of mesh partitions. */
+    private external fun nativeGetMeshPartitionCount(
+        nativePointer: Long,
+        coatIndex: Int
+    ): Int // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+
+    /** Returns the number of vertices in the mesh at [partitionIndex]. */
+    // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+    private external fun nativeGetVertexCount(
+        nativePointer: Long,
+        coatIndex: Int,
+        partitionIndex: Int,
+    ): Int
+
+    /**
+     * Returns a direct [ByteBuffer] wrapped around the contents of [RawVertexData] for the mesh at
+     * [partitionIndex]. It will be writeable, so be sure to only expose a read-only wrapper of it.
+     */
+    // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+    private external fun nativeGetRawVertexData(
+        nativePointer: Long,
+        coatIndex: Int,
+        partitionIndex: Int,
+    ): ByteBuffer?
+
+    /**
+     * Returns a direct [ByteBuffer] wrapped around the contents of [RawTriangleData] for the mesh
+     * at [partitionIndex]. It will be writeable, so be sure to only expose a read-only wrapper of
+     * it.
+     */
+    // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+    private external fun nativeGetRawTriangleIndexData(
+        nativePointer: Long,
+        coatIndex: Int,
+        partitionIndex: Int,
+    ): ByteBuffer?
+
+    // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+    private external fun nativeGetTriangleIndexStride(
+        nativePointer: Long,
+        coatIndex: Int,
+        partitionIndex: Int,
+    ): Int
+
+    /**
+     * Return the address of a newly allocated copy of the `ink::MeshFormat` belonging to the mesh
+     * at [partitionIndex].
+     */
+    // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+    private external fun nativeAllocMeshFormatCopy(
+        nativePointer: Long,
+        coatIndex: Int,
+        partitionIndex: Int,
+    ): Long
+
+    /** Writes the updated region to [outEnvelope]. */
+    // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+    private external fun nativeFillUpdatedRegion(nativePointer: Long, outEnvelope: BoxAccumulator)
+
+    private external fun nativeResetUpdatedRegion(
+        nativePointer: Long
+    ) // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+
+    private external fun nativeGetOutlineCount(
+        nativePointer: Long,
+        coatIndex: Int
+    ): Int // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+
+    // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+    private external fun nativeGetOutlineVertexCount(
+        nativePointer: Long,
+        coatIndex: Int,
+        outlineIndex: Int,
+    ): Int
+
+    // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+    private external fun nativeFillOutlinePosition(
+        nativePointer: Long,
+        coatIndex: Int,
+        outlineIndex: Int,
+        outlineVertexIndex: Int,
+        outPosition: MutableVec,
+    )
+
+    /** Release the underlying memory allocated in [nativeCreateInProgressStroke]. */
+    private external fun nativeFreeInProgressStroke(
+        nativePointer: Long
+    ) // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+
+    // Companion object gets initialized before anything else.
+    public companion object {
+        init {
+            NativeLoader.load()
+        }
+    }
+}
diff --git a/ink/ink-strokes/src/jvmAndroidMain/kotlin/androidx/ink/strokes/Stroke.kt b/ink/ink-strokes/src/jvmAndroidMain/kotlin/androidx/ink/strokes/Stroke.kt
new file mode 100644
index 0000000..050e442
--- /dev/null
+++ b/ink/ink-strokes/src/jvmAndroidMain/kotlin/androidx/ink/strokes/Stroke.kt
@@ -0,0 +1,218 @@
+/*
+ * Copyright (C) 2024 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.ink.strokes
+
+import androidx.annotation.RestrictTo
+import androidx.ink.brush.Brush
+import androidx.ink.brush.ExperimentalInkCustomBrushApi
+import androidx.ink.geometry.PartitionedMesh
+import androidx.ink.nativeloader.NativeLoader
+
+/**
+ * An immutable object comprised of a [StrokeInputBatch] that represents a user-drawn (or sometimes
+ * synthetic) path, a [Brush] that contains information on how that path should be converted into a
+ * geometric shape and rendered on screen, and a [PartitionedMesh] which is the geometric shape
+ * calculated from the combination of the [StrokeInputBatch] and the [Brush].
+ *
+ * This can be constructed directly from a [StrokeInputBatch] that has already been completed. To
+ * construct a stroke incrementally and render it as input events are received in real time, use
+ * [InProgressStrokesView] or [InProgressStroke], which will ultimately return a [Stroke] when input
+ * is completed.
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) // PublicApiNotReadyForJetpackReview
+@OptIn(ExperimentalInkCustomBrushApi::class)
+@Suppress("NotCloseable") // Finalize is only used to free the native peer.
+public class Stroke {
+
+    /**
+     * Contains information on how the [inputs] should be used to calculate the [shape] and how that
+     * [shape] should be drawn on screen.
+     */
+    public val brush: Brush
+
+    /** The user-drawn (or perhaps synthetically generated) path that this [Stroke] takes. */
+    public val inputs: ImmutableStrokeInputBatch
+
+    /**
+     * The geometric shape of the [Stroke], which can be used to render it on screen and to perform
+     * geometric calculations. This [PartitionedMesh] will have one render group per brush coat in
+     * [brush].
+     */
+    public val shape: PartitionedMesh
+
+    /**
+     * This is the raw pointer address of an `ink::Stroke` that has been heap allocated to be owned
+     * solely by this JVM [Stroke] object. Although the `ink::Stroke` is owned exclusively by this
+     * [Stroke] object, it may be a copy of another `ink::Stroke`, where it has a copy of fairly
+     * lightweight metadata but shares ownership of the more heavyweight `ink::Mesh` objects. This
+     * class is responsible for freeing the `ink::Stroke`, usually through its [finalize] method but
+     * possibly by an explicit [close].
+     */
+    @get:RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+    public var nativeAddress: Long
+        private set
+
+    /** Construct a [Stroke] given a [Brush] and a [StrokeInputBatch], generating its [shape]. */
+    public constructor(brush: Brush, inputs: StrokeInputBatch) {
+        this.brush = brush
+        this.nativeAddress =
+            StrokeJni.createWithBrushAndInputs(brush.nativePointer, inputs.nativePointer)
+        this.shape = PartitionedMesh(StrokeJni.allocShallowCopyOfShape(this.nativeAddress))
+        this.inputs = inputs.asImmutable()
+    }
+
+    /**
+     * Returns a [Stroke] with the brush replaced. This may or may not affect the [shape], but will
+     * not change the [inputs].
+     */
+    public fun copy(brush: Brush): Stroke {
+        // For a pure copy, return the same object because it is immutable.
+        if (brush == this.brush) return this
+
+        // TODO: b/308980197 - Detect when the mesh format cannot support the intended brush and
+        // regenerate the shape in that case.
+        return if (brushWouldHaveDifferentShape(brush)) {
+            Stroke(brush, this.inputs)
+        } else {
+            // Rendering caches use instance comparisons to identify re-usable shapes in the cache.
+            // If a
+            // new stroke has an unchanged shape, use the same instance of [PartitionedMesh] in the
+            // new
+            // [Stroke].
+            Stroke(brush, this.inputs, this.shape)
+        }
+    }
+
+    /**
+     * Returns true if using the given [brush] instead of the current one would result in a
+     * different [PartitionedMesh].
+     */
+    private fun brushWouldHaveDifferentShape(brush: Brush): Boolean {
+        if (
+            this.brush.size != brush.size ||
+                this.brush.epsilon != brush.epsilon ||
+                this.brush.family.coats.size != brush.family.coats.size
+        ) {
+            return true
+        }
+        for (i in 0 until this.brush.family.coats.size) {
+            if (this.brush.family.coats[i].tips != brush.family.coats[i].tips) {
+                return true
+            }
+        }
+        return false
+    }
+
+    /**
+     * Wrap an existing native `ink::Stroke` with a [Stroke]. This is used by internal utilities
+     * that create strokes in native code, such as deserialization. Never pass in a [nativeAddress]
+     * that is already owned by another [Stroke], or that underlying `ink::Stroke` will be freed
+     * twice.
+     */
+    internal constructor(nativeAddress: Long, brush: Brush) {
+        val shape = PartitionedMesh(StrokeJni.allocShallowCopyOfShape(nativeAddress))
+        require(shape.renderGroupCount == brush.family.coats.size) {
+            "The shape must have one render group per brush coat, but found ${shape.renderGroupCount} render groups in shape and ${brush.family.coats.size} brush coats in brush."
+        }
+        this.nativeAddress = nativeAddress
+        this.brush = brush
+        this.inputs = ImmutableStrokeInputBatch(StrokeJni.allocShallowCopyOfInputs(nativeAddress))
+        this.shape = shape
+    }
+
+    /**
+     * Construct a [Stroke] given a [Brush], a [StrokeInputBatch], and a [PartitionedMesh].
+     *
+     * Note that this does not do any validation that [brush] and [inputs] together would produce
+     * [shape]. This constructor is primarily intended for deserialization, in cases where the
+     * [PartitionedMesh] is being stored in addition to the [Brush] and [StrokeInputBatch].
+     */
+    public constructor(brush: Brush, inputs: StrokeInputBatch, shape: PartitionedMesh) {
+        require(shape.renderGroupCount == brush.family.coats.size) {
+            "The shape must have one render group per brush coat, but found ${shape.renderGroupCount} render groups in shape and ${brush.family.coats.size} brush coats in brush."
+        }
+        this.brush = brush
+        this.shape = shape
+        this.nativeAddress =
+            StrokeJni.createWithBrushInputsAndShape(
+                brush.nativePointer,
+                inputs.nativePointer,
+                shape.getNativeAddress(),
+            )
+        this.inputs = inputs.asImmutable()
+    }
+
+    protected fun finalize() {
+        // NOMUTANTS--Not tested post garbage collection.
+        if (nativeAddress == 0L) return
+        StrokeJni.free(nativeAddress)
+        nativeAddress = 0L
+    }
+
+    public override fun toString(): String {
+        return "Stroke(brush=$brush, inputs=$inputs, shape=$shape)"
+    }
+
+    /** Declared as a target for extension functions. */
+    public companion object
+}
+
+/**
+ * Singleton wrapper around native JNI calls.
+ *
+ * The alternative to this is putting the methods in [Stroke] itself (passes down an unused
+ * `jobject`, and doesn't work for native calls used by constructors), or in [Stroke.Companion]
+ * (makes the `JNI_METHOD` naming less clear).
+ */
+private object StrokeJni {
+    init {
+        NativeLoader.load()
+    }
+
+    external fun createWithBrushAndInputs(
+        brushNativePointer: Long,
+        inputs: Long
+    ): Long // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+
+    // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+    external fun createWithBrushInputsAndShape(
+        brushNativePointer: Long,
+        inputs: Long,
+        shape: Long,
+    ): Long
+
+    /**
+     * Returns the address of a new `ink::StrokeInputBatch` that is a shallow copy of the inputs
+     * belonging to the `ink::Stroke` given by the [nativeAddress].
+     */
+    external fun allocShallowCopyOfInputs(
+        nativeAddress: Long
+    ): Long // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+
+    /**
+     * Returns the address of a new `ink::ModeledShape` that is a shallow copy of the shape
+     * belonging to the `ink::Stroke` given by the [nativeAddress].
+     */
+    external fun allocShallowCopyOfShape(
+        nativeAddress: Long
+    ): Long // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+
+    /** Deletes the `ink::Stroke` given by the [nativeAddress]. */
+    external fun free(
+        nativeAddress: Long
+    ) // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+}
diff --git a/ink/ink-strokes/src/jvmAndroidMain/kotlin/androidx/ink/strokes/StrokeInput.kt b/ink/ink-strokes/src/jvmAndroidMain/kotlin/androidx/ink/strokes/StrokeInput.kt
new file mode 100644
index 0000000..f8abb1e
--- /dev/null
+++ b/ink/ink-strokes/src/jvmAndroidMain/kotlin/androidx/ink/strokes/StrokeInput.kt
@@ -0,0 +1,278 @@
+/*
+ * Copyright (C) 2024 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.ink.strokes
+
+import androidx.annotation.IntRange
+import androidx.annotation.RestrictTo
+import androidx.annotation.VisibleForTesting
+import androidx.ink.brush.InputToolType
+
+/**
+ * A single input specifying position, time since the start of the stream, and optionally
+ * [pressure], [tiltRadians], and [orientationRadians].
+ *
+ * This data type is used as an input to [StrokeInputBatch] and [InProgressStroke]. If these are to
+ * be created as part of real-time input, it is recommended to use some sort of object pool so that
+ * new usages can make use of existing objects that have been recycled, rather than allocating new
+ * ones which could introduce unpredictable garbage collection related delays to the time-sensitive
+ * input path. This class has the [update] method for that purpose, rather than being immutable.
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) // PublicApiNotReadyForJetpackReview
+public class StrokeInput {
+    /** The x-coordinate of the input position in stroke space. */
+    public var x: Float = 0F
+        private set
+        get // TODO: b/355248266 - @UsedByNative("stroke_input_jni_helper.cc") must go in Proguard
+
+    // config file instead.
+
+    /** The y-coordinate of the input position in stroke space. */
+    public var y: Float = 0F
+        private set
+        get // TODO: b/355248266 - @UsedByNative("stroke_input_jni_helper.cc") must go in Proguard
+
+    // config file instead.
+
+    /** Time elapsed since the start of the stroke. */
+    public var elapsedTimeMillis: Long = 0L
+        private set
+        get // TODO: b/355248266 - @UsedByNative("stroke_input_jni_helper.cc") must go in Proguard
+
+    // config file instead.
+
+    /** The input device used to generate this stroke input. */
+    public var toolType: InputToolType = InputToolType.UNKNOWN
+        private set
+        get // TODO: b/355248266 - @UsedByNative("stroke_input_jni_helper.cc") must go in Proguard
+
+    // config file instead.
+
+    /**
+     * The physical distance in centimeters that the pointer must travel in order to produce an
+     * input motion of one stroke unit. For stylus/touch, this is the real-world distance that the
+     * stylus/fingertip must move in physical space; for mouse, this is the visual distance that the
+     * mouse pointer must travel along the surface of the display.
+     *
+     * A value of [NO_STROKE_UNIT_LENGTH] indicates that the relationship between stroke space and
+     * physical space is unknown or ill-defined.
+     */
+    public var strokeUnitLengthCm: Float = NO_STROKE_UNIT_LENGTH
+        private set
+        get // TODO: b/355248266 - @UsedByNative("stroke_input_jni_helper.cc") must go in Proguard
+
+    // config file instead.
+
+    /**
+     * Pressure value in the normalized, unitless range of [0, 1] indicating the force exerted
+     * during input.
+     *
+     * A value of [NO_PRESSURE] indicates that pressure is not reported, which can be checked with
+     * [hasPressure].
+     */
+    public var pressure: Float = NO_PRESSURE
+        private set
+        get // TODO: b/355248266 - @UsedByNative("stroke_input_jni_helper.cc") must go in Proguard
+
+    // config file instead.
+
+    /** Whether the [pressure] field contains a valid pressure value. */
+    @get:JvmName("hasPressure")
+    public val hasPressure: Boolean
+        get() = pressure != NO_PRESSURE
+
+    /**
+     * The angle between a stylus and the line perpendicular to the plane of the screen. The value
+     * should be normalized to fall between 0 and π/2 in radians, where 0 is perpendicular to the
+     * screen and π/2 is flat against the drawing surface.
+     *
+     * [NO_TILT] indicates that tilt is not reported, which can be checked with [hasTilt].
+     */
+    public var tiltRadians: Float = NO_TILT
+        private set
+        get // TODO: b/355248266 - @UsedByNative("stroke_input_jni_helper.cc") must go in Proguard
+
+    // config file instead.
+
+    /** Whether the [tiltRadians] field contains a valid tilt value. */
+    @get:JvmName("hasTilt")
+    public val hasTilt: Boolean
+        get() = tiltRadians != NO_TILT
+
+    /**
+     * The angle that indicates the direction in which the stylus is pointing in relation to the
+     * positive x axis. The value should be normalized to fall between 0 and 2π in radians, where 0
+     * means the ray from the stylus tip to the end is along positive x and values increase towards
+     * the positive y-axis.
+     *
+     * When [tiltRadians] is equal to π/2, the value for [orientationRadians] is indeterminant.
+     *
+     * [NO_ORIENTATION] indicates that orientation is not reported, which can be checked with
+     * [hasOrientation]. Note, that this is a separate condition from the orientation being
+     * indeterminant when [tiltRadians] is π/2.
+     */
+    public var orientationRadians: Float = NO_ORIENTATION
+        private set
+        get // TODO: b/355248266 - @UsedByNative("stroke_input_jni_helper.cc") must go in Proguard
+
+    // config file instead.
+
+    /** Whether the [orientationRadians] field contains a valid orientation value. */
+    @get:JvmName("hasOrientation")
+    public val hasOrientation: Boolean
+        get() = orientationRadians != NO_ORIENTATION
+
+    /**
+     * Overwrite this instance with new values.
+     *
+     * @param x The `x` position coordinate of the input in the stroke's coordinate space.
+     * @param y The `y` position coordinate of the input in the stroke's coordinate space.
+     * @param elapsedTimeMillis Marks the number of milliseconds since the stroke started. It is a
+     *   non-negative timestamp in the [android.os.SystemClock.elapsedRealtime] time base.
+     * @param toolType The type of tool used to create this input data.
+     * @param pressure Should be within [0, 1] but it's not enforced until added to a
+     *   [StrokeInputBatch] object. Absence of [pressure] data is represented with [NO_PRESSURE].
+     * @param tiltRadians The angle in radians between a stylus and the line perpendicular to the
+     *   plane of the screen. 0 is perpendicular to the screen and PI/2 is flat against the drawing
+     *   surface. Absence of [tiltRadians] data is represented with [NO_TILT].
+     * @param orientationRadians Indicates the direction in which the stylus is pointing in relation
+     *   to the positive x axis in radians. A value of 0 means the ray from the stylus tip to the
+     *   end is along positive x and values increase towards the positive y-axis. Absence of
+     *   [orientationRadians] data is represented with [NO_ORIENTATION].
+     */
+    @JvmOverloads
+    public fun update(
+        x: Float,
+        y: Float,
+        @IntRange(from = 0) elapsedTimeMillis: Long,
+        toolType: InputToolType = InputToolType.UNKNOWN,
+        strokeUnitLengthCm: Float = NO_STROKE_UNIT_LENGTH,
+        pressure: Float = NO_PRESSURE,
+        tiltRadians: Float = NO_TILT,
+        orientationRadians: Float = NO_ORIENTATION,
+    ) {
+        this.toolType = toolType
+        this.x = x
+        this.y = y
+        this.elapsedTimeMillis = elapsedTimeMillis
+        this.strokeUnitLengthCm = strokeUnitLengthCm
+        this.pressure = pressure
+        this.tiltRadians = tiltRadians
+        this.orientationRadians = orientationRadians
+    }
+
+    /** @see update */
+    // TODO: b/362469375 - Change JNI to use `update` and delete `overwrite`
+    // TODO: b/355248266 - @UsedByNative("stroke_input_jni_helper.cc") must go in Proguard config
+    // file instead.
+    @JvmOverloads
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) // NonPublicApi
+    @Deprecated("Renaming to update")
+    public fun overwrite(
+        x: Float,
+        y: Float,
+        @IntRange(from = 0) elapsedTimeMillis: Long,
+        toolType: InputToolType = InputToolType.UNKNOWN,
+        strokeUnitLengthCm: Float = NO_STROKE_UNIT_LENGTH,
+        pressure: Float = NO_PRESSURE,
+        tiltRadians: Float = NO_TILT,
+        orientationRadians: Float = NO_ORIENTATION,
+    ) {
+        update(
+            x,
+            y,
+            elapsedTimeMillis,
+            toolType,
+            strokeUnitLengthCm,
+            pressure,
+            tiltRadians,
+            orientationRadians
+        )
+    }
+
+    public override fun equals(other: Any?): Boolean {
+        // NOMUTANTS -- Check the instance first to short circuit faster.
+        if (this === other) return true
+        if (other !is StrokeInput) return false
+
+        return x == other.x &&
+            y == other.y &&
+            elapsedTimeMillis == other.elapsedTimeMillis &&
+            toolType == other.toolType &&
+            strokeUnitLengthCm == other.strokeUnitLengthCm &&
+            pressure == other.pressure &&
+            tiltRadians == other.tiltRadians &&
+            orientationRadians == other.orientationRadians
+    }
+
+    // NOMUTANTS -- not testing exact hashCode values, just that equality implies same hashCode
+    public override fun hashCode(): Int {
+        var result = x.hashCode()
+        result = 31 * result + y.hashCode()
+        result = 31 * result + elapsedTimeMillis.hashCode()
+        result = 31 * result + toolType.hashCode()
+        result = 31 * result + strokeUnitLengthCm.hashCode()
+        result = 31 * result + pressure.hashCode()
+        result = 31 * result + tiltRadians.hashCode()
+        result = 31 * result + orientationRadians.hashCode()
+        return result
+    }
+
+    public override fun toString(): String {
+        return "StrokeInput(x=$x, y=$y, elapsedTimeMillis=$elapsedTimeMillis, toolType=$toolType, " +
+            "strokeUnitLengthCm=$strokeUnitLengthCm, pressure=$pressure, tiltRadians=$tiltRadians, " +
+            "orientationRadians=$orientationRadians)"
+    }
+
+    public companion object {
+        public const val NO_STROKE_UNIT_LENGTH: Float = 0f
+        public const val NO_PRESSURE: Float = -1f
+        public const val NO_TILT: Float = -1f
+        public const val NO_ORIENTATION: Float = -1f
+
+        /**
+         * Allocate and return a new [StrokeInput]. Only intended for test code - real code should
+         * use a recycling pattern to avoid allocating during latency-sensitive real-time input,
+         * using [update] on an instance allocated with the zero-argument constructor.
+         */
+        @VisibleForTesting
+        @JvmStatic
+        @JvmOverloads
+        public fun create(
+            x: Float,
+            y: Float,
+            @IntRange(from = 0) elapsedTimeMillis: Long,
+            toolType: InputToolType = InputToolType.UNKNOWN,
+            strokeUnitLengthCm: Float = NO_STROKE_UNIT_LENGTH,
+            pressure: Float = NO_PRESSURE,
+            tiltRadians: Float = NO_TILT,
+            orientationRadians: Float = NO_ORIENTATION,
+        ): StrokeInput {
+            return StrokeInput().apply {
+                update(
+                    x,
+                    y,
+                    elapsedTimeMillis,
+                    toolType,
+                    strokeUnitLengthCm,
+                    pressure,
+                    tiltRadians,
+                    orientationRadians,
+                )
+            }
+        }
+    }
+}
diff --git a/ink/ink-strokes/src/jvmAndroidMain/kotlin/androidx/ink/strokes/StrokeInputBatch.kt b/ink/ink-strokes/src/jvmAndroidMain/kotlin/androidx/ink/strokes/StrokeInputBatch.kt
new file mode 100644
index 0000000..4f4e2a8
--- /dev/null
+++ b/ink/ink-strokes/src/jvmAndroidMain/kotlin/androidx/ink/strokes/StrokeInputBatch.kt
@@ -0,0 +1,486 @@
+/*
+ * Copyright (C) 2024 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.ink.strokes
+
+import androidx.annotation.RestrictTo
+import androidx.ink.brush.InputToolType
+import androidx.ink.nativeloader.NativeLoader
+
+/**
+ * A read-only view of an object that stores multiple [StrokeInput] values together in a more
+ * memory-efficient manner than just `List<StrokeInput>`. The input points in this batch are
+ * guaranteed to be consistent with one another – for example, they all have the same [toolType] and
+ * the same set of optional fields like pressure/tilt/orientation, and their timestamps are all
+ * monotonically non-decreasing. This can be an [ImmutableStrokeInputBatch] for data that cannot
+ * change, and a [MutableStrokeInputBatch] for data that is meant to be modified or incrementally
+ * built.
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) // PublicApiNotReadyForJetpackReview
+@Suppress("NotCloseable") // Finalize is only used to free the native peer.
+public abstract class StrokeInputBatch internal constructor(nativePointer: Long) {
+
+    @get:RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+    public var nativePointer: Long = nativePointer
+        private set
+
+    /** Number of [StrokeInput] objects in the batch. */
+    public val size: Int
+        get() = StrokeInputBatchNative.getSize(nativePointer)
+
+    /** `true` if there are no [StrokeInput] objects in the batch, and `false` otherwise. */
+    public fun isEmpty(): Boolean = size == 0
+
+    /**
+     * How this input stream should be interpreted, as coming from a [InputToolType.MOUSE],
+     * [InputToolType.TOUCH], or [InputToolType.STYLUS].
+     */
+    public fun getToolType(): InputToolType =
+        InputToolType.from(StrokeInputBatchNative.getToolType(nativePointer))
+
+    /** The duration between the first and last input in milliseconds. */
+    public fun getDurationMillis(): Long = StrokeInputBatchNative.getDurationMillis(nativePointer)
+
+    /**
+     * The physical distance in centimeters that the pointer must travel in order to produce an
+     * input motion of one stroke unit. For stylus/touch, this is the real-world distance that the
+     * stylus/fingertip must move in physical space; for mouse, this is the visual distance that the
+     * mouse pointer must travel along the surface of the display.
+     *
+     * A value of [StrokeInput.NO_STROKE_UNIT_LENGTH] indicates that the relationship between stroke
+     * space and physical space is unknown or ill-defined.
+     */
+    public fun getStrokeUnitLengthCm(): Float =
+        StrokeInputBatchNative.getStrokeUnitLengthCm(nativePointer)
+
+    /**
+     * Whether [strokeUnitLengthCm] has a valid value, which is something other than
+     * [StrokeInput.NO_STROKE_UNIT_LENGTH].
+     */
+    public fun hasStrokeUnitLength(): Boolean =
+        StrokeInputBatchNative.hasStrokeUnitLength(nativePointer)
+
+    /**
+     * Whether all of the individual inputs have a defined value for [StrokeInput.pressure]. If not,
+     * then no input items have a pressure value.
+     */
+    public fun hasPressure(): Boolean = StrokeInputBatchNative.hasPressure(nativePointer)
+
+    /**
+     * Whether all of the individual inputs have a defined value for [StrokeInput.tiltRadians]. If
+     * not, then no input items have a tilt value.
+     */
+    public fun hasTilt(): Boolean = StrokeInputBatchNative.hasTilt(nativePointer)
+
+    /**
+     * Whether all of the individual inputs have a defined value for
+     * [StrokeInput.orientationRadians]. If not, then no input items have an orientation value.
+     */
+    public fun hasOrientation(): Boolean = StrokeInputBatchNative.hasOrientation(nativePointer)
+
+    /**
+     * Gets the value of the i-th input. Requires that [index] is positive and less than [size].
+     *
+     * In performance-sensitive code, prefer to use [populate] to pass in a pre-allocated instance
+     * and reuse that instance across multiple calls to this function.
+     */
+    public operator fun get(index: Int): StrokeInput = populate(index, StrokeInput())
+
+    /**
+     * Gets the value of the i-th input and overwrites [outStrokeInput]. Requires that [index] is
+     * positive and less than [size]. Returns [outStrokeInput].
+     */
+    public fun populate(index: Int, outStrokeInput: StrokeInput): StrokeInput {
+        require(index < size && index >= 0) { "index ($index) must be in [0, size=$size)" }
+        StrokeInputBatchNative.populate(
+            nativePointer,
+            index,
+            outStrokeInput,
+            InputToolType::class.java
+        )
+        return outStrokeInput
+    }
+
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) // NonPublicApi
+    public abstract fun asImmutable(): ImmutableStrokeInputBatch
+
+    protected fun finalize() {
+        // NOMUTANTS--Not tested post garbage collection.
+        if (nativePointer == 0L) return
+        StrokeInputBatchNative.freeNativePeer(nativePointer)
+        nativePointer = 0
+    }
+
+    // Declared as a target for extension functions.
+    public companion object
+}
+
+/**
+ * An immutable implementation of [StrokeInputBatch]. For a mutable alternative, see
+ * [MutableStrokeInputBatch].
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) // PublicApiNotReadyForJetpackReview
+public class ImmutableStrokeInputBatch
+/**
+ * Constructor for Kotlin [ImmutableStrokeInputBatch] objects that are originally created in native
+ * code and later surfaced to Kotlin. The underlying memory will be freed upon finalize() of this
+ * [ImmutableStrokeInputBatch] object.
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+constructor(nativePointer: Long) : StrokeInputBatch(nativePointer) {
+
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) // NonPublicApi
+    public override fun asImmutable(): ImmutableStrokeInputBatch = this
+
+    public override fun toString(): String = "ImmutableStrokeInputBatch(size=$size)"
+
+    public companion object {
+        /** An empty [ImmutableStrokeInputBatch]. */
+        @JvmField
+        public val EMPTY: ImmutableStrokeInputBatch =
+            ImmutableStrokeInputBatch(StrokeInputBatchNative.createNativePeer())
+    }
+}
+
+/**
+ * A mutable implementation of [StrokeInputBatch]. For an immutable alternative, see
+ * [ImmutableStrokeInputBatch].
+ *
+ * Each appended [StrokeInput] value is validated compared to the existing batch contents. This
+ * means:
+ * 1) All floating point values are required to be finite and the format of all inputs must be
+ *    consistent. This means all inputs must have the same set of optional member variables that
+ *    hold a value. For example, every input holds a [pressure] value if-and-only-if every other
+ *    input holds a [pressure] value. This is also true for [tiltRadians] and [orientationRadians].
+ * 2) The sequence of [StrokeInput] values must not contain repeated x-y-t triplets, and the time
+ *    values must be non-negative and non-decreasing.
+ * 3) Values of [strokeUnitLengthCm] must be finite and positive, or be
+ *    [StrokeInput.NO_STROKE_UNIT_LENGTH].
+ * 4) Values of [StrokeInput.pressure] must fall within the range of [0, 1] or be
+ *    [StrokeInput.NO_PRESSURE]
+ * 5) Values of [StrokeInput.tiltRadians] must fall within the range of [0, π/2] or be
+ *    [StrokeInput.NO_TILT].
+ * 6) Values of [StrokeInput.orientationRadians] must fall within the range of
+ *    [0, 2π) or be [StrokeInput.NO_ORIENTATION].
+ * 7) The [toolType] and [strokeUnitLengthCm] values must be the same across all inputs.
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) // PublicApiNotReadyForJetpackReview
+public class MutableStrokeInputBatch : StrokeInputBatch(StrokeInputBatchNative.createNativePeer()) {
+
+    public fun clear(): Unit = MutableStrokeInputBatchNative.clear(nativePointer)
+
+    /**
+     * Validates and appends an [input]. Invalid [input] will result in no change. An exception will
+     * be thrown for invalid additions.
+     */
+    public fun addOrThrow(input: StrokeInput): MutableStrokeInputBatch =
+        add(input, throwOnError = true)
+
+    /**
+     * Validates and appends an input. Invalid input will result in no change. An exception will be
+     * thrown for invalid additions.
+     */
+    @JvmOverloads
+    public fun addOrThrow(
+        type: InputToolType,
+        x: Float,
+        y: Float,
+        elapsedTimeMillis: Long,
+        strokeUnitLengthCm: Float = StrokeInput.NO_STROKE_UNIT_LENGTH,
+        pressure: Float = StrokeInput.NO_PRESSURE,
+        tiltRadians: Float = StrokeInput.NO_TILT,
+        orientationRadians: Float = StrokeInput.NO_ORIENTATION,
+    ): MutableStrokeInputBatch =
+        add(
+            type,
+            x,
+            y,
+            elapsedTimeMillis,
+            strokeUnitLengthCm,
+            pressure,
+            tiltRadians,
+            orientationRadians,
+            throwOnError = true,
+        )
+
+    /**
+     * Validates and appends an [input]. Invalid [input] will result in no change. No exception will
+     * be thrown for invalid additions.
+     */
+    public fun addOrIgnore(input: StrokeInput): MutableStrokeInputBatch =
+        add(input, throwOnError = false)
+
+    /**
+     * Validates and appends an input. Invalid input will result in no change. No exception will be
+     * thrown for invalid additions.
+     */
+    @JvmOverloads
+    public fun addOrIgnore(
+        type: InputToolType,
+        x: Float,
+        y: Float,
+        elapsedTimeMillis: Long,
+        strokeUnitLengthCm: Float = StrokeInput.NO_STROKE_UNIT_LENGTH,
+        pressure: Float = StrokeInput.NO_PRESSURE,
+        tiltRadians: Float = StrokeInput.NO_TILT,
+        orientationRadians: Float = StrokeInput.NO_ORIENTATION,
+    ): MutableStrokeInputBatch =
+        add(
+            type,
+            x,
+            y,
+            elapsedTimeMillis,
+            strokeUnitLengthCm,
+            pressure,
+            tiltRadians,
+            orientationRadians,
+            throwOnError = false,
+        )
+
+    /**
+     * Validates and appends an [input]. Invalid [input] will result in no change. If [throwOnError]
+     * is true, an exception will be thrown for invalid additions.
+     */
+    private fun add(input: StrokeInput, throwOnError: Boolean = false): MutableStrokeInputBatch {
+        return add(
+            input.toolType,
+            input.x,
+            input.y,
+            input.elapsedTimeMillis,
+            input.strokeUnitLengthCm,
+            input.pressure,
+            input.tiltRadians,
+            input.orientationRadians,
+            throwOnError,
+        )
+    }
+
+    /**
+     * Validates and appends an input. Invalid input will result in no change. If [throwOnError] is
+     * true, an exception will be thrown for invalid additions.
+     */
+    private fun add(
+        type: InputToolType,
+        x: Float,
+        y: Float,
+        elapsedTimeMillis: Long,
+        strokeUnitLengthCm: Float,
+        pressure: Float,
+        tiltRadians: Float,
+        orientationRadians: Float,
+        throwOnError: Boolean,
+    ): MutableStrokeInputBatch {
+        val errorMessage =
+            MutableStrokeInputBatchNative.appendSingle(
+                nativePointer,
+                type.value,
+                x,
+                y,
+                elapsedTimeMillis,
+                strokeUnitLengthCm,
+                pressure,
+                tiltRadians,
+                orientationRadians,
+            )
+        if (throwOnError) {
+            require(errorMessage == null) { errorMessage!! }
+        }
+        return this
+    }
+
+    /**
+     * Validates and appends an [inputBatch]. Invalid [inputBatch] will result in no change. No
+     * exception will be thrown for invalid additions.
+     */
+    public fun addOrIgnore(inputBatch: StrokeInputBatch): MutableStrokeInputBatch =
+        add(inputBatch.nativePointer, throwOnError = false)
+
+    /**
+     * Validates and appends an [inputBatch]. Invalid [inputBatch] will result in no change. An
+     * exception will be thrown for invalid additions.
+     */
+    public fun addOrThrow(inputBatch: StrokeInputBatch): MutableStrokeInputBatch =
+        add(inputBatch.nativePointer, throwOnError = true)
+
+    /**
+     * Validates and appends the native representation of a [StrokeInputBatch]. Invalid inputs will
+     * result in no change. If [throwOnError] is true, an exception will be thrown for invalid
+     * additions.
+     */
+    private fun add(inputBatchNativePointer: Long, throwOnError: Boolean): MutableStrokeInputBatch {
+        val errorMessage =
+            MutableStrokeInputBatchNative.appendBatch(nativePointer, inputBatchNativePointer)
+        if (throwOnError) {
+            require(errorMessage == null) { errorMessage!! }
+        }
+        return this
+    }
+
+    /**
+     * Validates and appends a collection of [StrokeInput]. Invalid [inputs] will result in no
+     * change. No exception will be thrown for invalid additions.
+     */
+    public fun addOrIgnore(inputs: Collection<StrokeInput>): MutableStrokeInputBatch =
+        add(inputs, throwOnError = false)
+
+    /**
+     * Validates and appends a collection of [StrokeInput]. Invalid [inputs] will result in no
+     * change. An exception will be thrown for invalid additions.
+     */
+    public fun addOrThrow(inputs: Collection<StrokeInput>): MutableStrokeInputBatch =
+        add(inputs, throwOnError = true)
+
+    /**
+     * Validates and appends a collection of [StrokeInput]. Invalid [inputs] will result in no
+     * change. If [throwOnError] is true, an exception will be thrown for invalid additions.
+     */
+    private fun add(
+        inputs: Collection<StrokeInput>,
+        throwOnError: Boolean = false,
+    ): MutableStrokeInputBatch {
+        val tempBatchBuilder = MutableStrokeInputBatch()
+        var errorMessage: String?
+
+        // Confirm all inputs are valid by first adding them to their own StrokeInputBatch in order
+        // to
+        // perform a group add operation to *this*
+        // batch.
+        for (input in inputs) {
+            errorMessage =
+                MutableStrokeInputBatchNative.appendSingle(
+                    tempBatchBuilder.nativePointer,
+                    input.toolType.value,
+                    input.x,
+                    input.y,
+                    input.elapsedTimeMillis,
+                    input.strokeUnitLengthCm,
+                    input.pressure,
+                    input.tiltRadians,
+                    input.orientationRadians,
+                )
+            if (throwOnError) {
+                require(errorMessage == null) { errorMessage!! }
+            }
+        }
+        errorMessage =
+            MutableStrokeInputBatchNative.appendBatch(nativePointer, tempBatchBuilder.nativePointer)
+        if (throwOnError) {
+            require(errorMessage == null) { errorMessage!! }
+        }
+        return this
+    }
+
+    /** Create [ImmutableStrokeInputBatch] with the accumulated StrokeInputs. */
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) // NonPublicApi
+    public override fun asImmutable(): ImmutableStrokeInputBatch =
+        if (isEmpty()) {
+            ImmutableStrokeInputBatch.EMPTY
+        } else {
+            ImmutableStrokeInputBatch(MutableStrokeInputBatchNative.copy(nativePointer))
+        }
+
+    public override fun toString(): String = "MutableStrokeInputBatch(size=$size)"
+}
+
+private object StrokeInputBatchNative {
+
+    init {
+        NativeLoader.load()
+    }
+
+    external fun createNativePeer():
+        Long // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+
+    external fun freeNativePeer(
+        nativePointer: Long
+    ) // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+
+    external fun getSize(
+        nativePointer: Long
+    ): Int // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+
+    external fun getToolType(
+        nativePointer: Long
+    ): Int // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+
+    external fun getDurationMillis(
+        nativePointer: Long
+    ): Long // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+
+    external fun getStrokeUnitLengthCm(
+        nativePointer: Long
+    ): Float // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+
+    external fun hasStrokeUnitLength(
+        nativePointer: Long
+    ): Boolean // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+
+    external fun hasPressure(
+        nativePointer: Long
+    ): Boolean // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+
+    external fun hasTilt(
+        nativePointer: Long
+    ): Boolean // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+
+    external fun hasOrientation(
+        nativePointer: Long
+    ): Boolean // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+
+    /**
+     * The [toolTypeClass] parameter is passed as a convenience to native JNI code, to avoid it
+     * needing to do a reflection-based FindClass lookup.
+     */
+    // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+    external fun populate(
+        nativePointer: Long,
+        index: Int,
+        input: StrokeInput,
+        toolTypeClass: Class<InputToolType>,
+    )
+}
+
+private object MutableStrokeInputBatchNative {
+    init {
+        NativeLoader.load()
+    }
+
+    external fun clear(
+        nativePointer: Long
+    ) // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+
+    // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+    external fun appendSingle(
+        nativePointer: Long,
+        type: Int,
+        x: Float,
+        y: Float,
+        elapsedTimeMillis: Long,
+        strokeUnitLengthCm: Float,
+        pressure: Float,
+        tilt: Float,
+        orientation: Float,
+    ): String?
+
+    external fun appendBatch(
+        nativePointer: Long,
+        addedNativePointer: Long
+    ): String? // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+
+    external fun copy(
+        nativePointer: Long
+    ): Long // TODO: b/355248266 - @Keep must go in Proguard config file instead.
+}
diff --git a/ink/ink-strokes/src/jvmAndroidMain/kotlin/androidx/ink/strokes/testing/StrokeTestHelper.kt b/ink/ink-strokes/src/jvmAndroidMain/kotlin/androidx/ink/strokes/testing/StrokeTestHelper.kt
new file mode 100644
index 0000000..212aa03
--- /dev/null
+++ b/ink/ink-strokes/src/jvmAndroidMain/kotlin/androidx/ink/strokes/testing/StrokeTestHelper.kt
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2024 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.ink.strokes.testing
+
+import androidx.annotation.RestrictTo
+import androidx.annotation.VisibleForTesting
+import androidx.ink.brush.InputToolType
+import androidx.ink.strokes.MutableStrokeInputBatch
+import androidx.ink.strokes.StrokeInput
+import kotlin.jvm.JvmOverloads
+
+/**
+ * Build a StrokeInputBatch from an array of [points] in the form [x1, y1, x2, y2...] and a
+ * specified input [toolType] with STYLUS set by default.
+ */
+@JvmOverloads
+@VisibleForTesting
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) // NonPublicApi
+public fun buildStrokeInputBatchFromPoints(
+    points: FloatArray,
+    toolType: InputToolType = InputToolType.STYLUS,
+    startTime: Long = 0L,
+): MutableStrokeInputBatch {
+    val builder = MutableStrokeInputBatch()
+    var time = startTime
+    for (i in points.indices step 2) {
+        builder.addOrThrow(
+            StrokeInput().apply {
+                update(
+                    x = points[i],
+                    y = points[i + 1],
+                    elapsedTimeMillis = time++,
+                    toolType = toolType
+                )
+            }
+        )
+    }
+    return builder
+}
diff --git a/ink/ink-strokes/src/jvmAndroidTest/kotlin/androidx/ink/strokes/InProgressStrokeTest.kt b/ink/ink-strokes/src/jvmAndroidTest/kotlin/androidx/ink/strokes/InProgressStrokeTest.kt
new file mode 100644
index 0000000..0592f8c
--- /dev/null
+++ b/ink/ink-strokes/src/jvmAndroidTest/kotlin/androidx/ink/strokes/InProgressStrokeTest.kt
@@ -0,0 +1,686 @@
+/*
+ * Copyright (C) 2024 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.ink.strokes
+
+import androidx.ink.brush.Brush
+import androidx.ink.brush.InputToolType
+import androidx.ink.brush.StockBrushes
+import androidx.ink.geometry.BoxAccumulator
+import androidx.ink.geometry.MutableVec
+import androidx.ink.strokes.testing.buildStrokeInputBatchFromPoints
+import com.google.common.truth.Truth.assertThat
+import java.nio.ReadOnlyBufferException
+import kotlin.math.PI
+import kotlin.math.cos
+import kotlin.math.sin
+import kotlin.math.sqrt
+import kotlin.test.assertFailsWith
+import org.junit.Assert.assertThrows
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+
+/** Unit tests for [InProgressStroke]. */
+@RunWith(JUnit4::class)
+class InProgressStrokeTest {
+
+    private fun makeStartAndExtendStroke() =
+        InProgressStroke().apply {
+            start(makeBrush())
+            assertThat(
+                    enqueueInputs(
+                            buildStrokeInputBatchFromPoints(
+                                floatArrayOf(10f, 3f, 20f, 5f, 30f, 7f)
+                            ),
+                            buildStrokeInputBatchFromPoints(floatArrayOf()),
+                        )
+                        .isSuccess
+                )
+                .isTrue()
+            assertThat(updateShape(2L).isSuccess).isTrue()
+        }
+
+    @Test
+    fun unstartedStroke_hasNullBrush() {
+        val inProgressStroke = InProgressStroke()
+
+        assertThat(inProgressStroke.brush).isNull()
+    }
+
+    @Test
+    fun unstartedStroke_doesNotNeedUpdate() {
+        val inProgressStroke = InProgressStroke()
+
+        assertThat(inProgressStroke.getNeedsUpdate()).isFalse()
+    }
+
+    @Test
+    fun unstartedStroke_inputIsFinished() {
+        val inProgressStroke = InProgressStroke()
+
+        assertThat(inProgressStroke.isInputFinished()).isTrue()
+    }
+
+    @Test
+    fun startStroke_setsBrush() {
+        val brush = makeBrush()
+        val inProgressStroke = InProgressStroke()
+        inProgressStroke.start(brush)
+        val brushOut = inProgressStroke.brush
+
+        assertThat(brushOut).isNotNull()
+        assertThat(brushOut!!).isEqualTo(brush)
+    }
+
+    @Test
+    fun startStroke_inputIsNotFinished() {
+        val inProgressStroke = InProgressStroke()
+        inProgressStroke.start(makeBrush())
+
+        assertThat(inProgressStroke.isInputFinished()).isFalse()
+    }
+
+    @Test
+    fun enqueueInputs_withRealAndPredictedInputs_needsUpdate() {
+        val inProgressStroke = InProgressStroke()
+        inProgressStroke.start(makeBrush())
+        val realInputs = buildStrokeInputBatchFromPoints(floatArrayOf(10f, 3f, 20f, 5f, 30f, 7f))
+        val predictedInputs =
+            buildStrokeInputBatchFromPoints(
+                floatArrayOf(40f, 9f, 50f, 11f, 60f, 13f),
+                InputToolType.STYLUS,
+                startTime = 3L,
+            )
+
+        assertThat(inProgressStroke.enqueueInputs(realInputs, predictedInputs).isSuccess)
+            .isTrue() // adds 3 inputs points
+        assertThat(inProgressStroke.getNeedsUpdate()).isTrue()
+    }
+
+    @Test
+    fun enqueueInputs_beforeStart_fails() {
+        val inProgressStroke = InProgressStroke()
+
+        val result =
+            inProgressStroke.enqueueInputs(
+                ImmutableStrokeInputBatch.EMPTY,
+                ImmutableStrokeInputBatch.EMPTY,
+            )
+        assertThat(result.isFailure).isTrue()
+        assertThat(result.exceptionOrNull()).hasMessageThat().contains("Start")
+    }
+
+    @Test
+    fun enqueueInputsOrThrow_beforeStart_throws() {
+        val inProgressStroke = InProgressStroke()
+
+        val error =
+            assertThrows(IllegalArgumentException::class.java) {
+                inProgressStroke.enqueueInputsOrThrow(
+                    ImmutableStrokeInputBatch.EMPTY,
+                    ImmutableStrokeInputBatch.EMPTY,
+                )
+            }
+        assertThat(error).hasMessageThat().contains("Start")
+    }
+
+    @Test
+    fun updateShape_withPositiveElapsedTime_succeeds() {
+        val inProgressStroke = InProgressStroke()
+        inProgressStroke.start(makeBrush())
+
+        assertThat(inProgressStroke.updateShape(2).isSuccess).isTrue()
+    }
+
+    @Test
+    fun updateShape_withNegativeElapsedTime_fails() {
+        val inProgressStroke = InProgressStroke()
+        inProgressStroke.start(makeBrush())
+
+        val result = inProgressStroke.updateShape(-1)
+        assertThat(result.isFailure).isTrue()
+        assertThat(result.exceptionOrNull()).hasMessageThat().contains("non-negative")
+    }
+
+    @Test
+    fun updateShapeOrThrow_withNegativeElapsedTime_throws() {
+        val inProgressStroke = InProgressStroke()
+        inProgressStroke.start(makeBrush())
+
+        val error =
+            assertThrows(IllegalArgumentException::class.java) {
+                inProgressStroke.updateShapeOrThrow(-1)
+            }
+        assertThat(error).hasMessageThat().contains("non-negative")
+    }
+
+    @Test
+    fun enqueueInputs_withEmptyRealInputs_succeeds() {
+        val inProgressStroke = InProgressStroke()
+        inProgressStroke.start(makeBrush())
+        val realInputs = buildStrokeInputBatchFromPoints(floatArrayOf())
+        val predictedInputs =
+            buildStrokeInputBatchFromPoints(floatArrayOf(10f, 3f, 20f, 5f, 30f, 7f))
+
+        assertThat(inProgressStroke.enqueueInputs(realInputs, predictedInputs).isSuccess)
+            .isTrue() // adds 3 inputs points
+    }
+
+    @Test
+    fun enqueueInputs_withEmptyPredictedInputs_succeeds() {
+        val inProgressStroke = InProgressStroke()
+        inProgressStroke.start(makeBrush())
+        val realInputs = buildStrokeInputBatchFromPoints(floatArrayOf(10f, 3f, 20f, 5f, 30f, 7f))
+        val predictedInputs = buildStrokeInputBatchFromPoints(floatArrayOf())
+
+        assertThat(inProgressStroke.enqueueInputs(realInputs, predictedInputs).isSuccess)
+            .isTrue() // adds 3 inputs points
+    }
+
+    @Test
+    fun enqueueInputs_withRealAndPredictedInputs_succeeds() {
+        val inProgressStroke = InProgressStroke()
+        inProgressStroke.start(makeBrush())
+        val realInputs = buildStrokeInputBatchFromPoints(floatArrayOf(10f, 3f, 20f, 5f, 30f, 7f))
+        val predictedInputs =
+            buildStrokeInputBatchFromPoints(
+                floatArrayOf(40f, 9f, 50f, 11f, 60f, 13f),
+                InputToolType.STYLUS,
+                startTime = 3L,
+            )
+
+        assertThat(inProgressStroke.enqueueInputs(realInputs, predictedInputs).isSuccess)
+            .isTrue() // adds 3 inputs points
+    }
+
+    @Test
+    fun enqueueInputs_withRealAndPredictedInputsImmutable_succeeds() {
+        val inProgressStroke = InProgressStroke()
+        inProgressStroke.start(makeBrush())
+        val realInputs =
+            buildStrokeInputBatchFromPoints(floatArrayOf(10f, 3f, 20f, 5f, 30f, 7f)).asImmutable()
+        val predictedInputs =
+            buildStrokeInputBatchFromPoints(
+                    floatArrayOf(40f, 9f, 50f, 11f, 60f, 13f),
+                    InputToolType.STYLUS,
+                    startTime = 3L,
+                )
+                .asImmutable()
+
+        assertThat(inProgressStroke.enqueueInputs(realInputs, predictedInputs).isSuccess)
+            .isTrue() // adds 3 inputs points
+    }
+
+    @Test
+    fun enqueueInputs_withLowElapsedTime_fails() {
+        val inProgressStroke = InProgressStroke()
+        inProgressStroke.start(makeBrush())
+        val realInputs = buildStrokeInputBatchFromPoints(floatArrayOf(10f, 3f, 20f, 5f))
+        val predictedInputs = buildStrokeInputBatchFromPoints(floatArrayOf())
+        assertThat(inProgressStroke.enqueueInputs(realInputs, predictedInputs).isSuccess)
+            .isTrue() // adds 2 inputs points
+        assertThat(inProgressStroke.updateShape(0).isSuccess).isTrue()
+
+        // Try to add same two points with elapsed time from start still at 0.
+        val result = inProgressStroke.enqueueInputs(realInputs, predictedInputs)
+        assertThat(result.exceptionOrNull()).hasMessageThat().contains("non-decreasing")
+    }
+
+    @Test
+    fun enqueueInputs_withInvalidRealInputs_fails() {
+        val inProgressStroke = InProgressStroke()
+        inProgressStroke.start(makeBrush())
+        val realInputs = buildStrokeInputBatchFromPoints(floatArrayOf(10f, 3f, 20f, 5f, 30f, 7f))
+        val predictedInputs = buildStrokeInputBatchFromPoints(floatArrayOf())
+        assertThat(inProgressStroke.enqueueInputs(realInputs, predictedInputs).isSuccess)
+            .isTrue() // adds 3 inputs points
+        assertThat(inProgressStroke.updateShape(2).isSuccess).isTrue()
+
+        // Try to add same three points that don't increase in elapsed time from last batch.
+        val result = inProgressStroke.enqueueInputs(realInputs, predictedInputs)
+        assertThat(result.exceptionOrNull()).hasMessageThat().contains("non-decreasing")
+    }
+
+    @Test
+    fun enqueueInputs_withInvalidPredictedInputs_fails() {
+        val inProgressStroke = InProgressStroke()
+        inProgressStroke.start(makeBrush())
+        val realInputs =
+            buildStrokeInputBatchFromPoints(
+                floatArrayOf(10f, 3f, 20f, 5f, 30f, 7f)
+            ) // elapsed time 0, 1, 2
+        val predictedInputs =
+            buildStrokeInputBatchFromPoints(floatArrayOf(30f, 7f, 40f, 9f)) // elapsed time 0, 1
+
+        // Fails to add predicted points that don't make a valid StrokeInputBatch in conjunction
+        // with
+        // the real inputs.
+        val result = inProgressStroke.enqueueInputs(realInputs, predictedInputs)
+        assertThat(result.exceptionOrNull()).hasMessageThat().contains("non-decreasing")
+    }
+
+    @Test
+    fun finishInput_inputIsFinished() {
+        val inProgressStroke = InProgressStroke()
+        inProgressStroke.start(makeBrush())
+        inProgressStroke.finishInput()
+
+        assertThat(inProgressStroke.isInputFinished()).isTrue()
+    }
+
+    @Test
+    fun inputCount_isRealAndPredictedInputs() {
+        val inProgressStroke = InProgressStroke()
+        inProgressStroke.start(makeBrush())
+        val realInputs = buildStrokeInputBatchFromPoints(floatArrayOf(10f, 3f, 20f, 5f, 30f, 7f))
+        val predictedInputs =
+            buildStrokeInputBatchFromPoints(
+                floatArrayOf(40f, 9f, 50f, 11f),
+                InputToolType.STYLUS,
+                startTime = 3L,
+            )
+        assertThat(inProgressStroke.enqueueInputs(realInputs, predictedInputs).isSuccess).isTrue()
+        assertThat(inProgressStroke.updateShape(2).isSuccess).isTrue()
+
+        assertThat(inProgressStroke.getInputCount()).isEqualTo(5)
+        assertThat(inProgressStroke.getRealInputCount()).isEqualTo(3)
+        assertThat(inProgressStroke.getPredictedInputCount()).isEqualTo(2)
+    }
+
+    @Test
+    fun populateInput_returnsSameInputsAsPopulateInputs() {
+        val inProgressStroke = InProgressStroke()
+        inProgressStroke.start(makeBrush())
+        val realInputs = buildStrokeInputBatchFromPoints(floatArrayOf(10f, 3f, 20f, 5f, 30f, 7f))
+        val predictedInputs =
+            buildStrokeInputBatchFromPoints(
+                floatArrayOf(40f, 9f, 50f, 11f, 60f, 13f),
+                InputToolType.STYLUS,
+                startTime = 3L,
+            )
+        assertThat(inProgressStroke.enqueueInputs(realInputs, predictedInputs).isSuccess).isTrue()
+        assertThat(inProgressStroke.updateShape(2).isSuccess).isTrue()
+
+        val inputCount = inProgressStroke.getInputCount()
+        assertThat(inputCount).isEqualTo(6)
+        val copiedInputs = MutableStrokeInputBatch().apply { inProgressStroke.populateInputs(this) }
+        assertThat(copiedInputs.size).isEqualTo(inputCount)
+        for (i in 0 until inputCount) {
+            val input = StrokeInput()
+            inProgressStroke.populateInput(input, i)
+            assertThat(input).isEqualTo(copiedInputs.get(i))
+        }
+    }
+
+    @Test
+    fun populateInputs_withFromAndToBounds() {
+        val inProgressStroke = InProgressStroke()
+        inProgressStroke.start(makeBrush())
+        val realInputs = buildStrokeInputBatchFromPoints(floatArrayOf(10f, 3f, 20f, 5f, 30f, 7f))
+        val predictedInputs =
+            buildStrokeInputBatchFromPoints(
+                floatArrayOf(40f, 9f, 50f, 11f, 60f, 13f),
+                InputToolType.STYLUS,
+                startTime = 3L,
+            )
+        assertThat(inProgressStroke.enqueueInputs(realInputs, predictedInputs).isSuccess).isTrue()
+        assertThat(inProgressStroke.updateShape(2).isSuccess).isTrue()
+
+        val inputCount = inProgressStroke.getInputCount()
+        assertThat(inputCount).isEqualTo(6)
+        val copiedInputs =
+            MutableStrokeInputBatch().apply { inProgressStroke.populateInputs(this, 2, 4) }
+        assertThat(copiedInputs.size).isEqualTo(2)
+        for (i in 2 until 4) {
+            val input = StrokeInput()
+            inProgressStroke.populateInput(input, i)
+            assertThat(input).isEqualTo(copiedInputs.get(i - 2))
+        }
+    }
+
+    @Test
+    @Suppress("Range")
+    fun populateInputs_incorrectBoundsRaisesException() {
+        val inProgressStroke = InProgressStroke()
+        inProgressStroke.start(makeBrush())
+        val realInputs = buildStrokeInputBatchFromPoints(floatArrayOf(10f, 3f, 20f, 5f, 30f, 7f))
+        val predictedInputs =
+            buildStrokeInputBatchFromPoints(
+                floatArrayOf(40f, 9f, 50f, 11f, 60f, 13f),
+                InputToolType.STYLUS,
+                startTime = 3L,
+            )
+        assertThat(inProgressStroke.enqueueInputs(realInputs, predictedInputs).isSuccess).isTrue()
+        assertThat(inProgressStroke.updateShape(2).isSuccess).isTrue()
+        assertThat(inProgressStroke.getInputCount()).isEqualTo(6)
+        assertFailsWith<IllegalArgumentException> {
+            inProgressStroke.populateInputs(MutableStrokeInputBatch(), -1)
+        }
+        assertFailsWith<IllegalArgumentException> {
+            inProgressStroke.populateInputs(MutableStrokeInputBatch(), 6, 7)
+        }
+        assertFailsWith<IllegalArgumentException> {
+            inProgressStroke.populateInputs(MutableStrokeInputBatch(), 6, 5)
+        }
+    }
+
+    @Test
+    fun populateInputs_emptyRangeIsValid() {
+        val inProgressStroke = InProgressStroke()
+        inProgressStroke.start(makeBrush())
+        val realInputs = buildStrokeInputBatchFromPoints(floatArrayOf(10f, 3f, 20f, 5f, 30f, 7f))
+        val predictedInputs =
+            buildStrokeInputBatchFromPoints(
+                floatArrayOf(40f, 9f, 50f, 11f, 60f, 13f),
+                InputToolType.STYLUS,
+                startTime = 3L,
+            )
+        assertThat(inProgressStroke.enqueueInputs(realInputs, predictedInputs).isSuccess).isTrue()
+        assertThat(inProgressStroke.updateShape(2).isSuccess).isTrue()
+        assertThat(inProgressStroke.getInputCount()).isEqualTo(6)
+        val output = MutableStrokeInputBatch().apply { inProgressStroke.populateInputs(this, 6) }
+        assertThat(output.size).isEqualTo(0)
+    }
+
+    @Test
+    fun getBrushCoatCount_withUnstartedStroke_isZero() {
+        val inProgressStroke = InProgressStroke()
+        assertThat(inProgressStroke.getBrushCoatCount()).isEqualTo(0)
+    }
+
+    @Test
+    fun getMeshBounds_withStartedStroke_returnsBounds() {
+        val inProgressStroke = makeStartAndExtendStroke()
+
+        assertThat(inProgressStroke.getBrushCoatCount()).isEqualTo(1)
+        val envelope = BoxAccumulator()
+        inProgressStroke.populateMeshBounds(0, envelope)
+        assertThat(envelope.isEmpty()).isFalse()
+        val bounds = envelope.box!!
+        assertThat(bounds.xMin).isNonZero()
+        assertThat(bounds.yMin).isNonZero()
+        assertThat(bounds.xMax).isGreaterThan(20f) // change in x of inputs
+        assertThat(bounds.yMax).isGreaterThan(4f) // change in y of inputs
+    }
+
+    @Test
+    fun fillUpdatedRegion_withEmptyStroke_returnsEmptyEnvelope() {
+        val inProgressStroke = InProgressStroke()
+        inProgressStroke.start(makeBrush())
+        val envelope = BoxAccumulator()
+        inProgressStroke.populateUpdatedRegion(envelope)
+        assertThat(envelope.isEmpty()).isTrue()
+    }
+
+    @Test
+    fun fillUpdatedRegion_withStartedStroke_returnsBounds() {
+        val inProgressStroke = makeStartAndExtendStroke()
+        val envelope = BoxAccumulator()
+
+        inProgressStroke.populateUpdatedRegion(envelope)
+
+        assertThat(envelope.isEmpty()).isFalse()
+        val bounds = envelope.box!!
+        assertThat(bounds.xMin).isNonZero()
+        assertThat(bounds.yMin).isNonZero()
+        assertThat(bounds.xMax).isGreaterThan(20f) // change in x of inputs
+        assertThat(bounds.yMax).isGreaterThan(4f) // change in y of inputs
+    }
+
+    @Test
+    fun fillUpdatedRegion_afterResetRegion_returnsFalse() {
+        val inProgressStroke = makeStartAndExtendStroke()
+        inProgressStroke.resetUpdatedRegion()
+
+        val envelope = BoxAccumulator()
+        inProgressStroke.populateUpdatedRegion(envelope)
+
+        assertThat(envelope.isEmpty()).isTrue()
+    }
+
+    @Test
+    fun meshPartitionCount_isOne() {
+        val stroke = makeStartAndExtendStroke()
+        assertThat(stroke.getBrushCoatCount()).isEqualTo(1)
+        assertThat(stroke.getMeshPartitionCount(0)).isEqualTo(1)
+    }
+
+    @Test
+    fun getVertexCount_withEmptyStroke_returnsZero() {
+        val stroke = InProgressStroke()
+        stroke.start(makeBrush())
+        assertThat(stroke.getBrushCoatCount()).isEqualTo(1)
+        assertThat(stroke.getMeshPartitionCount(0)).isEqualTo(1)
+
+        assertThat(stroke.getVertexCount(0, 0)).isEqualTo(0)
+    }
+
+    @Test
+    fun getVertexCount_withStroke_returnsNonZero() {
+        val stroke = makeStartAndExtendStroke()
+        assertThat(stroke.getBrushCoatCount()).isEqualTo(1)
+        assertThat(stroke.getMeshPartitionCount(0)).isEqualTo(1)
+
+        assertThat(stroke.getVertexCount(0, 0)).isGreaterThan(0)
+    }
+
+    @Test
+    fun getRawVertexBuffer_withEmptyStroke_returnsEmptyBuffer() {
+        val stroke = InProgressStroke()
+        stroke.start(makeBrush())
+        assertThat(stroke.getBrushCoatCount()).isEqualTo(1)
+        assertThat(stroke.getMeshPartitionCount(0)).isEqualTo(1)
+
+        val vertexBuffer = stroke.getRawVertexBuffer(0, 0)
+
+        assertThat(vertexBuffer.isReadOnly).isTrue()
+        assertFailsWith<ReadOnlyBufferException> { vertexBuffer.put(5) }
+        assertThat(vertexBuffer.limit()).isEqualTo(0)
+        assertThat(vertexBuffer.capacity()).isEqualTo(0)
+    }
+
+    @Test
+    fun getRawVertexBuffer_withStroke_returnsNonEmptyBuffer() {
+        val stroke = makeStartAndExtendStroke()
+        assertThat(stroke.getBrushCoatCount()).isEqualTo(1)
+        assertThat(stroke.getMeshPartitionCount(0)).isEqualTo(1)
+
+        val vertexBuffer = stroke.getRawVertexBuffer(0, 0)
+
+        assertThat(vertexBuffer.isDirect).isTrue()
+        assertThat(vertexBuffer.isReadOnly).isTrue()
+        assertFailsWith<ReadOnlyBufferException> { vertexBuffer.put(5) }
+        assertThat(vertexBuffer.limit()).isNotEqualTo(0)
+        assertThat(vertexBuffer.capacity()).isNotEqualTo(0)
+    }
+
+    @Test
+    fun getRawTriangleIndexBuffer_withEmptyStroke_returnsEmptyBuffer() {
+        val stroke = InProgressStroke()
+        stroke.start(makeBrush())
+        assertThat(stroke.getBrushCoatCount()).isEqualTo(1)
+        assertThat(stroke.getMeshPartitionCount(0)).isEqualTo(1)
+
+        val triangleIndexBuffer = stroke.getRawTriangleIndexBuffer(0, 0)
+
+        // TODO: b/302535371 - Make this buffer read only
+        // assertThat(triangleIndexBuffer.isDirect).isTrue()
+        // assertThat(triangleIndexBuffer.isReadOnly).isTrue()
+        // assertFailsWith<ReadOnlyBufferException> { triangleIndexBuffer.put(5) }
+        assertThat(triangleIndexBuffer.limit()).isEqualTo(0)
+        assertThat(triangleIndexBuffer.capacity()).isEqualTo(0)
+    }
+
+    @Test
+    fun getRawTriangleIndexBuffer_withStroke_returnsNonEmptyBuffer() {
+        val stroke = makeStartAndExtendStroke()
+        assertThat(stroke.getBrushCoatCount()).isEqualTo(1)
+        assertThat(stroke.getMeshPartitionCount(0)).isEqualTo(1)
+
+        val triangleIndexBuffer = stroke.getRawTriangleIndexBuffer(0, 0)
+
+        // TODO: b/302535371 - Make this buffer read only
+        // assertThat(triangleIndexBuffer.isDirect).isTrue()
+        // assertThat(triangleIndexBuffer.isReadOnly).isTrue()
+        // assertFailsWith<ReadOnlyBufferException> { triangleIndexBuffer.put(5) }
+        assertThat(triangleIndexBuffer.limit()).isNotEqualTo(0)
+        assertThat(triangleIndexBuffer.capacity()).isNotEqualTo(0)
+    }
+
+    @Test
+    fun getRawTriangleIndexBuffer_withIncreasingStrokeSize_eventuallyMaxesBufferSize() {
+        val stroke = InProgressStroke()
+        stroke.start(makeBrush())
+
+        var inputsAdded = 0
+        var previousBufferSize = Int.MIN_VALUE
+        var bufferMatchesPreviousSizeCount = 0
+        // The condition that this test is exercising is where a triangle index value would start
+        // overflowing a ushort, which is related to the number of vertices in the stroke rather
+        // than
+        // the size of this buffer (triangle count * 3). In this test, the way we know that the
+        // desired
+        // condition has been met is when the triangle index buffer stops growing, and that is when
+        // this
+        // loop will end. The number of input points that will take is very dependent on the brush,
+        // the
+        // input points themselves, the extrusion/tessellation code, and possibly more factors, so a
+        // fixed-length loop is not appropriate here. The test will fail if it crashes due to an
+        // internal logic error or running out of memory to allocate more ShortBuffers.
+        while (true) {
+            // Draw the stroke as a spiral that gets bigger and bigger. Drawing a straight line
+            // would take
+            // longer to reach the goal because there would be fewer triangles.
+            val spiralRadius = 100 * sqrt(inputsAdded.toFloat())
+            val angle = inputsAdded.toFloat() % (2 * PI.toFloat())
+            val x = spiralRadius * cos(angle)
+            val y = spiralRadius * sin(angle)
+            val time = inputsAdded.toLong()
+            assertThat(
+                    stroke
+                        .enqueueInputs(
+                            MutableStrokeInputBatch()
+                                .addOrThrow(StrokeInput.create(x, y, time))
+                                .asImmutable(),
+                            ImmutableStrokeInputBatch.EMPTY,
+                        )
+                        .isSuccess
+                )
+                .isTrue()
+            assertThat(stroke.updateShape(time).isSuccess).isTrue()
+            inputsAdded++
+            // Failure case: internal crash.
+            val bufferSize = stroke.getRawTriangleIndexBuffer(0, 0).remaining()
+            // Must be a multiple of 3 - each group of 3 makes up a triangle.
+            assertThat(bufferSize % 3).isEqualTo(0)
+            if (bufferSize == previousBufferSize) {
+                bufferMatchesPreviousSizeCount++
+                if (bufferMatchesPreviousSizeCount > 10) {
+                    // To make sure this isn't trivially succeeding.
+                    assertThat(inputsAdded).isGreaterThan(1000)
+                    break
+                }
+            } else {
+                bufferMatchesPreviousSizeCount = 0
+                previousBufferSize = bufferSize
+            }
+        }
+
+        // The dry stroke has all the inputs added, even after the triangle index buffer stopped
+        // growing
+        assertThat(stroke.toImmutable().inputs.size).isEqualTo(inputsAdded)
+    }
+
+    @Test
+    fun getMeshFormat_returnsFormat() {
+        val stroke = makeStartAndExtendStroke()
+
+        assertThat(stroke.getBrushCoatCount()).isEqualTo(1)
+        assertThat(stroke.getMeshPartitionCount(0)).isEqualTo(1)
+        assertThat(stroke.getMeshFormat(0, 0)).isNotNull()
+    }
+
+    @Test
+    fun getOutlineCount_whenEmptyStroke_shouldThrow() {
+        val emptyStroke = InProgressStroke()
+
+        assertThat(emptyStroke.getBrushCoatCount()).isEqualTo(0)
+        assertFailsWith<IllegalArgumentException> { emptyStroke.getOutlineCount(0) }
+    }
+
+    @Test
+    fun getOutlineVertexCount_whenEmptyStroke_shouldThrow() {
+        val stroke = InProgressStroke()
+
+        assertFailsWith<IllegalArgumentException> { stroke.getOutlineVertexCount(0, 0) }
+    }
+
+    @Test
+    fun populateOutlinePosition_whenEmptyStroke_shouldThrow() {
+        val stroke = InProgressStroke()
+        stroke.start(makeBrush())
+
+        assertThat(stroke.getBrushCoatCount()).isGreaterThan(0)
+        assertFailsWith<IllegalArgumentException> {
+            stroke.populateOutlinePosition(0, 0, 0, MutableVec())
+        }
+    }
+
+    @Test
+    fun populateOutlinePosition_withNonEmptyStroke_shouldBeWithinBounds() {
+        val stroke = makeStartAndExtendStroke()
+
+        assertThat(stroke.getBrushCoatCount()).isGreaterThan(0)
+        assertThat(stroke.getOutlineCount(0)).isGreaterThan(0)
+        assertThat(stroke.getOutlineVertexCount(0, 0)).isGreaterThan(0)
+
+        val bounds = BoxAccumulator()
+        stroke.populateMeshBounds(0, bounds)
+
+        val p = MutableVec()
+        for (outlineIndex in 0 until stroke.getOutlineCount(0)) {
+            for (outlineVertexIndex in 0 until stroke.getOutlineVertexCount(0, outlineIndex)) {
+                stroke.populateOutlinePosition(0, outlineIndex, outlineVertexIndex, p)
+                assertThat(p.x).isAtLeast(bounds.box!!.xMin)
+                assertThat(p.y).isAtLeast(bounds.box!!.yMin)
+                assertThat(p.x).isAtMost(bounds.box!!.xMax)
+                assertThat(p.y).isAtMost(bounds.box!!.yMax)
+            }
+        }
+    }
+
+    @Test
+    fun populateOutlinePosition_whenBadIndex_shouldThrow() {
+        val stroke = makeStartAndExtendStroke()
+
+        val p = MutableVec()
+        assertFailsWith<IllegalArgumentException> { (stroke.populateOutlinePosition(-1, 0, 0, p)) }
+        assertFailsWith<IllegalArgumentException> {
+            (stroke.populateOutlinePosition(stroke.getBrushCoatCount() + 1, 0, 0, p))
+        }
+        assertFailsWith<IllegalArgumentException> { (stroke.populateOutlinePosition(0, -1, 0, p)) }
+        assertFailsWith<IllegalArgumentException> {
+            (stroke.populateOutlinePosition(0, stroke.getOutlineCount(0) + 1, 0, p))
+        }
+        assertFailsWith<IllegalArgumentException> { (stroke.populateOutlinePosition(0, 0, -1, p)) }
+        assertFailsWith<IllegalArgumentException> {
+            (stroke.populateOutlinePosition(0, 0, stroke.getOutlineVertexCount(0, 0) + 1, p))
+        }
+    }
+
+    private fun makeBrush() = Brush(family = StockBrushes.markerLatest, size = 10f, epsilon = 0.1f)
+}
diff --git a/ink/ink-strokes/src/jvmAndroidTest/kotlin/androidx/ink/strokes/StrokeInputBatchTest.kt b/ink/ink-strokes/src/jvmAndroidTest/kotlin/androidx/ink/strokes/StrokeInputBatchTest.kt
new file mode 100644
index 0000000..f72e8de
--- /dev/null
+++ b/ink/ink-strokes/src/jvmAndroidTest/kotlin/androidx/ink/strokes/StrokeInputBatchTest.kt
@@ -0,0 +1,554 @@
+/*
+ * Copyright (C) 2024 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.ink.strokes
+
+import androidx.ink.brush.InputToolType
+import com.google.common.truth.Truth.assertThat
+import java.lang.IllegalArgumentException
+import kotlin.collections.listOf
+import kotlin.test.assertFailsWith
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+
+/** Tests [ImmutableStrokeInputBatch] and [MutableStrokeInputBatch]. */
+@RunWith(JUnit4::class)
+internal class StrokeInputBatchTest {
+
+    private val builder = MutableStrokeInputBatch()
+
+    private fun createStylusInputWithOptionals(count: Int): StrokeInput =
+        StrokeInput.create(
+            x = count * 1f,
+            y = count * 2f,
+            elapsedTimeMillis = count * 3L,
+            toolType = InputToolType.STYLUS,
+            strokeUnitLengthCm = 0.5f,
+            pressure = 0.5f,
+            tiltRadians = 0.5f,
+            orientationRadians = 0.5f,
+        )
+
+    @Test
+    fun build_returnsObjectWithNativePointer() {
+        val batch = MutableStrokeInputBatch().asImmutable()
+        assertThat(batch).isNotNull()
+        assertThat(batch.nativePointer).isNotEqualTo(0)
+    }
+
+    @Test
+    fun add_input() {
+        val firstInput = createStylusInputWithOptionals(1)
+        assertThat(builder.addOrThrow(firstInput)).isEqualTo(builder)
+        assertThat(builder.nativePointer).isNotEqualTo(0)
+        assertThat(builder.size).isEqualTo(1)
+
+        // Check batch.
+        val batch = builder.asImmutable()
+        assertThat(batch.nativePointer).isNotEqualTo(0)
+        assertThat(batch.size).isEqualTo(1)
+        assertThat(batch.get(0)).isEqualTo(firstInput)
+    }
+
+    @Test
+    fun add_input_withChainedCalls() {
+        val firstInput = createStylusInputWithOptionals(1)
+        val secondInput = createStylusInputWithOptionals(2)
+        assertThat(builder.addOrThrow(firstInput).addOrThrow(secondInput).size).isEqualTo(2)
+
+        // Check batch.
+        val batch = builder.asImmutable()
+        assertThat(batch.size).isEqualTo(2)
+        assertThat(batch.get(0)).isEqualTo(firstInput)
+        assertThat(batch.get(1)).isEqualTo(secondInput)
+    }
+
+    @Test
+    fun add_input_withBadValues_throwsIllegalArgumentException() {
+        // Bad stroke unit length.
+        val badStrokeUnitLength =
+            StrokeInput.create(
+                x = 1f,
+                y = 1f,
+                elapsedTimeMillis = 1L,
+                toolType = InputToolType.STYLUS,
+                strokeUnitLengthCm = Float.POSITIVE_INFINITY,
+            )
+        val strokeUnitLengthError =
+            assertFailsWith<IllegalArgumentException> { builder.addOrThrow(badStrokeUnitLength) }
+        assertThat(strokeUnitLengthError)
+            .hasMessageThat()
+            .contains(
+                "If present, `StrokeInput::stroke_unit_length` must be finite and strictly positive. Got: infcm"
+            )
+        assertThat(builder.size).isEqualTo(0)
+        assertThat(builder.asImmutable().size).isEqualTo(0)
+
+        // Bad pressure.
+        val badPressure = StrokeInput.create(1f, 1f, 1L, InputToolType.STYLUS, pressure = 10000f)
+        val pressureError =
+            assertFailsWith<IllegalArgumentException> { builder.addOrThrow(badPressure) }
+        assertThat(pressureError)
+            .hasMessageThat()
+            .contains("`StrokeInput::pressure` must be -1 or in the range [0, 1]. Got: 10000")
+        assertThat(builder.size).isEqualTo(0)
+        assertThat(builder.asImmutable().size).isEqualTo(0)
+
+        // Bad tilt.
+        val badTilt = StrokeInput.create(1f, 1f, 1L, InputToolType.STYLUS, tiltRadians = 1000f)
+        val tiltError = assertFailsWith<IllegalArgumentException> { builder.addOrThrow(badTilt) }
+        assertThat(tiltError)
+            .hasMessageThat()
+            .contains("`StrokeInput::tilt` must be -1 or in the range [0, pi / 2]. Got: 318.31π")
+        assertThat(builder.size).isEqualTo(0)
+        assertThat(builder.asImmutable().size).isEqualTo(0)
+
+        // Bad orientation.
+        val badOrientation =
+            StrokeInput.create(1f, 1f, 1L, InputToolType.STYLUS, orientationRadians = 10000f)
+        val orientationError =
+            assertFailsWith<IllegalArgumentException> { builder.addOrThrow(badOrientation) }
+        assertThat(orientationError)
+            .hasMessageThat()
+            .contains(
+                "`StrokeInput::orientation` must be -1 or in the range [0, 2 * pi). Got: 3183.1π"
+            )
+        assertThat(builder.size).isEqualTo(0)
+        assertThat(builder.asImmutable().size).isEqualTo(0)
+    }
+
+    @Test
+    fun add_explodedInput() {
+        val firstInput = createStylusInputWithOptionals(1)
+        assertThat(builder.addOrThrow(firstInput)).isEqualTo(builder)
+        assertThat(builder.nativePointer).isNotEqualTo(0)
+        assertThat(builder.size).isEqualTo(1)
+
+        // Check batch.
+        val batch = builder.asImmutable()
+        assertThat(batch.nativePointer).isNotEqualTo(0)
+        assertThat(batch.size).isEqualTo(1)
+        assertThat(batch.get(0)).isEqualTo(firstInput)
+    }
+
+    @Test
+    fun add_explodedInput_withChainedCalls() {
+        val firstInput = StrokeInput.create(1f, 2f, 3L, InputToolType.STYLUS, 0.5f, 0.5f, 0.5f)
+        val secondInput = StrokeInput.create(2f, 4f, 6L, InputToolType.STYLUS, 0.5f, 0.5f, 0.5f)
+        assertThat(
+                builder
+                    .addOrThrow(InputToolType.STYLUS, 1f, 2f, 3L, 0.5f, 0.5f, 0.5f)
+                    .addOrThrow(InputToolType.STYLUS, 2f, 4f, 6L, 0.5f, 0.5f, 0.5f)
+                    .size
+            )
+            .isEqualTo(2)
+
+        // Check batch.
+        val batch = builder.asImmutable()
+        assertThat(batch.size).isEqualTo(2)
+        assertThat(batch.get(0)).isEqualTo(firstInput)
+        assertThat(batch.get(1)).isEqualTo(secondInput)
+    }
+
+    @Test
+    fun add_explodedInput_withBadValues_throwsIllegalArgumentException() {
+        assertFailsWith<IllegalArgumentException> {
+            // Bad tilt, pressure, and orientation.
+            builder.addOrThrow(InputToolType.STYLUS, 1f, 1f, 1L, 10000f, 1000f, 1000f)
+        }
+        assertThat(builder.size).isEqualTo(0)
+
+        // Check batch.
+        val batch = builder.asImmutable()
+        assertThat(batch.size).isEqualTo(0)
+    }
+
+    @Test
+    fun add_collectionOfStrokeInputs() {
+        val firstInput = createStylusInputWithOptionals(1)
+        val secondInput = createStylusInputWithOptionals(2)
+        assertThat(builder.addOrThrow(listOf(firstInput, secondInput))).isEqualTo(builder)
+
+        // Check builder.
+        assertThat(builder.size).isEqualTo(2)
+
+        // Check batch.
+        val batch = builder.asImmutable()
+        assertThat(batch.size).isEqualTo(2)
+        assertThat(batch.get(0)).isEqualTo(firstInput)
+        assertThat(batch.get(1)).isEqualTo(secondInput)
+    }
+
+    @Test
+    fun add_withBadInput_throwsIllegalArgumentException() {
+        val input = createStylusInputWithOptionals(1)
+        assertFailsWith<IllegalArgumentException> { builder.addOrThrow(listOf(input, input)) }
+        assertThat(builder.size).isEqualTo(0)
+
+        // Check batch.
+        val batch = builder.asImmutable()
+        assertThat(batch.size).isEqualTo(0)
+    }
+
+    @Test
+    fun add_withStrokeInputBatch() {
+        val firstInput = createStylusInputWithOptionals(1)
+        val secondInput = createStylusInputWithOptionals(2)
+        val thirdInput = createStylusInputWithOptionals(3)
+        val fourthInput = createStylusInputWithOptionals(4)
+        assertThat(builder.addOrThrow(listOf(firstInput, secondInput))).isEqualTo(builder)
+
+        val extraBatch =
+            MutableStrokeInputBatch().addOrThrow(listOf(thirdInput, fourthInput)).asImmutable()
+
+        assertThat(builder.addOrThrow(extraBatch).size).isEqualTo(4)
+
+        // Check batch.
+        val batch = builder.asImmutable()
+        assertThat(batch.size).isEqualTo(4)
+        assertThat(batch.get(0)).isEqualTo(firstInput)
+        assertThat(batch.get(1)).isEqualTo(secondInput)
+        assertThat(batch.get(2)).isEqualTo(thirdInput)
+        assertThat(batch.get(3)).isEqualTo(fourthInput)
+    }
+
+    @Test
+    fun add_withStrokeInputBatch_withDifferentToolType_throwsIllegalArgumentException() {
+        val firstInput = StrokeInput.create(1f, 2f, 3L, InputToolType.TOUCH, 0.5f, 0.5f, 0.5f)
+        val secondInput = StrokeInput.create(2f, 4f, 6L, InputToolType.TOUCH, 0.5f, 0.5f, 0.5f)
+        val thirdInput = StrokeInput.create(3f, 6f, 9L, InputToolType.STYLUS, 0.5f, 0.5f, 0.5f)
+        val fourthInput = StrokeInput.create(4f, 8f, 12L, InputToolType.STYLUS, 0.5f, 0.5f, 0.5f)
+        assertThat(builder.addOrThrow(listOf(firstInput, secondInput))).isEqualTo(builder)
+
+        val stylusBatch =
+            MutableStrokeInputBatch().addOrThrow(listOf(thirdInput, fourthInput)).asImmutable()
+
+        assertFailsWith<IllegalArgumentException> { builder.addOrThrow(stylusBatch) }
+
+        // Check builder.
+        assertThat(builder.size).isEqualTo(2)
+
+        // Check batch.
+        val touchBatch = builder.asImmutable()
+        assertThat(touchBatch.size).isEqualTo(2)
+        assertThat(touchBatch.get(0)).isEqualTo(firstInput)
+        assertThat(touchBatch.get(1)).isEqualTo(secondInput)
+    }
+
+    @Test
+    fun addOrIgnore_withBadInput_returnsBuilderUnchanged() {
+        val badPressure = StrokeInput.create(1f, 1f, 1L, InputToolType.STYLUS, pressure = 10000f)
+        assertThat(builder.size).isEqualTo(0)
+
+        assertThat(builder.addOrIgnore(badPressure)).isEqualTo(builder)
+        assertThat(builder.size).isEqualTo(0)
+
+        assertThat(builder.addOrIgnore(listOf(badPressure))).isEqualTo(builder)
+        assertThat(builder.size).isEqualTo(0)
+
+        assertThat(builder.addOrIgnore(InputToolType.STYLUS, 1f, 1f, 1L, pressure = 10000f))
+            .isEqualTo(builder)
+        assertThat(builder.size).isEqualTo(0)
+
+        assertThat(builder.addOrIgnore(InputToolType.STYLUS, 1f, 1f, 1L, tiltRadians = 10000f))
+            .isEqualTo(builder)
+        assertThat(builder.size).isEqualTo(0)
+    }
+
+    @Test
+    fun addOrIgnore_withMismatchedBatch_returnsBuilderUnchanged() {
+        builder.addOrThrow(createStylusInputWithOptionals(1))
+        assertThat(builder.size).isEqualTo(1)
+
+        val noOptionalsInput = StrokeInput.create(1f, 1f, 10L, builder.getToolType())
+        val noOptionalsBatch = MutableStrokeInputBatch().addOrThrow(noOptionalsInput).asImmutable()
+        assertThat(builder.addOrIgnore(noOptionalsBatch)).isEqualTo(builder)
+        assertThat(builder.size).isEqualTo(1)
+    }
+
+    @Test
+    fun addOrThrow_withBadInput_throwsAnIllegalArgumentException() {
+        val badPressure = StrokeInput.create(1f, 1f, 1L, InputToolType.STYLUS, pressure = 10000f)
+        assertFailsWith<IllegalArgumentException> { builder.addOrThrow(badPressure) }
+        assertFailsWith<IllegalArgumentException> { builder.addOrThrow(listOf(badPressure)) }
+        assertFailsWith<IllegalArgumentException> {
+            builder.addOrThrow(InputToolType.STYLUS, 1f, 1f, 1L, pressure = 10000f)
+        }
+    }
+
+    @Test
+    fun addOrThrow_withMismatchedBatch_throwsAnIllegalArgumentException() {
+        builder.addOrThrow(createStylusInputWithOptionals(1))
+        assertThat(builder.size).isEqualTo(1)
+
+        val noOptionalsInput = StrokeInput.create(1f, 1f, 10L, builder.getToolType())
+        val noOptionalsBatch = MutableStrokeInputBatch().addOrThrow(noOptionalsInput).asImmutable()
+        assertFailsWith<IllegalArgumentException> { builder.addOrThrow(noOptionalsBatch) }
+        assertThat(builder.size).isEqualTo(1)
+    }
+
+    @Test
+    fun getAndOverwrite_correctlyMapsEnumsAcrossJNI() {
+        val unknownInput =
+            StrokeInput.create(1f, 2f, 3L, InputToolType.UNKNOWN, 0.5f, 0.5f, 0.5f, 0.5f)
+        val mouseInput = StrokeInput.create(2f, 3f, 4L, InputToolType.MOUSE, 0.6f, 0.6f, 0.6f, 0.6f)
+        val stylusInput =
+            StrokeInput.create(3f, 4f, 3L, InputToolType.STYLUS, 0.5f, 0.5f, 0.5f, 0.5f)
+        val touchInput = StrokeInput.create(4f, 5f, 4L, InputToolType.TOUCH, 0.6f, 0.6f, 0.6f, 0.6f)
+        val outInput = StrokeInput.create(0f, 0f, 0L, InputToolType.STYLUS, 0f, 0f, 0f, 0f)
+
+        // Check unknown batch.
+        val unknownBatch = builder.addOrThrow(unknownInput).asImmutable()
+        assertThat(unknownBatch.size).isEqualTo(1)
+        unknownBatch.populate(0, outInput)
+        assertThat(outInput).isEqualTo(unknownInput)
+
+        // Check mouse batch.
+        builder.clear()
+        val mouseBatch = builder.addOrThrow(mouseInput).asImmutable()
+        assertThat(mouseBatch.size).isEqualTo(1)
+        mouseBatch.populate(0, outInput)
+        assertThat(outInput).isEqualTo(mouseInput)
+
+        // Check stylus batch.
+        builder.clear()
+        val stylusBatch = builder.addOrThrow(stylusInput).asImmutable()
+        assertThat(stylusBatch.size).isEqualTo(1)
+        stylusBatch.populate(0, outInput)
+        assertThat(outInput).isEqualTo(stylusInput)
+
+        // Check touch batch.
+        builder.clear()
+        val touchBatch = builder.addOrThrow(touchInput).asImmutable()
+        assertThat(touchBatch.size).isEqualTo(1)
+        touchBatch.populate(0, outInput)
+        assertThat(outInput).isEqualTo(touchInput)
+    }
+
+    @Test
+    fun get_withBadIndex_throwsIllegalArgumentException() {
+
+        // Check batch.
+        val batch = builder.asImmutable()
+        // Index greater than size.
+        assertFailsWith<IllegalArgumentException> { assertThat(batch.get(1)) }
+        // Index greater less than 0.
+        assertFailsWith<IllegalArgumentException> { assertThat(batch.get(-1)) }
+    }
+
+    @Test
+    fun size_returnsSizeOfBatch() {
+        assertThat(builder.size).isEqualTo(0)
+        assertThat(
+                builder
+                    .addOrThrow(createStylusInputWithOptionals(1))
+                    .addOrThrow(createStylusInputWithOptionals(2))
+                    .addOrThrow(createStylusInputWithOptionals(3))
+                    .size
+            )
+            .isEqualTo(3)
+        // Check batch.
+        val batch = builder.asImmutable()
+        assertThat(batch.size).isEqualTo(3)
+    }
+
+    @Test
+    fun isEmpty_returnsTrue() {
+        assertThat(builder.isEmpty()).isTrue()
+
+        // Check batch.
+        val emptyBatch = builder.asImmutable()
+        assertThat(emptyBatch.isEmpty()).isTrue()
+    }
+
+    @Test
+    fun isEmpty_returnsFalse() {
+        assertThat(builder.addOrThrow(createStylusInputWithOptionals(1)).isEmpty()).isFalse()
+
+        // Check batch.
+        val batch = builder.asImmutable()
+        assertThat(batch.isEmpty()).isFalse()
+    }
+
+    @Test
+    fun toolType_returnsToolTypeOfInputs() {
+        val stylusInput = createStylusInputWithOptionals(1)
+        assertThat(builder.addOrThrow(stylusInput).getToolType()).isEqualTo(InputToolType.STYLUS)
+
+        // Check batch.
+        val batch = builder.asImmutable()
+        assertThat(batch.getToolType()).isEqualTo(InputToolType.STYLUS)
+    }
+
+    @Test
+    fun toolType_afterInputsChangeType_returnsToolTypeOfInputs() {
+        val stylusInput = createStylusInputWithOptionals(1)
+        val unknownInput = StrokeInput.create(1f, 2f, 3L, InputToolType.UNKNOWN)
+        val mouseInput = StrokeInput.create(2f, 3f, 4L, InputToolType.MOUSE)
+        val touchInput = StrokeInput.create(1f, 1f, 1L, InputToolType.TOUCH)
+        assertThat(builder.addOrThrow(stylusInput).getToolType()).isEqualTo(InputToolType.STYLUS)
+        builder.clear()
+        assertThat(builder.addOrThrow(unknownInput).getToolType()).isEqualTo(InputToolType.UNKNOWN)
+        builder.clear()
+        assertThat(builder.addOrThrow(mouseInput).getToolType()).isEqualTo(InputToolType.MOUSE)
+        builder.clear()
+        assertThat(builder.addOrThrow(touchInput).getToolType()).isEqualTo(InputToolType.TOUCH)
+
+        // Check batch.
+        val batch = builder.asImmutable()
+        assertThat(batch.getToolType()).isEqualTo(InputToolType.TOUCH)
+    }
+
+    @Test
+    fun strokeUnitLengthCm_returnsZeroIfUnset() {
+        assertThat(builder.getStrokeUnitLengthCm()).isEqualTo(0f)
+        assertThat(builder.asImmutable().hasStrokeUnitLength()).isFalse()
+        assertThat(builder.asImmutable().getStrokeUnitLengthCm()).isEqualTo(0f)
+
+        builder.addOrThrow(InputToolType.MOUSE, 1f, 2f, 3L)
+        assertThat(builder.getStrokeUnitLengthCm()).isEqualTo(0f)
+        assertThat(builder.asImmutable().hasStrokeUnitLength()).isFalse()
+        assertThat(builder.asImmutable().getStrokeUnitLengthCm()).isEqualTo(0f)
+    }
+
+    @Test
+    fun strokeUnitLengthCm_returnsValueIfSet() {
+        builder.addOrThrow(InputToolType.MOUSE, 1f, 2f, 3L, strokeUnitLengthCm = 123f)
+        assertThat(builder.getStrokeUnitLengthCm()).isEqualTo(123f)
+        assertThat(builder.asImmutable().hasStrokeUnitLength()).isTrue()
+        assertThat(builder.asImmutable().getStrokeUnitLengthCm()).isEqualTo(123f)
+    }
+
+    @Test
+    fun clear_removesAllInput() {
+        assertThat(
+                builder
+                    .addOrThrow(createStylusInputWithOptionals(1))
+                    .addOrThrow(createStylusInputWithOptionals(2))
+                    .size
+            )
+            .isEqualTo(2)
+        builder.clear()
+        assertThat(builder.size).isEqualTo(0)
+
+        // Check batch.
+        val batch = builder.asImmutable()
+        assertThat(batch.size).isEqualTo(0)
+    }
+
+    @Test
+    fun hasPressure_withPressure_returnsTrue() {
+        val pressureInput = StrokeInput.create(1f, 1f, 1L, InputToolType.STYLUS, pressure = 0.5f)
+        assertThat(builder.addOrThrow(pressureInput)).isEqualTo(builder)
+
+        // Check batch.
+        val batch = builder.asImmutable()
+        assertThat(batch.hasPressure()).isTrue()
+    }
+
+    @Test
+    fun hasPressure_withoutPressure_returnsFalse() {
+        val noPressureInput =
+            StrokeInput.create(
+                1f,
+                1f,
+                1L,
+                InputToolType.STYLUS,
+                tiltRadians = 0.5f,
+                orientationRadians = 0.5f,
+            )
+        assertThat(builder.addOrThrow(noPressureInput)).isEqualTo(builder)
+
+        // Check batch.
+        val batch = builder.asImmutable()
+        assertThat(batch.hasPressure()).isFalse()
+    }
+
+    @Test
+    fun hasTilt_withTilt_returnsTrue() {
+        val tiltInput = StrokeInput.create(1f, 1f, 1L, InputToolType.STYLUS, tiltRadians = 0.5f)
+        assertThat(builder.addOrThrow(tiltInput)).isEqualTo(builder)
+
+        // Check batch.
+        val batch = builder.asImmutable()
+        assertThat(batch.hasTilt()).isTrue()
+    }
+
+    @Test
+    fun hasTilt_withoutTilt_returnsFalse() {
+        val noTiltInput =
+            StrokeInput.create(
+                1f,
+                1f,
+                1L,
+                InputToolType.STYLUS,
+                pressure = 0.5f,
+                orientationRadians = 0.5f,
+            )
+        assertThat(builder.addOrThrow(noTiltInput)).isEqualTo(builder)
+
+        // Check batch.
+        val batch = builder.asImmutable()
+        assertThat(batch.hasTilt()).isFalse()
+    }
+
+    @Test
+    fun hasOrientation_withOrientation_returnsTrue() {
+        val orientationInput =
+            StrokeInput.create(1f, 1f, 1L, InputToolType.STYLUS, orientationRadians = 0.5f)
+        assertThat(builder.addOrThrow(orientationInput)).isEqualTo(builder)
+
+        // Check batch.
+        val batch = builder.asImmutable()
+        assertThat(batch.hasOrientation()).isTrue()
+    }
+
+    @Test
+    fun hasOrientation_withoutOrientation_returnsFalse() {
+        val noOrientationInput =
+            StrokeInput.create(
+                1f,
+                1f,
+                1L,
+                InputToolType.STYLUS,
+                pressure = 0.5f,
+                tiltRadians = 0.5f
+            )
+        assertThat(builder.addOrThrow(noOrientationInput)).isEqualTo(builder)
+
+        // Check batch.
+        val batch = builder.asImmutable()
+        assertThat(batch.hasOrientation()).isFalse()
+    }
+
+    @Test
+    fun durationMillis_WhenEmptyBatch_shouldBeZero() {
+        val batch = builder.asImmutable()
+        assertThat(batch.getDurationMillis()).isEqualTo(0L)
+    }
+
+    @Test
+    fun durationMillis_WhenMultipleInputBatch_shouldBeNonZero() {
+        val batch =
+            builder
+                .addOrThrow(createStylusInputWithOptionals(1))
+                .addOrThrow(createStylusInputWithOptionals(2))
+                .addOrThrow(createStylusInputWithOptionals(3))
+                .asImmutable()
+        assertThat(batch.getDurationMillis()).isEqualTo(6)
+    }
+}
diff --git a/ink/ink-strokes/src/jvmAndroidTest/kotlin/androidx/ink/strokes/StrokeInputTest.kt b/ink/ink-strokes/src/jvmAndroidTest/kotlin/androidx/ink/strokes/StrokeInputTest.kt
new file mode 100644
index 0000000..15a2f7e
--- /dev/null
+++ b/ink/ink-strokes/src/jvmAndroidTest/kotlin/androidx/ink/strokes/StrokeInputTest.kt
@@ -0,0 +1,249 @@
+/*
+ * Copyright (C) 2024 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.ink.strokes
+
+import androidx.ink.brush.InputToolType
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+
+@RunWith(JUnit4::class)
+class StrokeInputTest {
+
+    @Test
+    fun toString_withValues() {
+        val input = StrokeInput()
+        input.update(
+            x = 2f,
+            y = 3f,
+            elapsedTimeMillis = 4L,
+            toolType = InputToolType.STYLUS,
+            strokeUnitLengthCm = 0.1f,
+            pressure = 0.2f,
+            tiltRadians = 0.3f,
+            orientationRadians = 0.4f,
+        )
+        assertThat(input.toString())
+            .isEqualTo(
+                "StrokeInput(x=2.0, y=3.0, elapsedTimeMillis=4, toolType=InputToolType.STYLUS, strokeUnitLengthCm=0.1, pressure=0.2, tiltRadians=0.3, orientationRadians=0.4)"
+            )
+    }
+
+    @Test
+    fun overwrite_shouldReassignValues() {
+        val input = StrokeInput()
+        input.update(1f, 2f, 3L, InputToolType.TOUCH)
+        input.update(2f, 3f, 4L, InputToolType.STYLUS, 0.1f, 0.2f, 0.3f, 0.4f)
+        assertThat(input).isNotNull()
+        assertThat(input.x).isEqualTo(2f)
+        assertThat(input.y).isEqualTo(3f)
+        assertThat(input.elapsedTimeMillis).isEqualTo(4L)
+        assertThat(input.toolType).isEqualTo(InputToolType.STYLUS)
+        assertThat(input.strokeUnitLengthCm).isEqualTo(0.1f)
+        assertThat(input.pressure).isEqualTo(0.2f)
+        assertThat(input.tiltRadians).isEqualTo(0.3f)
+        assertThat(input.orientationRadians).isEqualTo(0.4f)
+    }
+
+    @Test
+    fun overwrite_withDefaultValues_shouldReassignValues() {
+        val input = StrokeInput()
+        input.update(
+            x = 1f,
+            y = 2f,
+            elapsedTimeMillis = 3L,
+            toolType = InputToolType.STYLUS,
+            strokeUnitLengthCm = 0.4f,
+            pressure = 0.5f,
+            tiltRadians = 0.7f,
+            orientationRadians = 0.9F,
+        )
+        input.update(2f, 3f, 4L, InputToolType.TOUCH)
+        assertThat(input).isNotNull()
+        assertThat(input.x).isEqualTo(2f)
+        assertThat(input.y).isEqualTo(3f)
+        assertThat(input.elapsedTimeMillis).isEqualTo(4L)
+        assertThat(input.toolType).isEqualTo(InputToolType.TOUCH)
+        assertThat(input.strokeUnitLengthCm).isEqualTo(StrokeInput.NO_STROKE_UNIT_LENGTH)
+        assertThat(input.pressure).isEqualTo(StrokeInput.NO_PRESSURE)
+        assertThat(input.tiltRadians).isEqualTo(StrokeInput.NO_TILT)
+        assertThat(input.orientationRadians).isEqualTo(StrokeInput.NO_ORIENTATION)
+    }
+
+    @Test
+    fun equals_whenSame_shouldReturnTrueAndHaveSameHashCode() {
+        val input1 =
+            StrokeInput.create(
+                x = 1F,
+                y = 2F,
+                elapsedTimeMillis = 3L,
+                toolType = InputToolType.STYLUS,
+                strokeUnitLengthCm = 4F,
+                pressure = 5F,
+                tiltRadians = 6F,
+                orientationRadians = 7F,
+            )
+        val input2 =
+            StrokeInput.create(
+                x = 1F,
+                y = 2F,
+                elapsedTimeMillis = 3L,
+                toolType = InputToolType.STYLUS,
+                strokeUnitLengthCm = 4F,
+                pressure = 5F,
+                tiltRadians = 6F,
+                orientationRadians = 7F,
+            )
+
+        // Same instance.
+        assertThat(input1).isEqualTo(input1)
+        assertThat(input2).isEqualTo(input2)
+        assertThat(input1.hashCode()).isEqualTo(input1.hashCode())
+        assertThat(input2.hashCode()).isEqualTo(input2.hashCode())
+        // Different instance, same values.
+        assertThat(input2).isEqualTo(input1)
+        assertThat(input1.hashCode()).isEqualTo(input2.hashCode())
+    }
+
+    @Test
+    fun equals_whenOneValueDifferent_shouldReturnFalse() {
+        val input =
+            StrokeInput.create(
+                x = 1F,
+                y = 2F,
+                elapsedTimeMillis = 3L,
+                toolType = InputToolType.STYLUS,
+                strokeUnitLengthCm = 4F,
+                pressure = 5F,
+                tiltRadians = 6F,
+                orientationRadians = 7F,
+            )
+
+        assertThat(
+                StrokeInput.create(
+                    x = 999F,
+                    y = 2F,
+                    elapsedTimeMillis = 3L,
+                    toolType = InputToolType.STYLUS,
+                    strokeUnitLengthCm = 4F,
+                    pressure = 5F,
+                    tiltRadians = 6F,
+                    orientationRadians = 7F,
+                )
+            )
+            .isNotEqualTo(input)
+
+        assertThat(
+                StrokeInput.create(
+                    x = 1F,
+                    y = 999F,
+                    elapsedTimeMillis = 3L,
+                    toolType = InputToolType.STYLUS,
+                    strokeUnitLengthCm = 4F,
+                    pressure = 5F,
+                    tiltRadians = 6F,
+                    orientationRadians = 7F,
+                )
+            )
+            .isNotEqualTo(input)
+
+        assertThat(
+                StrokeInput.create(
+                    x = 1F,
+                    y = 2F,
+                    elapsedTimeMillis = 999L,
+                    toolType = InputToolType.STYLUS,
+                    strokeUnitLengthCm = 4F,
+                    pressure = 5F,
+                    tiltRadians = 6F,
+                    orientationRadians = 7F,
+                )
+            )
+            .isNotEqualTo(input)
+
+        assertThat(
+                StrokeInput.create(
+                    x = 1F,
+                    y = 2F,
+                    elapsedTimeMillis = 3L,
+                    toolType = InputToolType.MOUSE,
+                    strokeUnitLengthCm = 4F,
+                    pressure = 5F,
+                    tiltRadians = 6F,
+                    orientationRadians = 7F,
+                )
+            )
+            .isNotEqualTo(input)
+
+        assertThat(
+                StrokeInput.create(
+                    x = 1F,
+                    y = 2F,
+                    elapsedTimeMillis = 3L,
+                    toolType = InputToolType.STYLUS,
+                    strokeUnitLengthCm = 999F,
+                    pressure = 5F,
+                    tiltRadians = 6F,
+                    orientationRadians = 7F,
+                )
+            )
+            .isNotEqualTo(input)
+
+        assertThat(
+                StrokeInput.create(
+                    x = 1F,
+                    y = 2F,
+                    elapsedTimeMillis = 3L,
+                    toolType = InputToolType.STYLUS,
+                    strokeUnitLengthCm = 4F,
+                    pressure = 999F,
+                    tiltRadians = 6F,
+                    orientationRadians = 7F,
+                )
+            )
+            .isNotEqualTo(input)
+
+        assertThat(
+                StrokeInput.create(
+                    x = 1F,
+                    y = 2F,
+                    elapsedTimeMillis = 3L,
+                    toolType = InputToolType.STYLUS,
+                    strokeUnitLengthCm = 4F,
+                    pressure = 5F,
+                    tiltRadians = 999F,
+                    orientationRadians = 7F,
+                )
+            )
+            .isNotEqualTo(input)
+
+        assertThat(
+                StrokeInput.create(
+                    x = 1F,
+                    y = 2F,
+                    elapsedTimeMillis = 3L,
+                    toolType = InputToolType.STYLUS,
+                    strokeUnitLengthCm = 4F,
+                    pressure = 5F,
+                    tiltRadians = 6F,
+                    orientationRadians = 999F,
+                )
+            )
+            .isNotEqualTo(input)
+    }
+}
diff --git a/ink/ink-strokes/src/jvmAndroidTest/kotlin/androidx/ink/strokes/StrokeTest.kt b/ink/ink-strokes/src/jvmAndroidTest/kotlin/androidx/ink/strokes/StrokeTest.kt
new file mode 100644
index 0000000..c730120
--- /dev/null
+++ b/ink/ink-strokes/src/jvmAndroidTest/kotlin/androidx/ink/strokes/StrokeTest.kt
@@ -0,0 +1,333 @@
+/*
+ * Copyright (C) 2024 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.ink.strokes
+
+import androidx.ink.brush.Brush
+import androidx.ink.brush.BrushCoat
+import androidx.ink.brush.BrushFamily
+import androidx.ink.brush.BrushPaint
+import androidx.ink.brush.BrushTip
+import androidx.ink.brush.ExperimentalInkCustomBrushApi
+import androidx.ink.brush.color.Color
+import androidx.ink.brush.color.colorspace.ColorSpaces
+import androidx.ink.strokes.testing.buildStrokeInputBatchFromPoints
+import com.google.common.collect.ImmutableList
+import com.google.common.truth.Truth.assertThat
+import org.junit.Assert.assertThrows
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+
+@OptIn(ExperimentalInkCustomBrushApi::class)
+@RunWith(JUnit4::class)
+class StrokeTest {
+
+    @Test
+    fun constructor_withBrushAndInputs() {
+        val brushIn = buildTestBrush()
+        val inputsIn = makeTestInputs()
+        val stroke = Stroke(brushIn, inputsIn)
+
+        assertThat(stroke.brush).isSameInstanceAs(brushIn)
+        assertThat(stroke.inputs).isSameInstanceAs(inputsIn)
+    }
+
+    @Test
+    fun constructor_withBrushInputsAndShape() {
+        val brushIn = buildTestBrush()
+        val inputsIn = makeTestInputs()
+        val originalStroke = Stroke(brushIn, inputsIn)
+
+        val newStroke = Stroke(brushIn, inputsIn, originalStroke.shape)
+
+        // Kotlin properties are the same
+        assertThat(newStroke.brush).isSameInstanceAs(brushIn)
+        assertThat(newStroke.inputs).isSameInstanceAs(inputsIn)
+        assertThat(newStroke.shape).isSameInstanceAs(originalStroke.shape)
+
+        // C++ Stroke is different
+        assertThat(newStroke.nativeAddress).isNotEqualTo(originalStroke.nativeAddress)
+    }
+
+    @Test
+    fun constructor_withMismatchedBrushAndShape_throwsException() {
+        // Create a [ModeledShape] with render group.
+        val inputs = makeTestInputs()
+        val shape = Stroke(buildTestBrush(), inputs).shape
+        assertThat(shape.renderGroupCount).isEqualTo(1)
+
+        // Create a brush with two brush coats.
+        val coat = BrushCoat(BrushTip(), BrushPaint())
+        val brush = Brush(BrushFamily(ImmutableList.of(coat, coat)), size = 10f, epsilon = 0.1f)
+
+        // We should get an error, because the number of render groups doesn't match the number of
+        // brush
+        // coats.
+        assertThrows(IllegalArgumentException::class.java) { Stroke(brush, inputs, shape) }
+    }
+
+    @Test
+    fun copy_withSameBrush_returnsSameInstance() {
+        val originalStroke = buildTestStroke()
+
+        val actual = originalStroke.copy(originalStroke.brush)
+
+        // A pure copy returns `this`.
+        assertThat(actual).isSameInstanceAs(originalStroke)
+    }
+
+    @Test
+    fun copy_withChangedBrushColor_createsCopyWithSameInputsAndShape() {
+        val originalBrush = buildTestBrush()
+        val colorChangedBrush =
+            Brush.createWithColorLong(
+                family = originalBrush.family,
+                colorLong = Color(0.1f, 0.2f, 0.3f, 0.4f, ColorSpaces.DisplayP3).value.toLong(),
+                size = originalBrush.size,
+                epsilon = originalBrush.epsilon,
+            )
+        val inputs = makeTestInputs()
+        val originalStroke = Stroke(originalBrush, inputs)
+
+        val actual = originalStroke.copy(brush = colorChangedBrush)
+
+        // The new stroke has the changed brush.
+        assertThat(actual.brush).isSameInstanceAs(colorChangedBrush)
+        // The new stroke has the same inputs and shape as original brush.
+        assertThat(actual.inputs).isSameInstanceAs(inputs)
+        assertThat(actual.shape).isSameInstanceAs(originalStroke.shape)
+
+        // The new C++ Stroke is different from the original stroke.
+        assertThat(actual.nativeAddress).isNotEqualTo(originalStroke.nativeAddress)
+    }
+
+    @Test
+    fun copy_withChangedBrushTip_createsCopyWithSameInputs() {
+        val originalBrush = buildTestBrush()
+        val tipChangedBrush =
+            Brush.createWithColorLong(
+                family =
+                    BrushFamily(
+                        coats =
+                            // The preferred Kotlin API method, [toImmutableList], is only available
+                            // in google3,
+                            // but this class and method are targeted for Jetpack.
+                            @Suppress("PreferKotlinApi")
+                            ImmutableList.copyOf(
+                                originalBrush.family.coats.map { coat ->
+                                    BrushCoat(
+                                        tips =
+                                            // The preferred Kotlin API method, [toImmutableList],
+                                            // is only available in
+                                            // google3, but this class and method are targeted for
+                                            // Jetpack.
+                                            @Suppress("PreferKotlinApi")
+                                            ImmutableList.copyOf(
+                                                coat.tips.map { tip -> tip.copy(scaleX = 0.12345f) }
+                                            ),
+                                        paint = coat.paint,
+                                    )
+                                }
+                            ),
+                        uri = originalBrush.family.uri,
+                    ),
+                colorLong = originalBrush.colorLong,
+                size = originalBrush.size,
+                epsilon = originalBrush.epsilon,
+            )
+        val inputs = makeTestInputs()
+        val originalStroke = Stroke(originalBrush, inputs)
+
+        val actual = originalStroke.copy(brush = tipChangedBrush)
+
+        // The new stroke has the original inputs and the changed brush.
+        assertThat(actual.inputs).isSameInstanceAs(inputs)
+        assertThat(actual.brush).isSameInstanceAs(tipChangedBrush)
+
+        // The new stroke has a different shape than the original stroke.
+        assertThat(actual.shape).isNotSameInstanceAs(originalStroke.shape)
+
+        // The new C++ Stroke is different from the original stroke.
+        assertThat(actual.nativeAddress).isNotEqualTo(originalStroke.nativeAddress)
+    }
+
+    @Test
+    fun copy_withChangedBrushPaint_createsCopyWithSameInputsAndShape() {
+        val originalBrush = buildTestBrush()
+        val paintChangedBrush =
+            originalBrush.copy(
+                family =
+                    originalBrush.family.copy(
+                        coats =
+                            // The preferred Kotlin API method, [toImmutableList], is only available
+                            // in google3,
+                            // but this class and method are targeted for Jetpack.
+                            @Suppress("PreferKotlinApi")
+                            ImmutableList.copyOf(
+                                originalBrush.family.coats.map { coat ->
+                                    coat.copy(
+                                        paint =
+                                            BrushPaint(
+                                                ImmutableList.of(
+                                                    BrushPaint.TextureLayer(
+                                                        colorTextureUri =
+                                                            "ink://ink/texture:test-one",
+                                                        sizeX = 123.45F,
+                                                        sizeY = 678.90F,
+                                                        offsetX = 0.1F,
+                                                        offsetY = 0.2F,
+                                                        sizeUnit =
+                                                            BrushPaint.TextureSizeUnit
+                                                                .STROKE_COORDINATES,
+                                                        mapping = BrushPaint.TextureMapping.TILING,
+                                                    ),
+                                                    BrushPaint.TextureLayer(
+                                                        colorTextureUri =
+                                                            "ink://ink/texture:test-two",
+                                                        sizeX = 256F,
+                                                        sizeY = 256F,
+                                                        offsetX = 0.1F,
+                                                        offsetY = 0.2F,
+                                                        sizeUnit =
+                                                            BrushPaint.TextureSizeUnit
+                                                                .STROKE_COORDINATES,
+                                                        mapping = BrushPaint.TextureMapping.TILING,
+                                                    ),
+                                                )
+                                            )
+                                    )
+                                }
+                            )
+                    )
+            )
+        val inputs = makeTestInputs()
+        val originalStroke = Stroke(originalBrush, inputs)
+
+        val actual = originalStroke.copy(brush = paintChangedBrush)
+
+        // The new stroke has the changed brush.
+        assertThat(actual.brush).isSameInstanceAs(paintChangedBrush)
+        // The new stroke has the same inputs and shape as original brush.
+        assertThat(actual.inputs).isSameInstanceAs(inputs)
+        assertThat(actual.shape).isSameInstanceAs(originalStroke.shape)
+
+        // The new C++ Stroke is different from the original stroke.
+        assertThat(actual.nativeAddress).isNotEqualTo(originalStroke.nativeAddress)
+    }
+
+    @Test
+    fun copy_withChangedBrushSize_createsCopyWithSameInputs() {
+        val originalBrush = buildTestBrush()
+        val sizeChangedBrush = originalBrush.copy(size = 99f)
+        val inputs = makeTestInputs()
+        val originalStroke = Stroke(originalBrush, inputs)
+
+        val actual = originalStroke.copy(brush = sizeChangedBrush)
+
+        // The new stroke has the original inputs and the changed brush.
+        assertThat(actual.inputs).isSameInstanceAs(inputs)
+        assertThat(actual.brush).isSameInstanceAs(sizeChangedBrush)
+
+        // The new stroke has a different shape than the original stroke.
+        assertThat(actual.shape).isNotSameInstanceAs(originalStroke.shape)
+
+        // The new C++ Stroke is different from the original stroke.
+        assertThat(actual.nativeAddress).isNotEqualTo(originalStroke.nativeAddress)
+    }
+
+    @Test
+    fun copy_withChangedBrushEpsilon_createsCopyWithSameInputs() {
+        val originalBrush = buildTestBrush()
+        val epsilonChangedBrush = originalBrush.copy(epsilon = 0.99f)
+        val inputs = makeTestInputs()
+        val originalStroke = Stroke(originalBrush, inputs)
+
+        val actual = originalStroke.copy(brush = epsilonChangedBrush)
+
+        // The new stroke has the original inputs and the changed brush.
+        assertThat(actual.inputs).isSameInstanceAs(inputs)
+        assertThat(actual.brush).isSameInstanceAs(epsilonChangedBrush)
+
+        // The new stroke has a different shape than the original stroke.
+        assertThat(actual.shape).isNotSameInstanceAs(originalStroke.shape)
+
+        // The new C++ Stroke is different from the original stroke.
+        assertThat(actual.nativeAddress).isNotEqualTo(originalStroke.nativeAddress)
+    }
+
+    @Test
+    fun toString_returnsAString() {
+        val string = buildTestStroke().toString()
+
+        // Not elaborate checks - this test mainly exists to ensure that toString doesn't crash.
+        assertThat(string).contains("Stroke")
+        assertThat(string).contains("brush")
+        assertThat(string).contains("inputs")
+        assertThat(string).contains("shape")
+    }
+
+    /**
+     * Creates a brush for testing with:
+     *
+     * Family Uri ="//ink/brush-family:pencil", distinctly different from the default native brush
+     * family.
+     *
+     * Color has nontrivial values for all channels and the color space.
+     *
+     * Size = 7f, an arbitrary value for testing.
+     *
+     * Epsilon = 0.0012345f, an arbitrary value for testing.
+     */
+    private fun buildTestBrush() =
+        Brush.createWithColorLong(
+            BrushFamily(uri = "//ink/brush-family:pencil"),
+            Color(0.6f, 0.7f, 0.8f, 0.9f, ColorSpaces.DisplayP3).value.toLong(),
+            7f,
+            0.0012345f,
+        )
+
+    /**
+     * Creates a stroke with:
+     *
+     * Brush = buildTestBrush()
+     *
+     * Inputs = [{10,3}, {20, 5}]
+     *
+     * StrokeShape generated from the inputs and brush.
+     */
+    private fun buildTestStroke(): Stroke {
+        val batch = buildStrokeInputBatchFromPoints(floatArrayOf(10f, 3f, 20f, 5f)).asImmutable()
+        return Stroke(buildTestBrush(), batch)
+    }
+
+    /**
+     * Make checkmark shaped test input batch with three input points, scaling the x,y,t values by a
+     * [factor] to create varied input batches across a test case.
+     */
+    private fun makeTestInputs(factor: Int = 1): ImmutableStrokeInputBatch =
+        buildStrokeInputBatchFromPoints(
+                floatArrayOf(
+                    factor * 1f,
+                    factor * 1f,
+                    factor * 2f,
+                    factor * 3f,
+                    factor * 5f,
+                    factor * 2f
+                )
+            )
+            .asImmutable()
+}
diff --git a/inspection/inspection-gradle-plugin/lint-baseline.xml b/inspection/inspection-gradle-plugin/lint-baseline.xml
index 603e7bd..ef0ffef 100644
--- a/inspection/inspection-gradle-plugin/lint-baseline.xml
+++ b/inspection/inspection-gradle-plugin/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
+<issues format="6" by="lint 8.7.0-alpha02" type="baseline" client="gradle" dependencies="false" name="AGP (8.7.0-alpha02)" variant="all" version="8.7.0-alpha02">
 
     <issue
         id="EagerGradleConfiguration"
@@ -38,6 +38,24 @@
     </issue>
 
     <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method findProject"
+        errorLine1="    val inspectorProject = libraryProject.rootProject.findProject(inspectorProjectPath)"
+        errorLine2="                                                      ~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/androidx/inspection/gradle/InspectionPlugin.kt"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="    val inspectorProject = libraryProject.rootProject.findProject(inspectorProjectPath)"
+        errorLine2="                                          ~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/androidx/inspection/gradle/InspectionPlugin.kt"/>
+    </issue>
+
+    <issue
         id="WithPluginClasspathUsage"
         message="Avoid usage of GradleRunner#withPluginClasspath, which is broken. Instead use something like https://github.com/autonomousapps/dependency-analysis-gradle-plugin/tree/main/testkit#gradle-testkit-support-plugin"
         errorLine1="            GradleRunner.create().withProjectDir(projectSetup.rootDir).withPluginClasspath()"
diff --git a/libraryversions.toml b/libraryversions.toml
index 3980454..c73bef8 100644
--- a/libraryversions.toml
+++ b/libraryversions.toml
@@ -1,6 +1,6 @@
 [versions]
 ACTIVITY = "1.10.0-alpha02"
-ANNOTATION = "1.9.0-alpha02"
+ANNOTATION = "1.9.0-alpha03"
 ANNOTATION_EXPERIMENTAL = "1.5.0-alpha01"
 APPCOMPAT = "1.8.0-alpha01"
 APPSEARCH = "1.1.0-alpha05"
diff --git a/lifecycle/lifecycle-runtime-compose/build.gradle b/lifecycle/lifecycle-runtime-compose/build.gradle
index be2d776..0ffdf85 100644
--- a/lifecycle/lifecycle-runtime-compose/build.gradle
+++ b/lifecycle/lifecycle-runtime-compose/build.gradle
@@ -23,6 +23,7 @@
  */
 import androidx.build.LibraryType
 import androidx.build.PlatformIdentifier
+import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
 
 plugins {
     id("AndroidXPlugin")
@@ -32,7 +33,8 @@
 
 androidXMultiplatform {
     android()
-    desktop()
+    jvmStubs()
+    linuxX64Stubs()
 
     defaultPlatform(PlatformIdentifier.ANDROID)
 
@@ -41,7 +43,7 @@
             dependencies {
                 api(projectOrArtifact(":lifecycle:lifecycle-runtime"))
                 api("androidx.annotation:annotation:1.8.1")
-                api("androidx.compose.runtime:runtime:1.6.5")
+                api(project(":compose:runtime:runtime"))
             }
         }
 
@@ -67,6 +69,18 @@
                 implementation(project(":kruth:kruth"))
             }
         }
+
+        nonAndroidMain {
+            dependsOn(commonMain)
+        }
+
+        jvmStubsMain {
+            dependsOn(nonAndroidMain)
+        }
+
+        linuxx64StubsMain {
+            dependsOn(nonAndroidMain)
+        }
     }
 }
 
diff --git a/lifecycle/lifecycle-runtime-compose/src/desktopMain/kotlin/androidx/lifecycle/compose/LocalLifecycleOwner.desktop.kt b/lifecycle/lifecycle-runtime-compose/src/nonAndroidMain/kotlin/androidx/lifecycle/compose/LocalLifecycleOwner.nonAndroid.kt
similarity index 96%
rename from lifecycle/lifecycle-runtime-compose/src/desktopMain/kotlin/androidx/lifecycle/compose/LocalLifecycleOwner.desktop.kt
rename to lifecycle/lifecycle-runtime-compose/src/nonAndroidMain/kotlin/androidx/lifecycle/compose/LocalLifecycleOwner.nonAndroid.kt
index 1a1c7e5..07eda1d 100644
--- a/lifecycle/lifecycle-runtime-compose/src/desktopMain/kotlin/androidx/lifecycle/compose/LocalLifecycleOwner.desktop.kt
+++ b/lifecycle/lifecycle-runtime-compose/src/nonAndroidMain/kotlin/androidx/lifecycle/compose/LocalLifecycleOwner.nonAndroid.kt
@@ -21,6 +21,7 @@
 import androidx.compose.runtime.ProvidableCompositionLocal
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.lifecycle.LifecycleOwner
+import kotlin.jvm.JvmName
 
 public actual val LocalLifecycleOwner: ProvidableCompositionLocal<LifecycleOwner> =
     staticCompositionLocalOf {
diff --git a/lint/lint-gradle/src/main/java/androidx/lint/gradle/DiscouragedGradleMethodDetector.kt b/lint/lint-gradle/src/main/java/androidx/lint/gradle/DiscouragedGradleMethodDetector.kt
index e8680ae..3f129b8 100644
--- a/lint/lint-gradle/src/main/java/androidx/lint/gradle/DiscouragedGradleMethodDetector.kt
+++ b/lint/lint-gradle/src/main/java/androidx/lint/gradle/DiscouragedGradleMethodDetector.kt
@@ -140,8 +140,11 @@
                     Replacement(NAMED_DOMAIN_OBJECT_COLLECTION, null, EAGER_CONFIGURATION_ISSUE),
                 "findByName" to Replacement(TASK_CONTAINER, null, EAGER_CONFIGURATION_ISSUE),
                 "findByPath" to Replacement(TASK_CONTAINER, null, EAGER_CONFIGURATION_ISSUE),
+                "findProject" to Replacement(PROJECT, null, PROJECT_ISOLATION_ISSUE),
                 "findProperty" to
                     Replacement(PROJECT, "providers.gradleProperty", PROJECT_ISOLATION_ISSUE),
+                "hasProperty" to
+                    Replacement(PROJECT, "providers.gradleProperty", PROJECT_ISOLATION_ISSUE),
                 "property" to
                     Replacement(PROJECT, "providers.gradleProperty", PROJECT_ISOLATION_ISSUE),
                 "iterator" to Replacement(TASK_CONTAINER, null, EAGER_CONFIGURATION_ISSUE),
@@ -149,8 +152,10 @@
                 "getAt" to Replacement(TASK_COLLECTION, "named", EAGER_CONFIGURATION_ISSUE),
                 "getByPath" to Replacement(TASK_CONTAINER, null, EAGER_CONFIGURATION_ISSUE),
                 "getByName" to Replacement(TASK_CONTAINER, "named", EAGER_CONFIGURATION_ISSUE),
+                "getParent" to Replacement(PROJECT, null, PROJECT_ISOLATION_ISSUE),
                 "getProperties" to
                     Replacement(PROJECT, "providers.gradleProperty", PROJECT_ISOLATION_ISSUE),
+                "getRootProject" to Replacement(PROJECT, null, PROJECT_ISOLATION_ISSUE),
                 "matching" to Replacement(TASK_COLLECTION, null, EAGER_CONFIGURATION_ISSUE),
                 "replace" to Replacement(TASK_CONTAINER, null, EAGER_CONFIGURATION_ISSUE),
                 "remove" to Replacement(TASK_CONTAINER, null, EAGER_CONFIGURATION_ISSUE),
diff --git a/navigation/navigation-common/api/current.txt b/navigation/navigation-common/api/current.txt
index bb6ad19..cabfeb1 100644
--- a/navigation/navigation-common/api/current.txt
+++ b/navigation/navigation-common/api/current.txt
@@ -590,5 +590,8 @@
     method public static inline <reified T> T toRoute(androidx.lifecycle.SavedStateHandle, optional java.util.Map<kotlin.reflect.KType,androidx.navigation.NavType<? extends java.lang.Object?>> typeMap);
   }
 
+  public interface SupportingPane {
+  }
+
 }
 
diff --git a/navigation/navigation-common/api/restricted_current.txt b/navigation/navigation-common/api/restricted_current.txt
index bb6ad19..cabfeb1 100644
--- a/navigation/navigation-common/api/restricted_current.txt
+++ b/navigation/navigation-common/api/restricted_current.txt
@@ -590,5 +590,8 @@
     method public static inline <reified T> T toRoute(androidx.lifecycle.SavedStateHandle, optional java.util.Map<kotlin.reflect.KType,androidx.navigation.NavType<? extends java.lang.Object?>> typeMap);
   }
 
+  public interface SupportingPane {
+  }
+
 }
 
diff --git a/navigation/navigation-common/src/main/java/androidx/navigation/SupportingPane.kt b/navigation/navigation-common/src/main/java/androidx/navigation/SupportingPane.kt
new file mode 100644
index 0000000..a6fd4ff
--- /dev/null
+++ b/navigation/navigation-common/src/main/java/androidx/navigation/SupportingPane.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2024 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.navigation
+
+/**
+ * A marker interface for [NavDestination] subclasses that sit alongside the view of other
+ * destinations.
+ *
+ * Supporting pane destinations have the same lifecycle as the other visible destinations (e.g., a
+ * non-SupportingPane destination will continue to be resumed when a supporting pane is added to the
+ * back stack).
+ *
+ * [androidx.navigation.NavController.OnDestinationChangedListener] instances can also customize
+ * their behavior based on whether the destination is a SupportingPane.
+ */
+public interface SupportingPane
diff --git a/navigation/navigation-lint-common/src/main/java/androidx/navigation/lint/common/LintUtil.kt b/navigation/navigation-lint-common/src/main/java/androidx/navigation/lint/common/LintUtil.kt
index 85d67c3..a0a5193 100644
--- a/navigation/navigation-lint-common/src/main/java/androidx/navigation/lint/common/LintUtil.kt
+++ b/navigation/navigation-lint-common/src/main/java/androidx/navigation/lint/common/LintUtil.kt
@@ -33,7 +33,11 @@
 import org.jetbrains.uast.USimpleNameReferenceExpression
 
 /** Catches simple class/interface name reference */
-fun UExpression.isClassReference(): Pair<Boolean, String?> {
+fun UExpression.isClassReference(
+    checkClass: Boolean = true,
+    checkInterface: Boolean = true,
+    checkCompanion: Boolean = true
+): Pair<Boolean, String?> {
     /**
      * True if:
      * 1. reference to object (i.e. val myStart = TestStart(), startDest = myStart)
@@ -66,9 +70,10 @@
             }
                 as? KtClassOrObjectSymbol ?: return false to null
 
-        (symbol.classKind.isClass ||
-            symbol.classKind == KtClassKind.INTERFACE ||
-            symbol.classKind == KtClassKind.COMPANION_OBJECT) to symbol.name?.asString()
+        ((checkClass && symbol.classKind.isClass) ||
+            (checkInterface && symbol.classKind == KtClassKind.INTERFACE) ||
+            (checkCompanion && symbol.classKind == KtClassKind.COMPANION_OBJECT)) to
+            symbol.name?.asString()
     }
 }
 
diff --git a/navigation/navigation-runtime-lint/src/main/java/androidx/navigation/runtime/lint/WrongPopBackStackRouteDetector.kt b/navigation/navigation-runtime-lint/src/main/java/androidx/navigation/runtime/lint/WrongPopBackStackRouteDetector.kt
new file mode 100644
index 0000000..ade1178
--- /dev/null
+++ b/navigation/navigation-runtime-lint/src/main/java/androidx/navigation/runtime/lint/WrongPopBackStackRouteDetector.kt
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2024 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.navigation.runtime.lint
+
+import androidx.navigation.lint.common.isClassReference
+import com.android.tools.lint.detector.api.Category
+import com.android.tools.lint.detector.api.Detector
+import com.android.tools.lint.detector.api.Implementation
+import com.android.tools.lint.detector.api.Issue
+import com.android.tools.lint.detector.api.JavaContext
+import com.android.tools.lint.detector.api.LintFix
+import com.android.tools.lint.detector.api.Scope
+import com.android.tools.lint.detector.api.Severity
+import com.android.tools.lint.detector.api.SourceCodeScanner
+import com.intellij.psi.PsiMethod
+import org.jetbrains.uast.UCallExpression
+import org.jetbrains.uast.UElement
+import org.jetbrains.uast.getParameterForArgument
+
+class WrongPopBackStackRouteDetector : Detector(), SourceCodeScanner {
+
+    companion object {
+        val WrongPopBackStackRouteType =
+            Issue.create(
+                id = "WrongPopBackStackRouteType",
+                briefDescription = "Data class routes should use PopBackStack with reified class.",
+                explanation =
+                    "If the route is a data class with arguments, attempting to call " +
+                        "popBackStack with only the class will causes a serialization error and " +
+                        "you may not have the proper argument to call it with an instance. You " +
+                        "should instead used the provided popBackStack function that takes the " +
+                        "reified class name.",
+                category = Category.CORRECTNESS,
+                severity = Severity.ERROR,
+                implementation =
+                    Implementation(
+                        WrongPopBackStackRouteDetector::class.java,
+                        Scope.JAVA_FILE_SCOPE
+                    )
+            )
+    }
+
+    final override fun getApplicableMethodNames(): List<String> = listOf("popBackStack")
+
+    final override fun visitMethodCall(
+        context: JavaContext,
+        node: UCallExpression,
+        method: PsiMethod
+    ) {
+        val startNode =
+            node.valueArguments.find { node.getParameterForArgument(it)?.name == "route" } ?: return
+
+        val (isClassType, _) =
+            startNode.isClassReference(
+                checkClass = false,
+                checkInterface = false,
+                checkCompanion = true
+            )
+        if (isClassType) {
+            context.report(
+                WrongPopBackStackRouteType,
+                startNode,
+                context.getNameLocation(startNode as UElement),
+                """
+                Use popBackStack with reified class instead.
+                    """
+                    .trimIndent(),
+                LintFix.create()
+                    .replace()
+                    .range(context.getNameLocation(node.uastParent as UElement))
+                    .name("Use popBackStack with reified class instead.")
+                    .text(node.sourcePsi?.text)
+                    .with(
+                        node.sourcePsi
+                            ?.text
+                            ?.replace("(", "<")
+                            ?.replace("route =", "")
+                            ?.replace(",", ">(")
+                            ?.filterNot { it.isWhitespace() } // remove all white space
+                            ?.replace(",", ", ") // correct comma formatting
+                    )
+                    .autoFix()
+                    .build()
+            )
+        }
+    }
+}
diff --git a/navigation/navigation-runtime-lint/src/test/java/androidx/navigation/runtime/lint/Stub.kt b/navigation/navigation-runtime-lint/src/test/java/androidx/navigation/runtime/lint/Stub.kt
index 89df0cd..ef01b20 100644
--- a/navigation/navigation-runtime-lint/src/test/java/androidx/navigation/runtime/lint/Stub.kt
+++ b/navigation/navigation-runtime-lint/src/test/java/androidx/navigation/runtime/lint/Stub.kt
@@ -23,7 +23,7 @@
     bytecodeStub(
         "NavController.kt",
         "androidx/navigation",
-        0x40e8c1a8,
+        0xe2eb4ee4,
         """
 package androidx.navigation
 
@@ -36,6 +36,17 @@
     fun navigate(route: String) {}
 
     fun <T : Any> navigate(route: T) {}
+
+    inline fun <reified T: Any> popBackStack(
+        inclusive: Boolean,
+        saveState: Boolean = false
+    ) {}
+
+    fun <T : Any> popBackStack(
+        route: T,
+        inclusive: Boolean,
+        saveState: Boolean = false
+    ) {}
 }
 
 inline fun NavController.createGraph(
@@ -46,48 +57,58 @@
         """
 META-INF/main.kotlin_module:
 H4sIAAAAAAAA/2NgYGBmYGBgBGJOBijgMuQSTsxLKcrPTKnQy0ssy0xPLMnM
-zxPi90ssc87PKynKz8lJLfIuEeIECnjkF5d4l3CJcnEn5+fqpVYk5hbkpAqx
-haSChJUYtBgAOMX57WIAAAA=
+zxPi90ssc87PKynKz8lJLfIuEeIECnjkF5d4l3CJc/HCtZSkFpcIsYWkgiSU
+GLQYABRWGrdkAAAA
 """,
         """
 androidx/navigation/NavController.class:
-H4sIAAAAAAAA/41SW28SQRT+ZoFl2dIW0NYWW7UXLW21Sxt9kaaJNjFug2gs
-4aVPA2zowDKb7A6kj/wW/4FPGh9M46M/ynhmIb1qdJM99++bc2bOz1/fvgN4
-jj2GFS7bYSDaZ47kQ9HhSgTSqfHhYSBVGPi+F6bBGHJdPuSOz2XHed/sei2V
-RoLB3BdSqAOGRGmzkUUKpo0k0gxJdSoihrXqP9krDNYk5xGu5G42GFKhF7lt
-BuYyzJWql2cfq1DITkXXrFWDsON0PdUMuZCRw6UMVHxA5NQCVRv4fkUzBQPl
-WcgzPOgFyhfS6Q77jpDKCyX3HVdqxki0ojTu0GGtU6/Vm8A/8JD3PSpk2Lja
-xPgCKn9qK4s5zNu4i3sMhdsFN6aZEOlplvbrL29nDkr1epwu3M4x5KuTid55
-ire54hQz+sMEPS3TIqMF6BZ7FD8T2iuT1d5lCM9HS7axYNhG7nxkG5Y26LeS
-pC36Z6z5hfPRnlFmr1M/PpmUPFrOJYpGOblqWeejXGqLUntmziwab8cF6aOZ
-cQFFLdKZKz5VlW19Mu2b7qdO+3RtCXZ6it7+MGjTCsxWhfRqg37TC+u86Xt6
-+KDF/QYPhfYnwfWPA6lE33PlUESCQhev9epyERgyx6IjuRqEBLGPg0HY8t4I
-jV+c4Btj9BUQVmDQFusvSd3SUpPcJs/RvZNObX2B9ZkMA09JmnHQxDOS2XEB
-MrBJ5zEVRzT4RVxP498EWjFwfpycALU1jRmSmmKWcpqiQlpXpbcLha9YuE5k
-EvCSKH1BlCaKRcrvaFv3n5s0VkTif1izf2VdorwTV9+/zm6gHMst7JKuUnSZ
-ruTBCRIuHrp45NINr5KJNRfreHwCFuEJNk4wFcGOUIpgRtomYzNCPkIxwnTs
-ln4DameR7LoEAAA=
+H4sIAAAAAAAA/41VW1MjRRQ+PZPLMAQYssslWcBhiRJg2WFx1wth0QV3JcjF
+EsQSnppkCA2TmdRcIk8WT/4HX/0HvriWVim1D/vgb/C3WJ7uaUMCoYSCPqf7
+fOfrc+vhr39++wMAnsI6gUnqVn2PVc8tlzZZjYbMc61t2lzz3ND3HMf200AI
+GKe0SS2HujVr5+jUroRpUAmklpnLwhUCanFmPwNJSOmQgDSBRHjCAgJTm//L
+XiKgSZuNfsXyzD6BpG8H5SoBUiYwVNy8uns39JlbK3HM1Kbn16xTOzzyKXMD
+i7quF4oLAmvbC7cjxylxJi8KbQ0GCUyceaHDXOu0WbeYG9q+Sx2r7HLGgFWC
+NNzDyyonduVMun9JfVq3EUhguj2IuAClbmFlYAiGdbgPIwSyNwHXspFEPJux
+5b2lm5aV4t6eMGdv2ghkGl5jlVbOdkNcMNXiwQHHPriFKrYOFljhuNDp2cPc
+ihMFrIkdIAe4D2jTRhvvyP12aKFqH9PICQmUindo7cFBuXu201enX7tB1Gh4
+fmhXdxq2L2henlfsBlfS8B6Bb3YjNJgV6jiB+R0LT0wZhUn9WlS33TAwsfVm
+i8dkrsnnzwwRYIePzOPIrXC6JbM9GQ2KfGQHdJiGWSxfIZ7ZkS4diks3cXuP
+YsDWXYrSjb1rmTIwDvM6KLCAXduUw7tlh7RKQ4rtV+pNFV8x4UsPXwC7h91U
+zhnfoZdSfULg78uLoq6MKrpiXF7oisYV/NMSKDX865dnvVxqw6OXF4vKAllN
+vvkphcCNcUPNKwuJh5p2eWEkZ9G0mDJSeWU9BqQ3+mMAnmooe9r2iFrQNyyj
+9xYClBk09S1qGobBNUE5sDEtXXThMkqk0zXw+psfNJ7jIhGZ7+FHqqPSj89w
+ThNrXhWneGCTufZ2VD+y/T165Nj8RXk4UfvUZ3wvDwtfRW7I6nbZbbKA4VHr
+E/Di6uuC72OX1VwaRj669IlZ2qINSaHvepFfsV8xvslJvv2YrY0EJrGxCd40
+0DB6/HLi+inuLJ4LyuTsa9B+RkWBF7imxGEKVnHNxADoAR3lIPSKE+78TOCx
+HNcdNeE4HBulI9f6oB9XTjGANk5RQslR6bls9lcY7SRKoeMVUbpFlEaKHNrX
+uM7jN2RgeVDvwpq5lXUM7Z8J9IMOdmMQX8eEjPkLPOO1VNWVTmYFGTjzLJoV
+3JuYLn8bausOFRvxUJRIhSnUFHnbO0YPFOBdWddztCZR5nOJt9D3O0x/m515
+DXN/jie//xGS6vP4XhVe4oo3DaRFBFkRVD/+SzBgBGWuLZpcWzR5eCSjybei
+yctoeJrzsog7cmRuKeJIi7xbEbk2KSi5xslVmepjUdheVbYNf0Tulsx9AwlT
+KM1csiP3oURaJL8yOzc2/gs8icP5rwKaCCzO7x52dhhGUSrwSqA+gc9RHuIN
+i1jX9w9BLcPTMjwrwwfwIarwURk+hiUEBDg6y4dgBKAH8DyAVAC9QlkJYDCA
+fAB9You/4/iohDIVwPy/6dF9DeMIAAA=
 """,
         """
 androidx/navigation/NavControllerKt.class:
-H4sIAAAAAAAA/61TbU8TQRB+9o62RxUoRSqv9YWqgC9XKr6WEA0GvVjQiCEx
-JJqlXcrS6x252zYmJuon/4P/wm8aTQzxoz/KOHseCCLiBz7s7Mzs7DPPzM5+
-//H5K4BpzDCMca8W+LL20vZ4W9a5kr5nL/L2nO+pwHddETxUKTCGzAZvc9vl
-Xt1+tLohquQ1GY5VA8GVuB/wzXUGd7xyKFy58idQudLwlSs9OxBrLtn2wzmX
-h2F54iCwKFuZwT/KdDOTs4dnHKv4Qd3eEGo14NILbe55voqiQnvRV4st16Wo
-wr+iKISvuoLCkjNqXYazFtIM+ZjTRrtpS0+JwOOu7VARdF9WwxSOM/RX10W1
-Ead5zAPeFBTIcGH8LzX+9ixpkHp5Yvk4utGTRhcy9Jqh4oG6J0IlvYiZhSzD
-yL/KT+GE5iw9qWYZzHENmMPJNPoxQIAFWVgr7JkG5jD0FnSNe/1j//FqDNn9
-RTEkAr+lBMPJA0aGoW9XqkJNrPGWqxjeHOlgOvsjD52ckX2NeNEqTe8Q7N1O
-tSAUr3HF6YrRbJv0TZkWnVqAetrQikGHL6XWiqTVphjmt97m0ltv08aAES2t
-Zkj8cg2dI33IKLJJo2iUkhmT9I5St2VkEkNW1rDMAVZMPvj2ztJoJZrGw6oh
-Jpk9zbvSoCI65vwaPU5PRXpisdVcFcFTPer6Lf0qd5d5ILUdOzuXZJ1mrxWQ
-Pvyk5SnZFI7XlqGk47u/vwz9pz9Pd4Z/T1jXkuLVxgLfjBOkl/xWUBXzUhuD
-McbyPnxMwUCHbi/tg0ggSdZVsp7H/txk9tgn9F7M9pE0Z7+g/9lHDH6I4qdJ
-Jqkb3cjiGumTdKMbFoYwDP0+OYxgNMLOUUSeIrV2Cqfp7vUIIYUbMYZF+01a
-fWZsbMtOINOJMzhLuib2iq4laM+PJl6/R4ItHEjQxK1IMitimo3q6aFsvQTd
-E3HaZp3bxTqPsZh1fod1PmZt4HbEu4Qy7XforEBkzq3AdHDewQUH45hwCPKi
-g0u4vAIW4grsFaRCJEIUQ4yGyFLXQ5wKcfonI/JCLIwGAAA=
+H4sIAAAAAAAA/61T308TQRD+9o62R0UsRQpUKCpVAZWrFX+WEA1GvVDQiCEx
+JJqlXcrS65252zYmJsqT/4P/hW8aTYzx0T/KOHueCCLiAw87OzM7+803s7Pf
+vn/8DGAGswzj3KsHvqy/sD3ekQ2upO/ZS7wz73sq8F1XBAsqBcaQ2eQdbrvc
+a9gP1jZFjbwmw5FaILgS9wL+fIPBnageCFep/glUqTZ95UrPDsS6S7a9MO/y
+MKxM7gcWZasw+IeZbnZq7uCM41U/aNibQq0FXHqhzT3PV1FUaC/5aqntuhRV
+/FcUhfA1V1BYclZtyHDOQpqhEHPa7LRs6SkReNy1HSqC7stamEIPw0BtQ9Sa
+cZqHPOAtQYEM5yb+UuNvz7IGaVQmV3rQi2NpHEWGXjNUPFB3RKikFzGzkGUY
++Vf5KRzXnKUn1RyDOaEBcxhMYwBDBFiUxfXirmlgDkNfUde42z/+H6/GkN1b
+FEMi8NtKMAzuMzIM/TtSFetinbddxfD6UAfT2Rt54OSM7GnEs3Z5Zptg369U
+i0LxOlecrhitjknflGnRrQWop02tGHT4QmqtRFr9EsPdL1u59JettDFkREur
+GRI/XfkzpOeNEpsySkY5mTFJ7yr3WkYmkbeyhmUOsVLy/tc3lkYr0zQeVA0x
+yexq3nSTiuia9+v0OMeq0hNL7daaCB7rUddv6de4u8IDqe3Y2b0sGzR77YD0
+E4/anpIt4XgdGUo6vv37y9B/+vN0e/h3hR1dVrzWXOTP4wTpZb8d1MRdqY3h
+GGNlDz4uwUCXbi/tw0ggSdZlsp7G/txU9sgH9J3P9pM05z5h4Ml7DL+L4mdI
+JqkbvRjFFdKn6EYvLORxAvp9chihE0RaFgWK1NoYTtLdqxFCCtdiDIv267T6
+zdj4JbuBTDdO4TTpmthLupagvTCaePUWCba4L0ETNyLJrIhpNqonT9lGIo65
+HaxzO1gXMB6zLmyzLsSsDdyMeJdRof0WnRWJzJlVmA7OOjjnYAKTDkGed3AB
+F1fBQkzDXkUqRCJEKcRoiCx1PcRYiJM/APHZhEWMBgAA
 """
     )
 
diff --git a/navigation/navigation-runtime-lint/src/test/java/androidx/navigation/runtime/lint/WrongPopBackStackRouteDetectorTest.kt b/navigation/navigation-runtime-lint/src/test/java/androidx/navigation/runtime/lint/WrongPopBackStackRouteDetectorTest.kt
new file mode 100644
index 0000000..5d081c9
--- /dev/null
+++ b/navigation/navigation-runtime-lint/src/test/java/androidx/navigation/runtime/lint/WrongPopBackStackRouteDetectorTest.kt
@@ -0,0 +1,195 @@
+/*
+ * Copyright 2024 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.navigation.runtime.lint
+
+import com.android.tools.lint.checks.infrastructure.LintDetectorTest
+import com.android.tools.lint.checks.infrastructure.TestMode
+import com.android.tools.lint.detector.api.Detector
+import com.android.tools.lint.detector.api.Issue
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+
+@RunWith(JUnit4::class)
+class WrongPopBackStackRouteDetectorTest : LintDetectorTest() {
+
+    override fun getDetector(): Detector = WrongPopBackStackRouteDetector()
+
+    override fun getIssues(): MutableList<Issue> =
+        mutableListOf(WrongPopBackStackRouteDetector.WrongPopBackStackRouteType)
+
+    @Test
+    fun testEmptyConstructorNoError() {
+        lint()
+            .files(
+                kotlin(
+                        """
+                package com.example
+
+                import androidx.navigation.NavController
+                import androidx.test.*
+
+                fun createGraph() {
+                    val navController = NavController()
+                    navController.popBackStack(route = TestClass(), false)
+                    navController.popBackStack(route = TestClassComp(), false)
+                }
+                """
+                    )
+                    .indented(),
+                *NAVIGATION_STUBS,
+                TEST_CODE
+            )
+            .skipTestModes(TestMode.FULLY_QUALIFIED)
+            .run()
+            .expectClean()
+    }
+
+    @Test
+    fun testNoError() {
+        lint()
+            .files(
+                kotlin(
+                        """
+                package com.example
+
+                import androidx.navigation.NavController
+                import androidx.test.*
+
+                fun createGraph() {
+                    val navController = NavController()
+                    navController.popBackStack(route = TestClassWithArg(10), false)
+                    navController.popBackStack(route = TestObject, false)
+                    navController.popBackStack(route = classInstanceRef, false)
+                    navController.popBackStack(route = classInstanceWithArgRef, false)
+                    navController.popBackStack(route = Outer, false)
+                    navController.popBackStack(route = Outer.InnerObject, false)
+                    navController.popBackStack(route = Outer.InnerClass(123), false)
+                    navController.popBackStack(route = 123, false)
+                    navController.popBackStack(route = "www.test.com/{arg}", false)
+                    navController.popBackStack(route = InterfaceChildClass(true), false)
+                    navController.popBackStack(route = InterfaceChildObject, false)
+                    navController.popBackStack(route = AbstractChildClass(true), false)
+                    navController.popBackStack(route = AbstractChildObject, false)
+                    //classes with companion object to simulate marked with @Serializable
+                    navController.popBackStack(route = TestClassWithArgComp(15), false)
+                    navController.popBackStack(route = OuterComp.InnerClassComp(15), false)
+                    navController.popBackStack(route = InterfaceChildClassComp(true), false)
+                    navController.popBackStack(route = AbstractChildClassComp(true), false)
+                }
+                """
+                    )
+                    .indented(),
+                *NAVIGATION_STUBS,
+                TEST_CODE
+            )
+            .skipTestModes(TestMode.FULLY_QUALIFIED)
+            .run()
+            .expectClean()
+    }
+
+    @Test
+    fun testHasError() {
+        lint()
+            .files(
+                kotlin(
+                        """
+                package com.example
+
+                import androidx.navigation.NavController
+                import androidx.test.*
+
+                fun createGraph() {
+                    val navController = NavController()
+                    navController.popBackStack(route = TestClass, false)
+                    navController.popBackStack(route = TestClassWithArg, false)
+                    navController.popBackStack(route = TestInterface, false)
+                    navController.popBackStack(route = InterfaceChildClass, false)
+                    navController.popBackStack(route = TestAbstract, false)
+                    navController.popBackStack(route = AbstractChildClass, false)
+                    navController.popBackStack(route = Outer.InnerClass, false)
+
+                    //classes with companion object to simulate marked with @Serializable
+                    navController.popBackStack(route = TestClassComp, false)
+                    navController.popBackStack(route = TestClassWithArgComp, false)
+                    navController.popBackStack(route = OuterComp.InnerClassComp, false)
+                    navController.popBackStack(route = InterfaceChildClassComp, false)
+                    navController.popBackStack(route = AbstractChildClassComp, false)
+                    navController.popBackStack(route = TestAbstractComp, false)
+                }
+                """
+                    )
+                    .indented(),
+                *NAVIGATION_STUBS,
+                TEST_CODE
+            )
+            .skipTestModes(TestMode.FULLY_QUALIFIED)
+            .run()
+            .expect(
+                """
+src/com/example/test.kt:17: Error: Use popBackStack with reified class instead. [WrongPopBackStackRouteType]
+    navController.popBackStack(route = TestClassComp, false)
+                                       ~~~~~~~~~~~~~
+src/com/example/test.kt:18: Error: Use popBackStack with reified class instead. [WrongPopBackStackRouteType]
+    navController.popBackStack(route = TestClassWithArgComp, false)
+                                       ~~~~~~~~~~~~~~~~~~~~
+src/com/example/test.kt:19: Error: Use popBackStack with reified class instead. [WrongPopBackStackRouteType]
+    navController.popBackStack(route = OuterComp.InnerClassComp, false)
+                                       ~~~~~~~~~~~~~~~~~~~~~~~~
+src/com/example/test.kt:20: Error: Use popBackStack with reified class instead. [WrongPopBackStackRouteType]
+    navController.popBackStack(route = InterfaceChildClassComp, false)
+                                       ~~~~~~~~~~~~~~~~~~~~~~~
+src/com/example/test.kt:21: Error: Use popBackStack with reified class instead. [WrongPopBackStackRouteType]
+    navController.popBackStack(route = AbstractChildClassComp, false)
+                                       ~~~~~~~~~~~~~~~~~~~~~~
+src/com/example/test.kt:22: Error: Use popBackStack with reified class instead. [WrongPopBackStackRouteType]
+    navController.popBackStack(route = TestAbstractComp, false)
+                                       ~~~~~~~~~~~~~~~~
+6 errors, 0 warnings
+                """
+            )
+            .expectFixDiffs(
+                """
+Autofix for src/com/example/test.kt line 17: Use popBackStack with reified class instead.:
+@@ -17 +17
+-     navController.popBackStack(route = TestClassComp, false)
++     navController.popBackStack<TestClassComp>(false)
+Autofix for src/com/example/test.kt line 18: Use popBackStack with reified class instead.:
+@@ -18 +18
+-     navController.popBackStack(route = TestClassWithArgComp, false)
++     navController.popBackStack<TestClassWithArgComp>(false)
+Autofix for src/com/example/test.kt line 19: Use popBackStack with reified class instead.:
+@@ -19 +19
+-     navController.popBackStack(route = OuterComp.InnerClassComp, false)
++     navController.popBackStack<OuterComp.InnerClassComp>(false)
+Autofix for src/com/example/test.kt line 20: Use popBackStack with reified class instead.:
+@@ -20 +20
+-     navController.popBackStack(route = InterfaceChildClassComp, false)
++     navController.popBackStack<InterfaceChildClassComp>(false)
+Autofix for src/com/example/test.kt line 21: Use popBackStack with reified class instead.:
+@@ -21 +21
+-     navController.popBackStack(route = AbstractChildClassComp, false)
++     navController.popBackStack<AbstractChildClassComp>(false)
+Autofix for src/com/example/test.kt line 22: Use popBackStack with reified class instead.:
+@@ -22 +22
+-     navController.popBackStack(route = TestAbstractComp, false)
++     navController.popBackStack<TestAbstractComp>(false)
+                """
+                    .trimIndent()
+            )
+    }
+}
diff --git a/navigation/navigation-runtime/lint-baseline.xml b/navigation/navigation-runtime/lint-baseline.xml
index e8b9764..287e223 100644
--- a/navigation/navigation-runtime/lint-baseline.xml
+++ b/navigation/navigation-runtime/lint-baseline.xml
@@ -40,6 +40,15 @@
     <issue
         id="NewApi"
         message="This Kotlin extension function will be hidden by `java.util.SequencedCollection` starting in API 35"
+        errorLine1="                nextResumed.removeFirstKt()"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/navigation/NavController.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="This Kotlin extension function will be hidden by `java.util.SequencedCollection` starting in API 35"
         errorLine1="                val started = nextStarted.removeFirstKt()"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
diff --git a/navigation/navigation-runtime/src/androidTest/java/androidx/navigation/NavBackStackEntryLifecycleTest.kt b/navigation/navigation-runtime/src/androidTest/java/androidx/navigation/NavBackStackEntryLifecycleTest.kt
index b393c43..71559e7 100644
--- a/navigation/navigation-runtime/src/androidTest/java/androidx/navigation/NavBackStackEntryLifecycleTest.kt
+++ b/navigation/navigation-runtime/src/androidTest/java/androidx/navigation/NavBackStackEntryLifecycleTest.kt
@@ -23,7 +23,11 @@
 import androidx.lifecycle.testing.TestLifecycleOwner
 import androidx.navigation.test.FloatingTestNavigator
 import androidx.navigation.test.R
+import androidx.navigation.test.SupportingFloatingTestNavigator
+import androidx.navigation.test.SupportingTestNavigator
 import androidx.navigation.test.dialog
+import androidx.navigation.test.supportingDialog
+import androidx.navigation.test.supportingPane
 import androidx.test.annotation.UiThreadTest
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -164,6 +168,79 @@
     }
 
     /**
+     * Test that navigating from a sibling to a SupportingPane sibling leaves the previous
+     * destination resumed.
+     */
+    @UiThreadTest
+    @Test
+    fun testLifecycleWithSupportingPane() {
+        val navController = createNavController()
+        val navGraph =
+            navController.navigatorProvider.navigation(
+                route = "graph",
+                startDestination = "start"
+            ) {
+                test("start")
+                test("second")
+                supportingPane("supportingPane")
+            }
+        navController.graph = navGraph
+
+        val graphBackStackEntry = navController.getBackStackEntry("graph")
+        assertWithMessage("The parent graph should be resumed when its child is resumed")
+            .that(graphBackStackEntry.lifecycle.currentState)
+            .isEqualTo(Lifecycle.State.RESUMED)
+        val startBackStackEntry = navController.getBackStackEntry("start")
+        assertWithMessage("The start destination should be resumed")
+            .that(startBackStackEntry.lifecycle.currentState)
+            .isEqualTo(Lifecycle.State.RESUMED)
+
+        navController.navigate("second")
+
+        assertWithMessage("The parent graph should be resumed when its child is resumed")
+            .that(graphBackStackEntry.lifecycle.currentState)
+            .isEqualTo(Lifecycle.State.RESUMED)
+        assertWithMessage("The start destination should be created when not visible")
+            .that(startBackStackEntry.lifecycle.currentState)
+            .isEqualTo(Lifecycle.State.CREATED)
+        val secondBackStackEntry = navController.getBackStackEntry("second")
+        assertWithMessage("The second destination should be resumed")
+            .that(secondBackStackEntry.lifecycle.currentState)
+            .isEqualTo(Lifecycle.State.RESUMED)
+
+        navController.navigate("supportingPane")
+
+        assertWithMessage("The parent graph should be resumed when its child is resumed")
+            .that(graphBackStackEntry.lifecycle.currentState)
+            .isEqualTo(Lifecycle.State.RESUMED)
+        assertWithMessage("The start destination should still be in created")
+            .that(startBackStackEntry.lifecycle.currentState)
+            .isEqualTo(Lifecycle.State.CREATED)
+        assertWithMessage("The second destination should be resumed when a SupportingPane is open")
+            .that(secondBackStackEntry.lifecycle.currentState)
+            .isEqualTo(Lifecycle.State.RESUMED)
+        val supportingPaneBackStackEntry = navController.getBackStackEntry("supportingPane")
+        assertWithMessage("The supporting pane destination should be resumed")
+            .that(supportingPaneBackStackEntry.lifecycle.currentState)
+            .isEqualTo(Lifecycle.State.RESUMED)
+
+        navController.popBackStack()
+
+        assertWithMessage("The parent graph should be resumed when its child is resumed")
+            .that(graphBackStackEntry.lifecycle.currentState)
+            .isEqualTo(Lifecycle.State.RESUMED)
+        assertWithMessage("The start destination should still be in created")
+            .that(startBackStackEntry.lifecycle.currentState)
+            .isEqualTo(Lifecycle.State.CREATED)
+        assertWithMessage("The second destination should be resumed after pop")
+            .that(secondBackStackEntry.lifecycle.currentState)
+            .isEqualTo(Lifecycle.State.RESUMED)
+        assertWithMessage("The popped destination should be destroyed")
+            .that(supportingPaneBackStackEntry.lifecycle.currentState)
+            .isEqualTo(Lifecycle.State.DESTROYED)
+    }
+
+    /**
      * Test that navigating from a sibling to a FloatingWindow sibling leaves the previous
      * destination started.
      */
@@ -224,6 +301,78 @@
             .isEqualTo(Lifecycle.State.DESTROYED)
     }
 
+    /**
+     * Test that navigating from a sibling + SupportingPane sibling to a dialog leaves both started.
+     */
+    @UiThreadTest
+    @Test
+    fun testLifecycleWithSupportingPaneAndDialog() {
+        val navController = createNavController()
+        val navGraph =
+            navController.navigatorProvider.navigation(
+                route = "graph",
+                startDestination = "start"
+            ) {
+                test("start")
+                supportingPane("supportingPane")
+                dialog("dialog")
+            }
+        navController.graph = navGraph
+
+        val graphBackStackEntry = navController.getBackStackEntry("graph")
+        assertWithMessage("The parent graph should be resumed when its child is resumed")
+            .that(graphBackStackEntry.lifecycle.currentState)
+            .isEqualTo(Lifecycle.State.RESUMED)
+        val startBackStackEntry = navController.getBackStackEntry("start")
+        assertWithMessage("The start destination should be resumed")
+            .that(startBackStackEntry.lifecycle.currentState)
+            .isEqualTo(Lifecycle.State.RESUMED)
+
+        navController.navigate("supportingPane")
+
+        assertWithMessage("The parent graph should be resumed when its child is resumed")
+            .that(graphBackStackEntry.lifecycle.currentState)
+            .isEqualTo(Lifecycle.State.RESUMED)
+        assertWithMessage("The start destination should be resumed when a SupportingPane is open")
+            .that(startBackStackEntry.lifecycle.currentState)
+            .isEqualTo(Lifecycle.State.RESUMED)
+        val supportingPaneBackStackEntry = navController.getBackStackEntry("supportingPane")
+        assertWithMessage("The supporting pane destination should be resumed")
+            .that(supportingPaneBackStackEntry.lifecycle.currentState)
+            .isEqualTo(Lifecycle.State.RESUMED)
+
+        navController.navigate("dialog")
+
+        assertWithMessage("The parent graph should be resumed when its child is resumed")
+            .that(graphBackStackEntry.lifecycle.currentState)
+            .isEqualTo(Lifecycle.State.RESUMED)
+        assertWithMessage("The start destination should be started under a dialog")
+            .that(startBackStackEntry.lifecycle.currentState)
+            .isEqualTo(Lifecycle.State.STARTED)
+        assertWithMessage("The supporting pane destination should be started under a dialog")
+            .that(supportingPaneBackStackEntry.lifecycle.currentState)
+            .isEqualTo(Lifecycle.State.STARTED)
+        val dialogBackStackEntry = navController.getBackStackEntry("dialog")
+        assertWithMessage("The dialog destination should be resumed")
+            .that(dialogBackStackEntry.lifecycle.currentState)
+            .isEqualTo(Lifecycle.State.RESUMED)
+
+        navController.popBackStack()
+
+        assertWithMessage("The parent graph should be resumed when its child is resumed")
+            .that(graphBackStackEntry.lifecycle.currentState)
+            .isEqualTo(Lifecycle.State.RESUMED)
+        assertWithMessage("The start destination should still be resumed after pop")
+            .that(startBackStackEntry.lifecycle.currentState)
+            .isEqualTo(Lifecycle.State.RESUMED)
+        assertWithMessage("The supporting pane destination should be resumed after pop")
+            .that(supportingPaneBackStackEntry.lifecycle.currentState)
+            .isEqualTo(Lifecycle.State.RESUMED)
+        assertWithMessage("The popped destination should be destroyed")
+            .that(dialogBackStackEntry.lifecycle.currentState)
+            .isEqualTo(Lifecycle.State.DESTROYED)
+    }
+
     /** Test that all visible floating windows underneath the top one are marked started. */
     @UiThreadTest
     @Test
@@ -268,6 +417,53 @@
         assertThat(topDialogEntry.lifecycle.currentState).isEqualTo(Lifecycle.State.RESUMED)
     }
 
+    /**
+     * Test that all visible floating windows underneath the top one are marked started unless a
+     * SupportingPane+FloatingWindow destination is above a FloatingWindow.
+     */
+    @UiThreadTest
+    @Test
+    fun testLifecycleWithSupportingDialogs() {
+        val navController = createNavController()
+        val navGraph =
+            navController.navigatorProvider.navigation(
+                route = "graph",
+                startDestination = "start"
+            ) {
+                test("start")
+                supportingDialog("bottomDialog")
+                dialog("midDialog")
+                supportingDialog("topDialog")
+            }
+        navController.graph = navGraph
+
+        val graphEntry = navController.getBackStackEntry("graph")
+        assertThat(graphEntry.lifecycle.currentState).isEqualTo(Lifecycle.State.RESUMED)
+        val startEntry = navController.getBackStackEntry("start")
+        assertThat(startEntry.lifecycle.currentState).isEqualTo(Lifecycle.State.RESUMED)
+
+        navController.navigate("bottomDialog")
+        assertThat(graphEntry.lifecycle.currentState).isEqualTo(Lifecycle.State.RESUMED)
+        assertThat(startEntry.lifecycle.currentState).isEqualTo(Lifecycle.State.STARTED)
+        val bottomDialogEntry = navController.getBackStackEntry("bottomDialog")
+        assertThat(bottomDialogEntry.lifecycle.currentState).isEqualTo(Lifecycle.State.RESUMED)
+
+        navController.navigate("midDialog")
+        assertThat(graphEntry.lifecycle.currentState).isEqualTo(Lifecycle.State.RESUMED)
+        assertThat(startEntry.lifecycle.currentState).isEqualTo(Lifecycle.State.STARTED)
+        assertThat(bottomDialogEntry.lifecycle.currentState).isEqualTo(Lifecycle.State.STARTED)
+        val midDialogEntry = navController.getBackStackEntry("midDialog")
+        assertThat(midDialogEntry.lifecycle.currentState).isEqualTo(Lifecycle.State.RESUMED)
+
+        navController.navigate("topDialog")
+        assertThat(graphEntry.lifecycle.currentState).isEqualTo(Lifecycle.State.RESUMED)
+        assertThat(startEntry.lifecycle.currentState).isEqualTo(Lifecycle.State.STARTED)
+        assertThat(bottomDialogEntry.lifecycle.currentState).isEqualTo(Lifecycle.State.STARTED)
+        assertThat(midDialogEntry.lifecycle.currentState).isEqualTo(Lifecycle.State.RESUMED)
+        val topDialogEntry = navController.getBackStackEntry("topDialog")
+        assertThat(topDialogEntry.lifecycle.currentState).isEqualTo(Lifecycle.State.RESUMED)
+    }
+
     @UiThreadTest
     @Test
     fun testLifecycleWithDialogsAndGraphs() {
@@ -1386,7 +1582,9 @@
     ): NavController {
         val navController = NavHostController(ApplicationProvider.getApplicationContext())
         navController.navigatorProvider.addNavigator(TestNavigator())
+        navController.navigatorProvider.addNavigator(SupportingTestNavigator())
         navController.navigatorProvider.addNavigator(FloatingTestNavigator())
+        navController.navigatorProvider.addNavigator(SupportingFloatingTestNavigator())
         navController.setLifecycleOwner(lifecycleOwner)
         return navController
     }
diff --git a/navigation/navigation-runtime/src/androidTest/java/androidx/navigation/test/SupportingFloatingTestNavigator.kt b/navigation/navigation-runtime/src/androidTest/java/androidx/navigation/test/SupportingFloatingTestNavigator.kt
new file mode 100644
index 0000000..9a3c82b
--- /dev/null
+++ b/navigation/navigation-runtime/src/androidTest/java/androidx/navigation/test/SupportingFloatingTestNavigator.kt
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2019 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:Suppress("NOTHING_TO_INLINE")
+
+package androidx.navigation.test
+
+import androidx.navigation.FloatingWindow
+import androidx.navigation.NavDestinationBuilder
+import androidx.navigation.NavDestinationDsl
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.Navigator
+import androidx.navigation.SupportingPane
+import androidx.navigation.get
+import androidx.testutils.TestNavigator
+
+@Navigator.Name("supporting_dialog")
+class SupportingFloatingTestNavigator : TestNavigator() {
+    override fun createDestination(): Destination {
+        return SupportingFloatingDestination(this)
+    }
+
+    class SupportingFloatingDestination(navigator: TestNavigator) :
+        Destination(navigator), FloatingWindow, SupportingPane
+}
+
+/** Construct a new [TestNavigator.Destination] from a [SupportingFloatingTestNavigator]. */
+inline fun NavGraphBuilder.supportingDialog(
+    route: String,
+    builder: SupportingFloatingTestNavigatorDestinationBuilder.() -> Unit = {}
+) =
+    destination(
+        SupportingFloatingTestNavigatorDestinationBuilder(
+                provider[SupportingFloatingTestNavigator::class],
+                route
+            )
+            .apply(builder)
+    )
+
+/**
+ * DSL for constructing a new [TestNavigator.Destination] from a [SupportingFloatingTestNavigator].
+ */
+@NavDestinationDsl
+class SupportingFloatingTestNavigatorDestinationBuilder(
+    navigator: SupportingFloatingTestNavigator,
+    route: String
+) : NavDestinationBuilder<TestNavigator.Destination>(navigator, route)
diff --git a/navigation/navigation-runtime/src/androidTest/java/androidx/navigation/test/SupportingTestNavigator.kt b/navigation/navigation-runtime/src/androidTest/java/androidx/navigation/test/SupportingTestNavigator.kt
new file mode 100644
index 0000000..fac28ea
--- /dev/null
+++ b/navigation/navigation-runtime/src/androidTest/java/androidx/navigation/test/SupportingTestNavigator.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2019 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.navigation.test
+
+import androidx.navigation.NavDestinationBuilder
+import androidx.navigation.NavDestinationDsl
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.Navigator
+import androidx.navigation.SupportingPane
+import androidx.navigation.get
+import androidx.testutils.TestNavigator
+
+@Navigator.Name("supporting_pane")
+class SupportingTestNavigator : TestNavigator() {
+    override fun createDestination(): Destination {
+        return SupportingDestination(this)
+    }
+
+    class SupportingDestination(navigator: TestNavigator) : Destination(navigator), SupportingPane
+}
+
+/** Construct a new [TestNavigator.Destination] from a [SupportingTestNavigator]. */
+inline fun NavGraphBuilder.supportingPane(
+    route: String,
+    builder: SupportingTestNavigatorDestinationBuilder.() -> Unit = {}
+) =
+    destination(
+        SupportingTestNavigatorDestinationBuilder(provider[SupportingTestNavigator::class], route)
+            .apply(builder)
+    )
+
+/** DSL for constructing a new [TestNavigator.Destination] from a [SupportingTestNavigator]. */
+@NavDestinationDsl
+class SupportingTestNavigatorDestinationBuilder(navigator: SupportingTestNavigator, route: String) :
+    NavDestinationBuilder<TestNavigator.Destination>(navigator, route)
diff --git a/navigation/navigation-runtime/src/main/java/androidx/navigation/NavController.kt b/navigation/navigation-runtime/src/main/java/androidx/navigation/NavController.kt
index 9e36bf8..0075458 100644
--- a/navigation/navigation-runtime/src/main/java/androidx/navigation/NavController.kt
+++ b/navigation/navigation-runtime/src/main/java/androidx/navigation/NavController.kt
@@ -1105,12 +1105,58 @@
             // Nothing to update
             return
         }
-        // First determine what the current resumed destination is and, if and only if
-        // the current resumed destination is a FloatingWindow, what destinations are
-        // underneath it that must remain started.
-        var nextResumed: NavDestination? = backStack.last().destination
+        // Lifecycle can be split into three layers:
+        // 1. Resumed - these are the topmost destination(s) that the user can interact with
+        // 2. Started - these destinations are visible, but are underneath resumed destinations
+        // 3. Created - these destinations are not visible or on the process of being animated out
+
+        // So first, we need to determine which destinations should be resumed and started
+        // This is done by looking at the two special interfaces we have:
+        // - FloatingWindow indicates a destination that is above all other destinations, leaving
+        //   destinations below it visible, but not interactable. These are always only on the
+        //   top of the back stack
+        // - SupportingPane indicates a destination that sits alongside the previous destination
+        //   and shares the same lifecycle (e.g., both will be resumed, started, or created)
+
+        // This means no matter what, the topmost destination should be able to be resumed,
+        // then we add in all of the destinations that also need to be resumed (if the
+        // topmost screen is a SupportingPane)
+        val topmostDestination = backStack.last().destination
+        val nextResumed: MutableList<NavDestination> = mutableListOf(topmostDestination)
+        if (topmostDestination is SupportingPane) {
+            // A special note for destinations that are marked as both a FloatingWindow and a
+            // SupportingPane: a supporting floating window destination can only support other
+            // floating windows - if a supporting floating window destination is above
+            // a regular destination, the regular destination will *not* be resumed, but instead
+            // follow the normal rules between floating windows and regular destinations and only
+            // be started.
+            val onlyAllowFloatingWindows = topmostDestination is FloatingWindow
+            val iterator = backStack.reversed().drop(1).iterator()
+            while (iterator.hasNext()) {
+                val destination = iterator.next().destination
+                if (
+                    onlyAllowFloatingWindows &&
+                        destination !is FloatingWindow &&
+                        destination !is NavGraph
+                ) {
+                    break
+                }
+                // Add all visible destinations (e.g., SupportingDestination destinations, their
+                // NavGraphs, and the screen directly below all SupportingDestination destinations)
+                // to nextResumed
+                nextResumed.add(destination)
+                // break if we find first visible screen
+                if (destination !is SupportingPane && destination !is NavGraph) {
+                    break
+                }
+            }
+        }
+
+        // Now that we've marked all of the resumed destinations, we continue to iterate
+        // through the back stack to find any destinations that should be started - ones that are
+        // below FloatingWindow destinations
         val nextStarted: MutableList<NavDestination> = mutableListOf()
-        if (nextResumed is FloatingWindow) {
+        if (nextResumed.last() is FloatingWindow) {
             // Find all visible destinations in the back stack as they
             // should still be STARTED when the FloatingWindow destination is above it.
             val iterator = backStack.reversed().iterator()
@@ -1121,12 +1167,17 @@
                 // to nextStarted
                 nextStarted.add(destination)
                 // break if we find first visible screen
-                if (destination !is FloatingWindow && destination !is NavGraph) {
+                if (
+                    destination !is FloatingWindow &&
+                        destination !is SupportingPane &&
+                        destination !is NavGraph
+                ) {
                     break
                 }
             }
         }
-        // First iterate downward through the stack, applying downward Lifecycle
+
+        // Now iterate downward through the stack, applying downward Lifecycle
         // transitions and capturing any upward Lifecycle transitions to apply afterwards.
         // This ensures proper nesting where parent navigation graphs are started before
         // their children and stopped only after their children are stopped.
@@ -1136,7 +1187,7 @@
             val entry = iterator.next()
             val currentMaxLifecycle = entry.maxLifecycle
             val destination = entry.destination
-            if (nextResumed != null && destination.id == nextResumed.id) {
+            if (nextResumed.firstOrNull()?.id == destination.id) {
                 // Upward Lifecycle transitions need to be done afterwards so that
                 // the parent navigation graph is resumed before their children
                 if (currentMaxLifecycle != Lifecycle.State.RESUMED) {
@@ -1153,7 +1204,8 @@
                     }
                 }
                 if (nextStarted.firstOrNull()?.id == destination.id) nextStarted.removeFirstKt()
-                nextResumed = nextResumed.parent
+                nextResumed.removeFirstKt()
+                destination.parent?.let { nextResumed.add(it) }
             } else if (nextStarted.isNotEmpty() && destination.id == nextStarted.first().id) {
                 val started = nextStarted.removeFirstKt()
                 if (currentMaxLifecycle == Lifecycle.State.RESUMED) {
diff --git a/navigation/navigation-testing/src/androidTest/java/androidx/navigation/testing/TestNavigatorStateTest.kt b/navigation/navigation-testing/src/androidTest/java/androidx/navigation/testing/TestNavigatorStateTest.kt
index 82e6e99..4d38bfa 100644
--- a/navigation/navigation-testing/src/androidTest/java/androidx/navigation/testing/TestNavigatorStateTest.kt
+++ b/navigation/navigation-testing/src/androidTest/java/androidx/navigation/testing/TestNavigatorStateTest.kt
@@ -27,6 +27,7 @@
 import androidx.navigation.NavDestination
 import androidx.navigation.NavOptions
 import androidx.navigation.Navigator
+import androidx.navigation.SupportingPane
 import androidx.navigation.navOptions
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.SmallTest
@@ -86,6 +87,26 @@
     }
 
     @Test
+    fun testSupportingPaneLifecycle() {
+        val navigator = SupportingPaneTestNavigator()
+        navigator.onAttach(state)
+        val firstEntry = state.createBackStackEntry(navigator.createDestination(), null)
+        assertThat(firstEntry.lifecycle.currentState).isEqualTo(Lifecycle.State.INITIALIZED)
+
+        navigator.navigate(listOf(firstEntry), null, null)
+        assertThat(firstEntry.lifecycle.currentState).isEqualTo(Lifecycle.State.RESUMED)
+
+        val secondEntry = state.createBackStackEntry(navigator.createDestination(), null)
+        navigator.navigate(listOf(secondEntry), null, null)
+        assertThat(firstEntry.lifecycle.currentState).isEqualTo(Lifecycle.State.RESUMED)
+        assertThat(secondEntry.lifecycle.currentState).isEqualTo(Lifecycle.State.RESUMED)
+
+        navigator.popBackStack(secondEntry, false)
+        assertThat(firstEntry.lifecycle.currentState).isEqualTo(Lifecycle.State.RESUMED)
+        assertThat(secondEntry.lifecycle.currentState).isEqualTo(Lifecycle.State.DESTROYED)
+    }
+
+    @Test
     fun testWithTransitionLifecycle() {
         val navigator = TestTransitionNavigator()
         navigator.onAttach(state)
@@ -129,6 +150,58 @@
     }
 
     @Test
+    fun testWithSupportingPaneTransitionLifecycle() {
+        val navigator = SupportingPaneTestTransitionNavigator()
+        navigator.onAttach(state)
+        val firstEntry = state.createBackStackEntry(navigator.createDestination(), null)
+        assertThat(firstEntry.lifecycle.currentState).isEqualTo(Lifecycle.State.INITIALIZED)
+
+        navigator.navigate(listOf(firstEntry), null, null)
+        assertThat(firstEntry.lifecycle.currentState).isEqualTo(Lifecycle.State.STARTED)
+
+        state.markTransitionComplete(firstEntry)
+        assertThat(firstEntry.lifecycle.currentState).isEqualTo(Lifecycle.State.RESUMED)
+
+        val secondEntry = state.createBackStackEntry(navigator.createDestination(), null)
+        navigator.navigate(listOf(secondEntry), null, null)
+        // Both are started because they are SupportingPane destinations
+        assertThat(firstEntry.lifecycle.currentState).isEqualTo(Lifecycle.State.STARTED)
+        assertThat(secondEntry.lifecycle.currentState).isEqualTo(Lifecycle.State.STARTED)
+        assertThat(state.transitionsInProgress.value.contains(firstEntry)).isTrue()
+
+        state.markTransitionComplete(secondEntry)
+        // Even though the secondEntry has completed its transition, the firstEntry
+        // hasn't completed its transition, so it shouldn't be resumed yet
+        assertThat(firstEntry.lifecycle.currentState).isEqualTo(Lifecycle.State.STARTED)
+        assertThat(secondEntry.lifecycle.currentState).isEqualTo(Lifecycle.State.RESUMED)
+
+        state.markTransitionComplete(firstEntry)
+        // Both are resumed because they are SupportingPane destinations that have finished
+        // their transitions
+        assertThat(firstEntry.lifecycle.currentState).isEqualTo(Lifecycle.State.RESUMED)
+        assertThat(secondEntry.lifecycle.currentState).isEqualTo(Lifecycle.State.RESUMED)
+
+        navigator.popBackStack(secondEntry, true)
+        assertThat(secondEntry.lifecycle.currentState).isEqualTo(Lifecycle.State.CREATED)
+        assertThat(firstEntry.lifecycle.currentState).isEqualTo(Lifecycle.State.STARTED)
+
+        state.markTransitionComplete(firstEntry)
+        assertThat(firstEntry.lifecycle.currentState).isEqualTo(Lifecycle.State.RESUMED)
+        state.markTransitionComplete(secondEntry)
+        assertThat(secondEntry.lifecycle.currentState).isEqualTo(Lifecycle.State.DESTROYED)
+
+        val restoredSecondEntry = state.restoreBackStackEntry(secondEntry)
+        navigator.navigate(listOf(restoredSecondEntry), null, null)
+        assertThat(firstEntry.lifecycle.currentState).isEqualTo(Lifecycle.State.STARTED)
+        assertThat(restoredSecondEntry.lifecycle.currentState).isEqualTo(Lifecycle.State.STARTED)
+        assertThat(state.transitionsInProgress.value.contains(firstEntry)).isTrue()
+
+        state.markTransitionComplete(firstEntry)
+        state.markTransitionComplete(restoredSecondEntry)
+        assertThat(restoredSecondEntry.lifecycle.currentState).isEqualTo(Lifecycle.State.RESUMED)
+    }
+
+    @Test
     fun testSameEntry() {
         val navigator = TestTransitionNavigator()
         navigator.onAttach(state)
@@ -362,6 +435,35 @@
     internal class FloatingTestDestination(navigator: Navigator<out NavDestination>) :
         NavDestination(navigator), FloatingWindow
 
+    @Navigator.Name("test")
+    internal class SupportingPaneTestNavigator : Navigator<SupportingPaneTestDestination>() {
+        override fun createDestination(): SupportingPaneTestDestination =
+            SupportingPaneTestDestination(this)
+    }
+
+    @Navigator.Name("test")
+    internal class SupportingPaneTestTransitionNavigator :
+        Navigator<SupportingPaneTestDestination>() {
+
+        override fun createDestination(): SupportingPaneTestDestination =
+            SupportingPaneTestDestination(this)
+
+        override fun navigate(
+            entries: List<NavBackStackEntry>,
+            navOptions: NavOptions?,
+            navigatorExtras: Extras?
+        ) {
+            entries.forEach { entry -> state.pushWithTransition(entry) }
+        }
+
+        override fun popBackStack(popUpTo: NavBackStackEntry, savedState: Boolean) {
+            state.popWithTransition(popUpTo, savedState)
+        }
+    }
+
+    internal class SupportingPaneTestDestination(navigator: Navigator<out NavDestination>) :
+        NavDestination(navigator), SupportingPane
+
     class TestViewModel : ViewModel() {
         var wasCleared = false
 
diff --git a/navigation/navigation-testing/src/main/java/androidx/navigation/testing/TestNavigatorState.kt b/navigation/navigation-testing/src/main/java/androidx/navigation/testing/TestNavigatorState.kt
index beb1d0a..f26e922 100644
--- a/navigation/navigation-testing/src/main/java/androidx/navigation/testing/TestNavigatorState.kt
+++ b/navigation/navigation-testing/src/main/java/androidx/navigation/testing/TestNavigatorState.kt
@@ -25,6 +25,7 @@
 import androidx.navigation.NavDestination
 import androidx.navigation.NavViewModelStoreProvider
 import androidx.navigation.NavigatorState
+import androidx.navigation.SupportingPane
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
@@ -174,6 +175,17 @@
                                 } else {
                                     Lifecycle.State.STARTED
                                 }
+                            previousEntry.destination is SupportingPane -> {
+                                // Match the previous entry's destination, making sure
+                                // a transitioning destination does not go to resumed
+                                previousEntry.maxLifecycle.coerceAtMost(
+                                    if (!transitioning) {
+                                        Lifecycle.State.RESUMED
+                                    } else {
+                                        Lifecycle.State.STARTED
+                                    }
+                                )
+                            }
                             previousEntry.destination is FloatingWindow -> Lifecycle.State.STARTED
                             else -> Lifecycle.State.CREATED
                         }
diff --git a/privacysandbox/tools/integration-tests/testapp/build.gradle b/privacysandbox/tools/integration-tests/testapp/build.gradle
index dfb37b9..e72492a 100644
--- a/privacysandbox/tools/integration-tests/testapp/build.gradle
+++ b/privacysandbox/tools/integration-tests/testapp/build.gradle
@@ -35,10 +35,19 @@
     experimentalProperties["android.privacySandboxSdk.apiGenerator.generatedRuntimeDependencies"] =
             [libs.kotlinStdlib.get(),
              libs.kotlinCoroutinesAndroid.get(),
-             libs.kotlinCoroutinesCore.get()]
+             libs.kotlinCoroutinesCore.get(),
+             // TODO: We'd like to use HEAD ui libraries here but we need to wait until we have an
+             //  AGP version containing ag/28945616 (should be in AGP 8.7.0-alpha09).
+             project.dependencies.create('androidx.privacysandbox.ui:ui-core:1.0.0-alpha09'),
+             project.dependencies.create('androidx.privacysandbox.ui:ui-client:1.0.0-alpha09')
+            ]
+
     privacySandbox {
             enable = true
     }
+    testOptions {
+        animationsDisabled = true
+    }
 }
 
 dependencies {
@@ -46,6 +55,8 @@
 
     implementation(project(":privacysandbox:sdkruntime:sdkruntime-client"))
     implementation(project(":privacysandbox:sdkruntime:sdkruntime-core"))
+    implementation(project(":privacysandbox:ui:ui-core"))
+    implementation(project(":privacysandbox:ui:ui-client"))
 
     implementation("androidx.core:core-ktx:1.9.0")
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.5.1")
@@ -54,6 +65,8 @@
     implementation(libs.material)
     implementation(libs.constraintLayout)
     implementation(libs.kotlinCoroutinesAndroid)
+    implementation("androidx.tracing:tracing:1.1.0")
+    implementation(libs.espressoIdlingResource)
 
     androidTestImplementation(project(":activity:activity"))
     androidTestImplementation(project(":internal-testutils-runtime"))
@@ -64,4 +77,5 @@
     androidTestImplementation(libs.testRules)
     androidTestImplementation(libs.truth)
     androidTestImplementation(libs.junit)
+    androidTestImplementation(libs.espressoCore)
 }
diff --git a/privacysandbox/tools/integration-tests/testapp/src/androidTest/java/androidx/privacysandbox/tools/integration/testapp/MainActivityTest.kt b/privacysandbox/tools/integration-tests/testapp/src/androidTest/java/androidx/privacysandbox/tools/integration/testapp/MainActivityTest.kt
index 781a309..1ced4aab 100644
--- a/privacysandbox/tools/integration-tests/testapp/src/androidTest/java/androidx/privacysandbox/tools/integration/testapp/MainActivityTest.kt
+++ b/privacysandbox/tools/integration-tests/testapp/src/androidTest/java/androidx/privacysandbox/tools/integration/testapp/MainActivityTest.kt
@@ -17,14 +17,20 @@
 package androidx.privacysandbox.tools.integration.testapp
 
 import androidx.privacysandbox.tools.integration.testsdk.MySdk
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.hasChildCount
+import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
+import androidx.test.platform.app.InstrumentationRegistry
 import com.google.common.truth.Truth.assertThat
 import kotlin.coroutines.resume
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.test.runTest
+import org.junit.After
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -38,6 +44,8 @@
 
     @Before fun setUp() = runBlocking { getActivity().loadSdk() }
 
+    @After fun tearDown() = runTest { scenarioRule.scenario.close() }
+
     @Test
     fun loadSdk_works() = runTest {
         val sdk = getActivity().sdk
@@ -52,6 +60,16 @@
         assertThat(sum).isEqualTo(11)
     }
 
+    @Test
+    fun remoteRendering_works(): Unit = runTest {
+        onView(withId(R.id.sandboxedSdkView)).check(matches(hasChildCount(0)))
+
+        getActivity().renderAd()
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        onView(withId(R.id.sandboxedSdkView)).check(matches(hasChildCount(1)))
+    }
+
     private suspend fun getActivity(): MainActivity = suspendCancellableCoroutine {
         scenarioRule.scenario.onActivity { activity -> it.resume(activity) }
     }
diff --git a/privacysandbox/tools/integration-tests/testapp/src/main/java/androidx/privacysandbox/tools/integration/testapp/MainActivity.kt b/privacysandbox/tools/integration-tests/testapp/src/main/java/androidx/privacysandbox/tools/integration/testapp/MainActivity.kt
index a4c92ac..c68bda8 100644
--- a/privacysandbox/tools/integration-tests/testapp/src/main/java/androidx/privacysandbox/tools/integration/testapp/MainActivity.kt
+++ b/privacysandbox/tools/integration-tests/testapp/src/main/java/androidx/privacysandbox/tools/integration/testapp/MainActivity.kt
@@ -18,17 +18,32 @@
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.lifecycleScope
 import androidx.privacysandbox.sdkruntime.client.SdkSandboxManagerCompat
 import androidx.privacysandbox.sdkruntime.core.LoadSdkCompatException
 import androidx.privacysandbox.tools.integration.testsdk.MySdk
 import androidx.privacysandbox.tools.integration.testsdk.MySdkFactory.wrapToMySdk
+import androidx.privacysandbox.ui.client.view.SandboxedSdkUiSessionState
+import androidx.privacysandbox.ui.client.view.SandboxedSdkView
+import androidx.test.espresso.IdlingRegistry
+import androidx.test.espresso.idling.CountingIdlingResource
+import kotlinx.coroutines.launch
 
 class MainActivity : AppCompatActivity() {
     internal var sdk: MySdk? = null
+    private val idlingResource = CountingIdlingResource("MainActivity idlingResource")
+
+    override fun onDestroy() {
+        super.onDestroy()
+        IdlingRegistry.getInstance().unregister(idlingResource)
+    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
+        IdlingRegistry.getInstance().register(idlingResource)
+
+        lifecycleScope.launch { loadSdk() }
     }
 
     internal suspend fun loadSdk() {
@@ -46,4 +61,21 @@
             }
         sdk = sandboxedSdk.getInterface()?.let { wrapToMySdk(it) }
     }
+
+    internal suspend fun renderAd() {
+        idlingResource.increment()
+
+        val textViewAd = sdk!!.getTextViewAd()
+        val sandboxedSdkView = findViewById<SandboxedSdkView>(R.id.sandboxedSdkView)
+
+        runOnUiThread {
+            sandboxedSdkView.setAdapter(textViewAd)
+
+            sandboxedSdkView.addStateChangedListener { state ->
+                if (state is SandboxedSdkUiSessionState.Active) {
+                    idlingResource.decrement()
+                }
+            }
+        }
+    }
 }
diff --git a/privacysandbox/tools/integration-tests/testapp/src/main/res/layout/activity_main.xml b/privacysandbox/tools/integration-tests/testapp/src/main/res/layout/activity_main.xml
index 90db0fa..2520e78 100644
--- a/privacysandbox/tools/integration-tests/testapp/src/main/res/layout/activity_main.xml
+++ b/privacysandbox/tools/integration-tests/testapp/src/main/res/layout/activity_main.xml
@@ -20,5 +20,27 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
     tools:context=".MainActivity">
+
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Text from app"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.5" />
+
+    <androidx.privacysandbox.ui.client.view.SandboxedSdkView
+        android:id="@+id/sandboxedSdkView"
+        android:layout_width="wrap_content"
+        android:layout_height="120dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/privacysandbox/tools/integration-tests/testsdk/build.gradle b/privacysandbox/tools/integration-tests/testsdk/build.gradle
index a4eef17..cc5c245 100644
--- a/privacysandbox/tools/integration-tests/testsdk/build.gradle
+++ b/privacysandbox/tools/integration-tests/testsdk/build.gradle
@@ -88,6 +88,8 @@
     ksp(project(":privacysandbox:tools:tools-apicompiler"))
     implementation(project(":privacysandbox:tools:tools"))
     implementation(project(":privacysandbox:sdkruntime:sdkruntime-provider"))
+    implementation(project(":privacysandbox:ui:ui-core"))
+    implementation(project(":privacysandbox:ui:ui-provider"))
 
     implementation(libs.kotlinCoroutinesAndroid)
     implementation(libs.kotlinCoroutinesCore)
diff --git a/privacysandbox/tools/integration-tests/testsdk/src/main/java/androidx/privacysandbox/tools/integration/testsdk/MySdk.kt b/privacysandbox/tools/integration-tests/testsdk/src/main/java/androidx/privacysandbox/tools/integration/testsdk/MySdk.kt
index 4f2410e..6047397 100644
--- a/privacysandbox/tools/integration-tests/testsdk/src/main/java/androidx/privacysandbox/tools/integration/testsdk/MySdk.kt
+++ b/privacysandbox/tools/integration-tests/testsdk/src/main/java/androidx/privacysandbox/tools/integration/testsdk/MySdk.kt
@@ -17,15 +17,66 @@
 package androidx.privacysandbox.tools.integration.testsdk
 
 import android.content.Context
+import android.content.res.Configuration
+import android.os.Bundle
+import android.os.IBinder
+import android.view.View
+import android.widget.TextView
+import androidx.privacysandbox.tools.PrivacySandboxInterface
 import androidx.privacysandbox.tools.PrivacySandboxService
+import androidx.privacysandbox.ui.core.SandboxedUiAdapter
+import androidx.privacysandbox.ui.core.SessionObserverFactory
+import java.util.concurrent.Executor
 
 @PrivacySandboxService
 interface MySdk {
     suspend fun doSum(x: Int, y: Int): Int
+
+    suspend fun getTextViewAd(): TextViewAd
 }
 
+@PrivacySandboxInterface interface TextViewAd : SandboxedUiAdapter
+
 class MySdkImpl(private val context: Context) : MySdk {
     override suspend fun doSum(x: Int, y: Int): Int {
         return x + y
     }
+
+    override suspend fun getTextViewAd(): TextViewAd {
+        return TextViewAdImpl()
+    }
+}
+
+class TextViewAdImpl : TextViewAd {
+    override fun openSession(
+        context: Context,
+        windowInputToken: IBinder,
+        initialWidth: Int,
+        initialHeight: Int,
+        isZOrderOnTop: Boolean,
+        clientExecutor: Executor,
+        client: SandboxedUiAdapter.SessionClient
+    ) {
+        val view = TextView(context)
+        view.text = "foo bar baz"
+        clientExecutor.execute { client.onSessionOpened(TextViewAdSession(view)) }
+    }
+
+    override fun addObserverFactory(sessionObserverFactory: SessionObserverFactory) {}
+
+    override fun removeObserverFactory(sessionObserverFactory: SessionObserverFactory) {}
+
+    inner class TextViewAdSession(override val view: View) : SandboxedUiAdapter.Session {
+        override fun close() {}
+
+        override fun notifyConfigurationChanged(configuration: Configuration) {}
+
+        override fun notifyUiChanged(uiContainerInfo: Bundle) {}
+
+        override val signalOptions: Set<String> = setOf()
+
+        override fun notifyResized(width: Int, height: Int) {}
+
+        override fun notifyZOrderChanged(isZOrderOnTop: Boolean) {}
+    }
 }
diff --git a/room/room-compiler-processing/src/main/java/androidx/room/compiler/codegen/java/JavaFunSpec.kt b/room/room-compiler-processing/src/main/java/androidx/room/compiler/codegen/java/JavaFunSpec.kt
index 5cb971c..1a1f6d9 100644
--- a/room/room-compiler-processing/src/main/java/androidx/room/compiler/codegen/java/JavaFunSpec.kt
+++ b/room/room-compiler-processing/src/main/java/androidx/room/compiler/codegen/java/JavaFunSpec.kt
@@ -53,16 +53,19 @@
             name: String,
             annotations: List<XAnnotationSpec>
         ) = apply {
+            val paramSpec = ParameterSpec.builder(typeName.java, name, Modifier.FINAL)
             actual.addParameter(
-                ParameterSpec.builder(typeName.java, name, Modifier.FINAL)
-                    .apply {
-                        if (typeName.nullability == XNullability.NULLABLE) {
-                            addAnnotation(NULLABLE_ANNOTATION)
-                        } else if (typeName.nullability == XNullability.NONNULL) {
-                            addAnnotation(NONNULL_ANNOTATION)
-                        }
-                    }
-                    .build()
+                // Adding nullability annotation to primitive parameters is redundant as
+                // primitives can never be null.
+                if (typeName.isPrimitive) {
+                    paramSpec.build()
+                } else {
+                    when (typeName.nullability) {
+                        XNullability.NULLABLE -> paramSpec.addAnnotation(NULLABLE_ANNOTATION)
+                        XNullability.NONNULL -> paramSpec.addAnnotation(NONNULL_ANNOTATION)
+                        else -> paramSpec
+                    }.build()
+                }
             )
             // TODO(b/247247439): Add other annotations
         }
diff --git a/room/room-compiler/build.gradle b/room/room-compiler/build.gradle
index 060f27d..ff92f34 100644
--- a/room/room-compiler/build.gradle
+++ b/room/room-compiler/build.gradle
@@ -90,6 +90,7 @@
     testImplementation(libs.antlr4)
     testImplementation(SdkHelperKt.getSdkDependency(project))
     testImplementationAarAsJar(project(":room:room-runtime"))
+    testImplementationAarAsJar(project(":room:room-paging"))
     testImplementationAarAsJar(project(":sqlite:sqlite"))
     testImplementation(project(":internal-testutils-common"))
 }
diff --git a/room/room-compiler/src/main/kotlin/androidx/room/solver/TypeAdapterStore.kt b/room/room-compiler/src/main/kotlin/androidx/room/solver/TypeAdapterStore.kt
index b6d986f..3cc5e276 100644
--- a/room/room-compiler/src/main/kotlin/androidx/room/solver/TypeAdapterStore.kt
+++ b/room/room-compiler/src/main/kotlin/androidx/room/solver/TypeAdapterStore.kt
@@ -394,6 +394,7 @@
         return when {
             builtInConverterFlags.enums.isEnabled() && typeElement?.isEnum() == true ->
                 EnumColumnTypeAdapter(typeElement, type)
+            !context.isAndroidOnlyTarget() -> null // UUID and ByteBuffer are Android-only
             builtInConverterFlags.uuid.isEnabled() && type.isUUID() -> UuidColumnTypeAdapter(type)
             builtInConverterFlags.byteBuffer.isEnabled() && type.isByteBuffer() ->
                 ByteBufferColumnTypeAdapter(type)
diff --git a/room/room-compiler/src/test/kotlin/androidx/room/solver/TypeAdapterStoreTest.kt b/room/room-compiler/src/test/kotlin/androidx/room/solver/TypeAdapterStoreTest.kt
index 29cbd79..d34aa80 100644
--- a/room/room-compiler/src/test/kotlin/androidx/room/solver/TypeAdapterStoreTest.kt
+++ b/room/room-compiler/src/test/kotlin/androidx/room/solver/TypeAdapterStoreTest.kt
@@ -82,6 +82,7 @@
 import org.hamcrest.CoreMatchers.notNullValue
 import org.hamcrest.CoreMatchers.nullValue
 import org.hamcrest.MatcherAssert.assertThat
+import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
@@ -607,6 +608,7 @@
     }
 
     @Test
+    @Ignore("Temporarily disabling to unblock b/362512509")
     fun testMissingRoomPaging() {
         runProcessorTest { invocation ->
             val pagingSourceElement =
diff --git a/room/room-compiler/src/test/test-data/daoWriter/input/ComplexDao.java b/room/room-compiler/src/test/test-data/daoWriter/input/ComplexDao.java
index ef3d537..6502b66 100644
--- a/room/room-compiler/src/test/test-data/daoWriter/input/ComplexDao.java
+++ b/room/room-compiler/src/test/test-data/daoWriter/input/ComplexDao.java
@@ -16,6 +16,7 @@
 
 package foo.bar;
 import androidx.lifecycle.LiveData;
+import androidx.paging.PagingSource;
 import androidx.room.*;
 import androidx.sqlite.db.SupportSQLiteQuery;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -85,4 +86,7 @@
 
     @RawQuery(observedEntities = User.class)
     abstract public User getUserViaRawQuery(SupportSQLiteQuery rawQuery);
+
+    @Query("SELECT * FROM Child1 ORDER BY id ASC")
+    abstract public PagingSource<Integer, Child1> loadItems();
 }
diff --git a/room/room-compiler/src/test/test-data/daoWriter/output/javac/withLambda/ComplexDao.java b/room/room-compiler/src/test/test-data/daoWriter/output/javac/withLambda/ComplexDao.java
index 0fa55d4..6821f7a 100644
--- a/room/room-compiler/src/test/test-data/daoWriter/output/javac/withLambda/ComplexDao.java
+++ b/room/room-compiler/src/test/test-data/daoWriter/output/javac/withLambda/ComplexDao.java
@@ -3,8 +3,11 @@
 import android.database.Cursor;
 import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
+import androidx.paging.PagingSource;
 import androidx.room.RoomDatabase;
+import androidx.room.RoomRawQuery;
 import androidx.room.guava.GuavaRoom;
+import androidx.room.paging.LimitOffsetPagingSource;
 import androidx.room.util.CursorUtil;
 import androidx.room.util.DBUtil;
 import androidx.room.util.SQLiteStatementUtil;
@@ -627,6 +630,51 @@
   }
 
   @Override
+  public PagingSource<Integer, Child1> loadItems() {
+    final String _sql = "SELECT * FROM Child1 ORDER BY id ASC";
+    final RoomRawQuery _rawQuery = new RoomRawQuery(_sql);
+    return new LimitOffsetPagingSource<Child1>(_rawQuery, __db, "Child1") {
+      @Override
+      @NonNull
+      protected List<Child1> convertRows(@NonNull final SQLiteStatement statement,
+              final int itemCount) {
+        _rawQuery.getBindingFunction().invoke(statement);
+        final int _cursorIndexOfId = SQLiteStatementUtil.getColumnIndexOrThrow(statement, "id");
+        final int _cursorIndexOfName = SQLiteStatementUtil.getColumnIndexOrThrow(statement, "name");
+        final int _cursorIndexOfSerial = SQLiteStatementUtil.getColumnIndexOrThrow(statement, "serial");
+        final int _cursorIndexOfCode = SQLiteStatementUtil.getColumnIndexOrThrow(statement, "code");
+        final List<Child1> _result = new ArrayList<Child1>();
+        while (statement.step()) {
+          final Child1 _item;
+          final int _tmpId;
+          _tmpId = (int) (statement.getLong(_cursorIndexOfId));
+          final String _tmpName;
+          if (statement.isNull(_cursorIndexOfName)) {
+            _tmpName = null;
+          } else {
+            _tmpName = statement.getText(_cursorIndexOfName);
+          }
+          final Info _tmpInfo;
+          if (!(statement.isNull(_cursorIndexOfSerial) && statement.isNull(_cursorIndexOfCode))) {
+            _tmpInfo = new Info();
+            _tmpInfo.serial = (int) (statement.getLong(_cursorIndexOfSerial));
+            if (statement.isNull(_cursorIndexOfCode)) {
+              _tmpInfo.code = null;
+            } else {
+              _tmpInfo.code = statement.getText(_cursorIndexOfCode);
+            }
+          } else {
+            _tmpInfo = null;
+          }
+          _item = new Child1(_tmpId,_tmpName,_tmpInfo);
+          _result.add(_item);
+        }
+        return _result;
+      }
+    };
+  }
+
+  @Override
   public User getUserViaRawQuery(final SupportSQLiteQuery rawQuery) {
     __db.assertNotSuspendingTransaction();
     final Cursor _cursor = DBUtil.query(__db, rawQuery, false, null);
diff --git a/room/room-compiler/src/test/test-data/daoWriter/output/javac/withoutLambda/ComplexDao.java b/room/room-compiler/src/test/test-data/daoWriter/output/javac/withoutLambda/ComplexDao.java
index 8074e12..b4dceb9 100644
--- a/room/room-compiler/src/test/test-data/daoWriter/output/javac/withoutLambda/ComplexDao.java
+++ b/room/room-compiler/src/test/test-data/daoWriter/output/javac/withoutLambda/ComplexDao.java
@@ -4,8 +4,11 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.lifecycle.LiveData;
+import androidx.paging.PagingSource;
 import androidx.room.RoomDatabase;
+import androidx.room.RoomRawQuery;
 import androidx.room.guava.GuavaRoom;
+import androidx.room.paging.LimitOffsetPagingSource;
 import androidx.room.util.CursorUtil;
 import androidx.room.util.DBUtil;
 import androidx.room.util.SQLiteStatementUtil;
@@ -690,6 +693,51 @@
   }
 
   @Override
+  public PagingSource<Integer, Child1> loadItems() {
+    final String _sql = "SELECT * FROM Child1 ORDER BY id ASC";
+    final RoomRawQuery _rawQuery = new RoomRawQuery(_sql);
+    return new LimitOffsetPagingSource<Child1>(_rawQuery, __db, "Child1") {
+      @Override
+      @NonNull
+      protected List<Child1> convertRows(@NonNull final SQLiteStatement statement,
+              final int itemCount) {
+        _rawQuery.getBindingFunction().invoke(statement);
+        final int _cursorIndexOfId = SQLiteStatementUtil.getColumnIndexOrThrow(statement, "id");
+        final int _cursorIndexOfName = SQLiteStatementUtil.getColumnIndexOrThrow(statement, "name");
+        final int _cursorIndexOfSerial = SQLiteStatementUtil.getColumnIndexOrThrow(statement, "serial");
+        final int _cursorIndexOfCode = SQLiteStatementUtil.getColumnIndexOrThrow(statement, "code");
+        final List<Child1> _result = new ArrayList<Child1>();
+        while (statement.step()) {
+          final Child1 _item;
+          final int _tmpId;
+          _tmpId = (int) (statement.getLong(_cursorIndexOfId));
+          final String _tmpName;
+          if (statement.isNull(_cursorIndexOfName)) {
+            _tmpName = null;
+          } else {
+            _tmpName = statement.getText(_cursorIndexOfName);
+          }
+          final Info _tmpInfo;
+          if (!(statement.isNull(_cursorIndexOfSerial) && statement.isNull(_cursorIndexOfCode))) {
+            _tmpInfo = new Info();
+            _tmpInfo.serial = (int) (statement.getLong(_cursorIndexOfSerial));
+            if (statement.isNull(_cursorIndexOfCode)) {
+              _tmpInfo.code = null;
+            } else {
+              _tmpInfo.code = statement.getText(_cursorIndexOfCode);
+            }
+          } else {
+            _tmpInfo = null;
+          }
+          _item = new Child1(_tmpId,_tmpName,_tmpInfo);
+          _result.add(_item);
+        }
+        return _result;
+      }
+    };
+  }
+
+  @Override
   public User getUserViaRawQuery(final SupportSQLiteQuery rawQuery) {
     __db.assertNotSuspendingTransaction();
     final Cursor _cursor = DBUtil.query(__db, rawQuery, false, null);
diff --git a/room/room-compiler/src/test/test-data/daoWriter/output/ksp/ComplexDao.java b/room/room-compiler/src/test/test-data/daoWriter/output/ksp/ComplexDao.java
index 54daec0..9b4ca9b 100644
--- a/room/room-compiler/src/test/test-data/daoWriter/output/ksp/ComplexDao.java
+++ b/room/room-compiler/src/test/test-data/daoWriter/output/ksp/ComplexDao.java
@@ -3,8 +3,11 @@
 import android.database.Cursor;
 import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
+import androidx.paging.PagingSource;
 import androidx.room.RoomDatabase;
+import androidx.room.RoomRawQuery;
 import androidx.room.guava.GuavaRoom;
+import androidx.room.paging.LimitOffsetPagingSource;
 import androidx.room.util.CursorUtil;
 import androidx.room.util.DBUtil;
 import androidx.room.util.SQLiteStatementUtil;
@@ -622,6 +625,51 @@
     });
   }
 
+    @Override
+    public PagingSource<Integer, Child1> loadItems() {
+        final String _sql = "SELECT * FROM Child1 ORDER BY id ASC";
+        final RoomRawQuery _rawQuery = new RoomRawQuery(_sql);
+        return new LimitOffsetPagingSource<Child1>(_rawQuery, __db, "Child1") {
+            @Override
+            @NonNull
+            protected List<Child1> convertRows(@NonNull final SQLiteStatement statement,
+                    final int itemCount) {
+                _rawQuery.getBindingFunction().invoke(statement);
+                final int _cursorIndexOfId = SQLiteStatementUtil.getColumnIndexOrThrow(statement, "id");
+                final int _cursorIndexOfName = SQLiteStatementUtil.getColumnIndexOrThrow(statement, "name");
+                final int _cursorIndexOfSerial = SQLiteStatementUtil.getColumnIndexOrThrow(statement, "serial");
+                final int _cursorIndexOfCode = SQLiteStatementUtil.getColumnIndexOrThrow(statement, "code");
+                final List<Child1> _result = new ArrayList<Child1>();
+                while (statement.step()) {
+                    final Child1 _item;
+                    final int _tmpId;
+                    _tmpId = (int) (statement.getLong(_cursorIndexOfId));
+                    final String _tmpName;
+                    if (statement.isNull(_cursorIndexOfName)) {
+                        _tmpName = null;
+                    } else {
+                        _tmpName = statement.getText(_cursorIndexOfName);
+                    }
+                    final Info _tmpInfo;
+                    if (!(statement.isNull(_cursorIndexOfSerial) && statement.isNull(_cursorIndexOfCode))) {
+                        _tmpInfo = new Info();
+                        _tmpInfo.serial = (int) (statement.getLong(_cursorIndexOfSerial));
+                        if (statement.isNull(_cursorIndexOfCode)) {
+                            _tmpInfo.code = null;
+                        } else {
+                            _tmpInfo.code = statement.getText(_cursorIndexOfCode);
+                        }
+                    } else {
+                        _tmpInfo = null;
+                    }
+                    _item = new Child1(_tmpId,_tmpName,_tmpInfo);
+                    _result.add(_item);
+                }
+                return _result;
+            }
+        };
+    }
+
   @Override
   public User getUserViaRawQuery(final SupportSQLiteQuery rawQuery) {
     __db.assertNotSuspendingTransaction();
diff --git a/settings.gradle b/settings.gradle
index ded0605..988cca5 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -508,7 +508,6 @@
 includeProject(":compose:material3:adaptive:adaptive", [BuildType.COMPOSE])
 includeProject(":compose:material3:adaptive:adaptive-layout", [BuildType.COMPOSE])
 includeProject(":compose:material3:adaptive:adaptive-navigation", [BuildType.COMPOSE])
-includeProject(":compose:material3:adaptive:adaptive-render-strategy", [BuildType.COMPOSE])
 includeProject(":compose:material3:adaptive:adaptive-samples", "compose/material3/adaptive/samples", [BuildType.COMPOSE])
 includeProject(":compose:material3:adaptive:adaptive-benchmark", "compose/material3/adaptive/benchmark", [BuildType.COMPOSE])
 includeProject(":compose:material3:material3", [BuildType.COMPOSE])
@@ -743,6 +742,7 @@
 includeProject(":ink:ink-brush", [BuildType.MAIN])
 includeProject(":ink:ink-geometry", [BuildType.MAIN])
 includeProject(":ink:ink-nativeloader", [BuildType.MAIN])
+includeProject(":ink:ink-strokes", [BuildType.MAIN])
 includeProject(":input:input-motionprediction", [BuildType.MAIN])
 includeProject(":inspection:inspection", [BuildType.MAIN, BuildType.COMPOSE])
 includeProject(":inspection:inspection-gradle-plugin", [BuildType.MAIN])
diff --git a/test/uiautomator/integration-tests/testapp/build.gradle b/test/uiautomator/integration-tests/testapp/build.gradle
index 80f7aa2..3d68617 100644
--- a/test/uiautomator/integration-tests/testapp/build.gradle
+++ b/test/uiautomator/integration-tests/testapp/build.gradle
@@ -43,7 +43,7 @@
     androidTestImplementation(libs.testRunner)
 
     // Align dependencies in debugRuntimeClasspath and debugAndroidTestRuntimeClasspath.
-    androidTestImplementation("androidx.lifecycle:lifecycle-common:2.8.3")
+    androidTestImplementation(project(":lifecycle:lifecycle-common"))
     androidTestImplementation(project(":annotation:annotation"))
     androidTestImplementation(libs.junit)
     androidTestImplementation(libs.testMonitor)
diff --git a/wear/compose/compose-material/src/androidTest/kotlin/androidx/wear/compose/material/dialog/DialogTest.kt b/wear/compose/compose-material/src/androidTest/kotlin/androidx/wear/compose/material/dialog/DialogTest.kt
index 9be2bf8..bd54d7f 100644
--- a/wear/compose/compose-material/src/androidTest/kotlin/androidx/wear/compose/material/dialog/DialogTest.kt
+++ b/wear/compose/compose-material/src/androidTest/kotlin/androidx/wear/compose/material/dialog/DialogTest.kt
@@ -385,6 +385,32 @@
         rule.onNodeWithTag(TEST_TAG).performTouchInput({ swipeRight() })
         rule.onNodeWithText(dismissedText).assertExists()
     }
+
+    @Test
+    fun calls_ondismissrequest_when_dialog_becomes_hidden() {
+        val show = mutableStateOf(true)
+        var dismissed = false
+        rule.setContentWithTheme {
+            Box {
+                Dialog(
+                    showDialog = show.value,
+                    onDismissRequest = { dismissed = true },
+                ) {
+                    Alert(
+                        icon = {},
+                        title = {},
+                        message = { Text("Text", modifier = Modifier.testTag(TEST_TAG)) },
+                        content = {},
+                    )
+                }
+            }
+        }
+        rule.waitForIdle()
+        show.value = false
+
+        rule.waitForIdle()
+        assert(dismissed)
+    }
 }
 
 class DialogContentSizeAndPositionTest {
diff --git a/wear/compose/compose-material/src/main/java/androidx/wear/compose/material/dialog/Dialog.android.kt b/wear/compose/compose-material/src/main/java/androidx/wear/compose/material/dialog/Dialog.android.kt
index b07f490..697583e 100644
--- a/wear/compose/compose-material/src/main/java/androidx/wear/compose/material/dialog/Dialog.android.kt
+++ b/wear/compose/compose-material/src/main/java/androidx/wear/compose/material/dialog/Dialog.android.kt
@@ -233,18 +233,17 @@
                     transitionState.targetState = DialogVisibility.Hide
                 }
             }
-
-            LaunchedEffect(transitionState.currentState) {
-                if (
-                    pendingOnDismissCall &&
-                        transitionState.currentState == DialogVisibility.Hide &&
-                        transitionState.isIdle
-                ) {
-                    // After the outro animation, leave the dialog & reset alpha/scale transitions.
-                    onDismissRequest()
-                    pendingOnDismissCall = false
-                }
-            }
+        }
+    }
+    LaunchedEffect(transitionState.currentState) {
+        if (
+            pendingOnDismissCall &&
+                transitionState.currentState == DialogVisibility.Hide &&
+                transitionState.isIdle
+        ) {
+            // After the outro animation, leave the dialog & reset alpha/scale transitions.
+            onDismissRequest()
+            pendingOnDismissCall = false
         }
     }
 }
diff --git a/wear/compose/compose-material3/api/current.txt b/wear/compose/compose-material3/api/current.txt
index b0b63b9..cd6f675 100644
--- a/wear/compose/compose-material3/api/current.txt
+++ b/wear/compose/compose-material3/api/current.txt
@@ -253,6 +253,23 @@
     method @androidx.compose.runtime.Composable public static void SplitCheckboxButton(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onCheckedChange, String? toggleContentDescription, kotlin.jvm.functions.Function0<kotlin.Unit> onContainerClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.ui.graphics.Shape shape, optional androidx.wear.compose.material3.SplitCheckboxButtonColors colors, optional androidx.compose.foundation.interaction.MutableInteractionSource? toggleInteractionSource, optional androidx.compose.foundation.interaction.MutableInteractionSource? containerInteractionSource, optional String? containerClickLabel, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit>? secondaryLabel, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> label);
   }
 
+  public final class CircularProgressIndicatorDefaults {
+    method public float calculateRecommendedGapSize(float strokeWidth);
+    method public float getFullScreenPadding();
+    method @androidx.compose.runtime.Composable public float getLargeStrokeWidth();
+    method @androidx.compose.runtime.Composable public float getSmallStrokeWidth();
+    method public float getStartAngle();
+    property public final float FullScreenPadding;
+    property public final float StartAngle;
+    property @androidx.compose.runtime.Composable public final float largeStrokeWidth;
+    property @androidx.compose.runtime.Composable public final float smallStrokeWidth;
+    field public static final androidx.wear.compose.material3.CircularProgressIndicatorDefaults INSTANCE;
+  }
+
+  public final class CircularProgressIndicatorKt {
+    method @androidx.compose.runtime.Composable public static void CircularProgressIndicator(kotlin.jvm.functions.Function0<java.lang.Float> progress, optional androidx.compose.ui.Modifier modifier, optional float startAngle, optional float endAngle, optional androidx.wear.compose.material3.ProgressIndicatorColors colors, optional float strokeWidth, optional float gapSize, optional boolean enabled);
+  }
+
   @androidx.compose.runtime.Immutable @androidx.compose.runtime.Stable public final class ColorScheme {
     ctor public ColorScheme();
     ctor public ColorScheme(optional long primary, optional long primaryDim, optional long primaryContainer, optional long onPrimary, optional long onPrimaryContainer, optional long secondary, optional long secondaryDim, optional long secondaryContainer, optional long onSecondary, optional long onSecondaryContainer, optional long tertiary, optional long tertiaryDim, optional long tertiaryContainer, optional long onTertiary, optional long onTertiaryContainer, optional long surfaceContainerLow, optional long surfaceContainer, optional long surfaceContainerHigh, optional long onSurface, optional long onSurfaceVariant, optional long outline, optional long outlineVariant, optional long background, optional long onBackground, optional long error, optional long onError, optional long errorContainer, optional long onErrorContainer);
@@ -580,6 +597,18 @@
     method @androidx.compose.runtime.Composable public static void LevelIndicator(kotlin.jvm.functions.Function0<java.lang.Integer> value, kotlin.ranges.IntProgression valueProgression, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.wear.compose.material3.LevelIndicatorColors colors, optional float strokeWidth, optional float sweepAngle, optional boolean reverseDirection);
   }
 
+  public final class LinearProgressIndicatorDefaults {
+    method public float getStrokeWidthLarge();
+    method public float getStrokeWidthSmall();
+    property public final float StrokeWidthLarge;
+    property public final float StrokeWidthSmall;
+    field public static final androidx.wear.compose.material3.LinearProgressIndicatorDefaults INSTANCE;
+  }
+
+  public final class LinearProgressIndicatorKt {
+    method @androidx.compose.runtime.Composable public static void LinearProgressIndicator(kotlin.jvm.functions.Function0<java.lang.Float> progress, optional androidx.compose.ui.Modifier modifier, optional androidx.wear.compose.material3.ProgressIndicatorColors colors, optional float strokeWidth, optional boolean enabled);
+  }
+
   public final class ListHeaderDefaults {
     method public androidx.compose.foundation.layout.PaddingValues getHeaderContentPadding();
     method public androidx.compose.foundation.layout.PaddingValues getSubheaderContentPadding();
@@ -766,33 +795,24 @@
   }
 
   public final class ProgressIndicatorColors {
-    ctor public ProgressIndicatorColors(androidx.compose.ui.graphics.Brush indicatorBrush, androidx.compose.ui.graphics.Brush trackBrush);
+    ctor public ProgressIndicatorColors(androidx.compose.ui.graphics.Brush indicatorBrush, androidx.compose.ui.graphics.Brush trackBrush, optional androidx.compose.ui.graphics.Brush disabledIndicatorBrush, optional androidx.compose.ui.graphics.Brush disabledTrackBrush);
+    method public androidx.compose.ui.graphics.Brush getDisabledIndicatorBrush();
+    method public androidx.compose.ui.graphics.Brush getDisabledTrackBrush();
     method public androidx.compose.ui.graphics.Brush getIndicatorBrush();
     method public androidx.compose.ui.graphics.Brush getTrackBrush();
+    property public final androidx.compose.ui.graphics.Brush disabledIndicatorBrush;
+    property public final androidx.compose.ui.graphics.Brush disabledTrackBrush;
     property public final androidx.compose.ui.graphics.Brush indicatorBrush;
     property public final androidx.compose.ui.graphics.Brush trackBrush;
   }
 
   public final class ProgressIndicatorDefaults {
     method @androidx.compose.runtime.Composable public androidx.wear.compose.material3.ProgressIndicatorColors colors();
-    method @androidx.compose.runtime.Composable public androidx.wear.compose.material3.ProgressIndicatorColors colors(optional androidx.compose.ui.graphics.Brush? indicatorBrush, optional androidx.compose.ui.graphics.Brush? trackBrush);
-    method @androidx.compose.runtime.Composable public androidx.wear.compose.material3.ProgressIndicatorColors colors(optional long indicatorColor, optional long trackColor);
-    method public float gapSize(float strokeWidth);
-    method public float getButtonCircularIndicatorStrokeWidth();
-    method public float getFullScreenPadding();
-    method public float getStartAngle();
-    method public float getStrokeWidth();
-    property public final float ButtonCircularIndicatorStrokeWidth;
-    property public final float FullScreenPadding;
-    property public final float StartAngle;
-    property public final float StrokeWidth;
+    method @androidx.compose.runtime.Composable public androidx.wear.compose.material3.ProgressIndicatorColors colors(optional androidx.compose.ui.graphics.Brush? indicatorBrush, optional androidx.compose.ui.graphics.Brush? trackBrush, optional androidx.compose.ui.graphics.Brush? disabledIndicatorBrush, optional androidx.compose.ui.graphics.Brush? disabledTrackBrush);
+    method @androidx.compose.runtime.Composable public androidx.wear.compose.material3.ProgressIndicatorColors colors(optional long indicatorColor, optional long trackColor, optional long disabledIndicatorColor, optional long disabledTrackColor);
     field public static final androidx.wear.compose.material3.ProgressIndicatorDefaults INSTANCE;
   }
 
-  public final class ProgressIndicatorKt {
-    method @androidx.compose.runtime.Composable public static void CircularProgressIndicator(kotlin.jvm.functions.Function0<java.lang.Float> progress, optional androidx.compose.ui.Modifier modifier, optional float startAngle, optional float endAngle, optional androidx.wear.compose.material3.ProgressIndicatorColors colors, optional float strokeWidth, optional float gapSize);
-  }
-
   @androidx.compose.runtime.Immutable public final class RadioButtonColors {
     ctor public RadioButtonColors(long selectedContainerColor, long selectedContentColor, long selectedSecondaryContentColor, long selectedIconColor, long selectedControlColor, long unselectedContainerColor, long unselectedContentColor, long unselectedSecondaryContentColor, long unselectedIconColor, long unselectedControlColor, long disabledSelectedContainerColor, long disabledSelectedContentColor, long disabledSelectedSecondaryContentColor, long disabledSelectedIconColor, long disabledSelectedControlColor, long disabledUnselectedContainerColor, long disabledUnselectedContentColor, long disabledUnselectedSecondaryContentColor, long disabledUnselectedIconColor, long disabledUnselectedControlColor);
     method public long getDisabledSelectedContainerColor();
@@ -904,8 +924,8 @@
   }
 
   public final class SegmentedCircularProgressIndicatorKt {
-    method @androidx.compose.runtime.Composable public static void SegmentedCircularProgressIndicator(@IntRange(from=1L) int segmentCount, kotlin.jvm.functions.Function0<java.lang.Float> progress, optional androidx.compose.ui.Modifier modifier, optional float startAngle, optional float endAngle, optional androidx.wear.compose.material3.ProgressIndicatorColors colors, optional float strokeWidth, optional float gapSize);
-    method @androidx.compose.runtime.Composable public static void SegmentedCircularProgressIndicator(@IntRange(from=1L) int segmentCount, kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Boolean> completed, optional androidx.compose.ui.Modifier modifier, optional float startAngle, optional float endAngle, optional androidx.wear.compose.material3.ProgressIndicatorColors colors, optional float strokeWidth, optional float gapSize);
+    method @androidx.compose.runtime.Composable public static void SegmentedCircularProgressIndicator(@IntRange(from=1L) int segmentCount, kotlin.jvm.functions.Function0<java.lang.Float> progress, optional androidx.compose.ui.Modifier modifier, optional float startAngle, optional float endAngle, optional androidx.wear.compose.material3.ProgressIndicatorColors colors, optional float strokeWidth, optional float gapSize, optional boolean enabled);
+    method @androidx.compose.runtime.Composable public static void SegmentedCircularProgressIndicator(@IntRange(from=1L) int segmentCount, kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Boolean> completed, optional androidx.compose.ui.Modifier modifier, optional float startAngle, optional float endAngle, optional androidx.wear.compose.material3.ProgressIndicatorColors colors, optional float strokeWidth, optional float gapSize, optional boolean enabled);
   }
 
   public final class ShapeDefaults {
diff --git a/wear/compose/compose-material3/api/restricted_current.txt b/wear/compose/compose-material3/api/restricted_current.txt
index b0b63b9..cd6f675 100644
--- a/wear/compose/compose-material3/api/restricted_current.txt
+++ b/wear/compose/compose-material3/api/restricted_current.txt
@@ -253,6 +253,23 @@
     method @androidx.compose.runtime.Composable public static void SplitCheckboxButton(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onCheckedChange, String? toggleContentDescription, kotlin.jvm.functions.Function0<kotlin.Unit> onContainerClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.ui.graphics.Shape shape, optional androidx.wear.compose.material3.SplitCheckboxButtonColors colors, optional androidx.compose.foundation.interaction.MutableInteractionSource? toggleInteractionSource, optional androidx.compose.foundation.interaction.MutableInteractionSource? containerInteractionSource, optional String? containerClickLabel, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit>? secondaryLabel, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> label);
   }
 
+  public final class CircularProgressIndicatorDefaults {
+    method public float calculateRecommendedGapSize(float strokeWidth);
+    method public float getFullScreenPadding();
+    method @androidx.compose.runtime.Composable public float getLargeStrokeWidth();
+    method @androidx.compose.runtime.Composable public float getSmallStrokeWidth();
+    method public float getStartAngle();
+    property public final float FullScreenPadding;
+    property public final float StartAngle;
+    property @androidx.compose.runtime.Composable public final float largeStrokeWidth;
+    property @androidx.compose.runtime.Composable public final float smallStrokeWidth;
+    field public static final androidx.wear.compose.material3.CircularProgressIndicatorDefaults INSTANCE;
+  }
+
+  public final class CircularProgressIndicatorKt {
+    method @androidx.compose.runtime.Composable public static void CircularProgressIndicator(kotlin.jvm.functions.Function0<java.lang.Float> progress, optional androidx.compose.ui.Modifier modifier, optional float startAngle, optional float endAngle, optional androidx.wear.compose.material3.ProgressIndicatorColors colors, optional float strokeWidth, optional float gapSize, optional boolean enabled);
+  }
+
   @androidx.compose.runtime.Immutable @androidx.compose.runtime.Stable public final class ColorScheme {
     ctor public ColorScheme();
     ctor public ColorScheme(optional long primary, optional long primaryDim, optional long primaryContainer, optional long onPrimary, optional long onPrimaryContainer, optional long secondary, optional long secondaryDim, optional long secondaryContainer, optional long onSecondary, optional long onSecondaryContainer, optional long tertiary, optional long tertiaryDim, optional long tertiaryContainer, optional long onTertiary, optional long onTertiaryContainer, optional long surfaceContainerLow, optional long surfaceContainer, optional long surfaceContainerHigh, optional long onSurface, optional long onSurfaceVariant, optional long outline, optional long outlineVariant, optional long background, optional long onBackground, optional long error, optional long onError, optional long errorContainer, optional long onErrorContainer);
@@ -580,6 +597,18 @@
     method @androidx.compose.runtime.Composable public static void LevelIndicator(kotlin.jvm.functions.Function0<java.lang.Integer> value, kotlin.ranges.IntProgression valueProgression, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.wear.compose.material3.LevelIndicatorColors colors, optional float strokeWidth, optional float sweepAngle, optional boolean reverseDirection);
   }
 
+  public final class LinearProgressIndicatorDefaults {
+    method public float getStrokeWidthLarge();
+    method public float getStrokeWidthSmall();
+    property public final float StrokeWidthLarge;
+    property public final float StrokeWidthSmall;
+    field public static final androidx.wear.compose.material3.LinearProgressIndicatorDefaults INSTANCE;
+  }
+
+  public final class LinearProgressIndicatorKt {
+    method @androidx.compose.runtime.Composable public static void LinearProgressIndicator(kotlin.jvm.functions.Function0<java.lang.Float> progress, optional androidx.compose.ui.Modifier modifier, optional androidx.wear.compose.material3.ProgressIndicatorColors colors, optional float strokeWidth, optional boolean enabled);
+  }
+
   public final class ListHeaderDefaults {
     method public androidx.compose.foundation.layout.PaddingValues getHeaderContentPadding();
     method public androidx.compose.foundation.layout.PaddingValues getSubheaderContentPadding();
@@ -766,33 +795,24 @@
   }
 
   public final class ProgressIndicatorColors {
-    ctor public ProgressIndicatorColors(androidx.compose.ui.graphics.Brush indicatorBrush, androidx.compose.ui.graphics.Brush trackBrush);
+    ctor public ProgressIndicatorColors(androidx.compose.ui.graphics.Brush indicatorBrush, androidx.compose.ui.graphics.Brush trackBrush, optional androidx.compose.ui.graphics.Brush disabledIndicatorBrush, optional androidx.compose.ui.graphics.Brush disabledTrackBrush);
+    method public androidx.compose.ui.graphics.Brush getDisabledIndicatorBrush();
+    method public androidx.compose.ui.graphics.Brush getDisabledTrackBrush();
     method public androidx.compose.ui.graphics.Brush getIndicatorBrush();
     method public androidx.compose.ui.graphics.Brush getTrackBrush();
+    property public final androidx.compose.ui.graphics.Brush disabledIndicatorBrush;
+    property public final androidx.compose.ui.graphics.Brush disabledTrackBrush;
     property public final androidx.compose.ui.graphics.Brush indicatorBrush;
     property public final androidx.compose.ui.graphics.Brush trackBrush;
   }
 
   public final class ProgressIndicatorDefaults {
     method @androidx.compose.runtime.Composable public androidx.wear.compose.material3.ProgressIndicatorColors colors();
-    method @androidx.compose.runtime.Composable public androidx.wear.compose.material3.ProgressIndicatorColors colors(optional androidx.compose.ui.graphics.Brush? indicatorBrush, optional androidx.compose.ui.graphics.Brush? trackBrush);
-    method @androidx.compose.runtime.Composable public androidx.wear.compose.material3.ProgressIndicatorColors colors(optional long indicatorColor, optional long trackColor);
-    method public float gapSize(float strokeWidth);
-    method public float getButtonCircularIndicatorStrokeWidth();
-    method public float getFullScreenPadding();
-    method public float getStartAngle();
-    method public float getStrokeWidth();
-    property public final float ButtonCircularIndicatorStrokeWidth;
-    property public final float FullScreenPadding;
-    property public final float StartAngle;
-    property public final float StrokeWidth;
+    method @androidx.compose.runtime.Composable public androidx.wear.compose.material3.ProgressIndicatorColors colors(optional androidx.compose.ui.graphics.Brush? indicatorBrush, optional androidx.compose.ui.graphics.Brush? trackBrush, optional androidx.compose.ui.graphics.Brush? disabledIndicatorBrush, optional androidx.compose.ui.graphics.Brush? disabledTrackBrush);
+    method @androidx.compose.runtime.Composable public androidx.wear.compose.material3.ProgressIndicatorColors colors(optional long indicatorColor, optional long trackColor, optional long disabledIndicatorColor, optional long disabledTrackColor);
     field public static final androidx.wear.compose.material3.ProgressIndicatorDefaults INSTANCE;
   }
 
-  public final class ProgressIndicatorKt {
-    method @androidx.compose.runtime.Composable public static void CircularProgressIndicator(kotlin.jvm.functions.Function0<java.lang.Float> progress, optional androidx.compose.ui.Modifier modifier, optional float startAngle, optional float endAngle, optional androidx.wear.compose.material3.ProgressIndicatorColors colors, optional float strokeWidth, optional float gapSize);
-  }
-
   @androidx.compose.runtime.Immutable public final class RadioButtonColors {
     ctor public RadioButtonColors(long selectedContainerColor, long selectedContentColor, long selectedSecondaryContentColor, long selectedIconColor, long selectedControlColor, long unselectedContainerColor, long unselectedContentColor, long unselectedSecondaryContentColor, long unselectedIconColor, long unselectedControlColor, long disabledSelectedContainerColor, long disabledSelectedContentColor, long disabledSelectedSecondaryContentColor, long disabledSelectedIconColor, long disabledSelectedControlColor, long disabledUnselectedContainerColor, long disabledUnselectedContentColor, long disabledUnselectedSecondaryContentColor, long disabledUnselectedIconColor, long disabledUnselectedControlColor);
     method public long getDisabledSelectedContainerColor();
@@ -904,8 +924,8 @@
   }
 
   public final class SegmentedCircularProgressIndicatorKt {
-    method @androidx.compose.runtime.Composable public static void SegmentedCircularProgressIndicator(@IntRange(from=1L) int segmentCount, kotlin.jvm.functions.Function0<java.lang.Float> progress, optional androidx.compose.ui.Modifier modifier, optional float startAngle, optional float endAngle, optional androidx.wear.compose.material3.ProgressIndicatorColors colors, optional float strokeWidth, optional float gapSize);
-    method @androidx.compose.runtime.Composable public static void SegmentedCircularProgressIndicator(@IntRange(from=1L) int segmentCount, kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Boolean> completed, optional androidx.compose.ui.Modifier modifier, optional float startAngle, optional float endAngle, optional androidx.wear.compose.material3.ProgressIndicatorColors colors, optional float strokeWidth, optional float gapSize);
+    method @androidx.compose.runtime.Composable public static void SegmentedCircularProgressIndicator(@IntRange(from=1L) int segmentCount, kotlin.jvm.functions.Function0<java.lang.Float> progress, optional androidx.compose.ui.Modifier modifier, optional float startAngle, optional float endAngle, optional androidx.wear.compose.material3.ProgressIndicatorColors colors, optional float strokeWidth, optional float gapSize, optional boolean enabled);
+    method @androidx.compose.runtime.Composable public static void SegmentedCircularProgressIndicator(@IntRange(from=1L) int segmentCount, kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Boolean> completed, optional androidx.compose.ui.Modifier modifier, optional float startAngle, optional float endAngle, optional androidx.wear.compose.material3.ProgressIndicatorColors colors, optional float strokeWidth, optional float gapSize, optional boolean enabled);
   }
 
   public final class ShapeDefaults {
diff --git a/wear/compose/compose-material3/integration-tests/src/main/java/androidx/wear/compose/material3/demos/ProgressIndicatorDemo.kt b/wear/compose/compose-material3/integration-tests/src/main/java/androidx/wear/compose/material3/demos/ProgressIndicatorDemo.kt
index 0179e50..73f8f8e 100644
--- a/wear/compose/compose-material3/integration-tests/src/main/java/androidx/wear/compose/material3/demos/ProgressIndicatorDemo.kt
+++ b/wear/compose/compose-material3/integration-tests/src/main/java/androidx/wear/compose/material3/demos/ProgressIndicatorDemo.kt
@@ -17,24 +17,30 @@
 package androidx.wear.compose.material3.demos
 
 import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
+import androidx.wear.compose.foundation.lazy.ScalingLazyColumn
 import androidx.wear.compose.integration.demos.common.Centralize
 import androidx.wear.compose.integration.demos.common.ComposableDemo
 import androidx.wear.compose.material3.Button
 import androidx.wear.compose.material3.CircularProgressIndicator
+import androidx.wear.compose.material3.CircularProgressIndicatorDefaults
 import androidx.wear.compose.material3.IconButtonDefaults
+import androidx.wear.compose.material3.ListHeader
 import androidx.wear.compose.material3.MaterialTheme
 import androidx.wear.compose.material3.ProgressIndicatorDefaults
-import androidx.wear.compose.material3.ProgressIndicatorDefaults.ButtonCircularIndicatorStrokeWidth
 import androidx.wear.compose.material3.Text
 import androidx.wear.compose.material3.samples.FullScreenProgressIndicatorSample
+import androidx.wear.compose.material3.samples.LinearProgressIndicatorSample
 import androidx.wear.compose.material3.samples.MediaButtonProgressIndicatorSample
 import androidx.wear.compose.material3.samples.OverflowProgressIndicatorSample
 import androidx.wear.compose.material3.samples.SegmentedProgressIndicatorOnOffSample
@@ -62,7 +68,7 @@
                         modifier = Modifier.size(IconButtonDefaults.DefaultButtonSize),
                         startAngle = 120f,
                         endAngle = 60f,
-                        strokeWidth = ButtonCircularIndicatorStrokeWidth,
+                        strokeWidth = CircularProgressIndicatorDefaults.smallStrokeWidth,
                         colors = ProgressIndicatorDefaults.colors(indicatorColor = Color.Red)
                     )
                 }
@@ -75,4 +81,33 @@
         ComposableDemo("Progress segments on/off") {
             Centralize { SegmentedProgressIndicatorOnOffSample() }
         },
+        ComposableDemo("Linear progress indicator") {
+            Centralize { LinearProgressIndicatorSamples() }
+        },
     )
+
+@Composable
+fun LinearProgressIndicatorSamples() {
+    Box(modifier = Modifier.background(MaterialTheme.colorScheme.background).fillMaxSize()) {
+        ScalingLazyColumn(
+            modifier = Modifier.fillMaxSize().padding(12.dp),
+            verticalArrangement = Arrangement.Center,
+            horizontalAlignment = Alignment.CenterHorizontally
+        ) {
+            item { ListHeader { Text("Progress 0%") } }
+            item { LinearProgressIndicatorSample(progress = { 0f }) }
+            item { ListHeader { Text("Progress 1%") } }
+            item { LinearProgressIndicatorSample(progress = { 0.01f }) }
+            item { ListHeader { Text("Progress 50%") } }
+            item { LinearProgressIndicatorSample(progress = { 0.5f }) }
+            item { ListHeader { Text("Progress 100%") } }
+            item { LinearProgressIndicatorSample(progress = { 1f }) }
+            item { ListHeader { Text("Disabled 0%") } }
+            item { LinearProgressIndicatorSample(progress = { 0f }, enabled = false) }
+            item { ListHeader { Text("Disabled 50%") } }
+            item { LinearProgressIndicatorSample(progress = { 0.5f }, enabled = false) }
+            item { ListHeader { Text("Disabled 100%") } }
+            item { LinearProgressIndicatorSample(progress = { 1f }, enabled = false) }
+        }
+    }
+}
diff --git a/wear/compose/compose-material3/samples/src/main/java/androidx/wear/compose/material3/samples/LinearProgressIndicatorSample.kt b/wear/compose/compose-material3/samples/src/main/java/androidx/wear/compose/material3/samples/LinearProgressIndicatorSample.kt
new file mode 100644
index 0000000..0c69a76
--- /dev/null
+++ b/wear/compose/compose-material3/samples/src/main/java/androidx/wear/compose/material3/samples/LinearProgressIndicatorSample.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2024 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.wear.compose.material3.samples
+
+import androidx.annotation.Sampled
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.semantics.ProgressBarRangeInfo
+import androidx.compose.ui.semantics.progressBarRangeInfo
+import androidx.compose.ui.semantics.semantics
+import androidx.wear.compose.material3.LinearProgressIndicator
+import androidx.wear.compose.material3.MaterialTheme
+
+@Sampled
+@Composable
+fun LinearProgressIndicatorSample(progress: () -> Float, enabled: Boolean = true) {
+    Box(modifier = Modifier.background(MaterialTheme.colorScheme.background).fillMaxSize()) {
+        LinearProgressIndicator(
+            progress = progress,
+            enabled = enabled,
+            modifier =
+                Modifier.semantics(mergeDescendants = true) {
+                    progressBarRangeInfo = ProgressBarRangeInfo(progress(), 0f..1f)
+                }
+        )
+    }
+}
diff --git a/wear/compose/compose-material3/samples/src/main/java/androidx/wear/compose/material3/samples/ProgressIndicatorSample.kt b/wear/compose/compose-material3/samples/src/main/java/androidx/wear/compose/material3/samples/ProgressIndicatorSample.kt
index 9c732d4..4af6a52 100644
--- a/wear/compose/compose-material3/samples/src/main/java/androidx/wear/compose/material3/samples/ProgressIndicatorSample.kt
+++ b/wear/compose/compose-material3/samples/src/main/java/androidx/wear/compose/material3/samples/ProgressIndicatorSample.kt
@@ -40,6 +40,7 @@
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.unit.dp
 import androidx.wear.compose.material3.CircularProgressIndicator
+import androidx.wear.compose.material3.CircularProgressIndicatorDefaults
 import androidx.wear.compose.material3.Icon
 import androidx.wear.compose.material3.IconButton
 import androidx.wear.compose.material3.IconButtonDefaults
@@ -53,7 +54,7 @@
     Box(
         modifier =
             Modifier.background(MaterialTheme.colorScheme.background)
-                .padding(ProgressIndicatorDefaults.FullScreenPadding)
+                .padding(CircularProgressIndicatorDefaults.FullScreenPadding)
                 .fillMaxSize()
     ) {
         CircularProgressIndicator(
@@ -64,7 +65,7 @@
                 ProgressIndicatorDefaults.colors(
                     indicatorColor = Color.Green,
                     trackColor = Color.Green.copy(alpha = 0.5f)
-                ),
+                )
         )
     }
 }
@@ -114,7 +115,7 @@
     Box(
         modifier =
             Modifier.background(MaterialTheme.colorScheme.background)
-                .padding(ProgressIndicatorDefaults.FullScreenPadding)
+                .padding(CircularProgressIndicatorDefaults.FullScreenPadding)
                 .fillMaxSize()
     ) {
         CircularProgressIndicator(
@@ -144,7 +145,8 @@
         CircularProgressIndicator(
             // Small progress values like 2% will be rounded up to at least the stroke width.
             progress = { 0.02f },
-            modifier = Modifier.fillMaxSize().padding(ProgressIndicatorDefaults.FullScreenPadding),
+            modifier =
+                Modifier.fillMaxSize().padding(CircularProgressIndicatorDefaults.FullScreenPadding),
             startAngle = 120f,
             endAngle = 60f,
             strokeWidth = 10.dp,
@@ -163,7 +165,7 @@
     Box(
         modifier =
             Modifier.background(MaterialTheme.colorScheme.background)
-                .padding(ProgressIndicatorDefaults.FullScreenPadding)
+                .padding(CircularProgressIndicatorDefaults.FullScreenPadding)
                 .fillMaxSize()
     ) {
         SegmentedCircularProgressIndicator(
@@ -184,7 +186,7 @@
     Box(
         modifier =
             Modifier.background(MaterialTheme.colorScheme.background)
-                .padding(ProgressIndicatorDefaults.FullScreenPadding)
+                .padding(CircularProgressIndicatorDefaults.FullScreenPadding)
                 .fillMaxSize()
     ) {
         SegmentedCircularProgressIndicator(
diff --git a/wear/compose/compose-material3/src/androidTest/kotlin/androidx/wear/compose/material3/LinearProgressIndicatorScreenshotTest.kt b/wear/compose/compose-material3/src/androidTest/kotlin/androidx/wear/compose/material3/LinearProgressIndicatorScreenshotTest.kt
new file mode 100644
index 0000000..cd4f141
--- /dev/null
+++ b/wear/compose/compose-material3/src/androidTest/kotlin/androidx/wear/compose/material3/LinearProgressIndicatorScreenshotTest.kt
@@ -0,0 +1,125 @@
+/*
+ * Copyright 2024 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.wear.compose.material3
+
+import android.os.Build
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.testutils.assertAgainstGolden
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalLayoutDirection
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.test.captureToImage
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.unit.LayoutDirection
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.MediumTest
+import androidx.test.filters.SdkSuppress
+import androidx.test.screenshot.AndroidXScreenshotTestRule
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.TestName
+import org.junit.runner.RunWith
+
+@MediumTest
+@RunWith(AndroidJUnit4::class)
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
+class LinearProgressIndicatorScreenshotTest {
+
+    @get:Rule val rule = createComposeRule()
+
+    @get:Rule val screenshotRule = AndroidXScreenshotTestRule(SCREENSHOT_GOLDEN_PATH)
+
+    @get:Rule val testName = TestName()
+
+    @Test
+    fun linear_progress_indicator_empty() = linear_progress_indicator_test {
+        LinearProgressIndicator(
+            progress = { 0f },
+            modifier = Modifier.aspectRatio(1f).testTag(TEST_TAG),
+        )
+    }
+
+    @Test
+    fun linear_progress_indicator_50_percent() = linear_progress_indicator_test {
+        LinearProgressIndicator(
+            progress = { 0.5f },
+            modifier = Modifier.aspectRatio(1f).testTag(TEST_TAG),
+        )
+    }
+
+    @Test
+    fun linear_progress_indicator_full() = linear_progress_indicator_test {
+        LinearProgressIndicator(
+            progress = { 1f },
+            modifier = Modifier.aspectRatio(1f).testTag(TEST_TAG),
+        )
+    }
+
+    @Test
+    fun linear_progress_indicator_50_percent_disabled() = linear_progress_indicator_test {
+        LinearProgressIndicator(
+            progress = { 0.5f },
+            enabled = false,
+            modifier = Modifier.aspectRatio(1f).testTag(TEST_TAG),
+        )
+    }
+
+    @Test
+    fun linear_progress_indicator_custom_color() = linear_progress_indicator_test {
+        LinearProgressIndicator(
+            progress = { 0.5f },
+            modifier = Modifier.aspectRatio(1f).testTag(TEST_TAG),
+            colors =
+                ProgressIndicatorDefaults.colors(
+                    indicatorColor = Color.Green,
+                    trackColor = Color.Red.copy(alpha = 0.5f)
+                )
+        )
+    }
+
+    @Test
+    fun linear_progress_indicator_rtl() =
+        linear_progress_indicator_test(isLtr = false) {
+            LinearProgressIndicator(
+                progress = { 0.5f },
+                modifier = Modifier.aspectRatio(1f).testTag(TEST_TAG),
+            )
+        }
+
+    private fun linear_progress_indicator_test(
+        isLtr: Boolean = true,
+        content: @Composable () -> Unit
+    ) {
+        rule.setContentWithTheme(modifier = Modifier.background(Color.Black)) {
+            val layoutDirection = if (isLtr) LayoutDirection.Ltr else LayoutDirection.Rtl
+            CompositionLocalProvider(
+                LocalLayoutDirection provides layoutDirection,
+                content = content
+            )
+        }
+
+        rule
+            .onNodeWithTag(TEST_TAG)
+            .captureToImage()
+            .assertAgainstGolden(screenshotRule, testName.methodName)
+    }
+}
diff --git a/wear/compose/compose-material3/src/androidTest/kotlin/androidx/wear/compose/material3/LinearProgressIndicatorTest.kt b/wear/compose/compose-material3/src/androidTest/kotlin/androidx/wear/compose/material3/LinearProgressIndicatorTest.kt
new file mode 100644
index 0000000..1353b13
--- /dev/null
+++ b/wear/compose/compose-material3/src/androidTest/kotlin/androidx/wear/compose/material3/LinearProgressIndicatorTest.kt
@@ -0,0 +1,174 @@
+/*
+ * Copyright 2024 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.wear.compose.material3
+
+import android.os.Build
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.testutils.assertContainsColor
+import androidx.compose.testutils.assertDoesNotContainColor
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.semantics.ProgressBarRangeInfo
+import androidx.compose.ui.semantics.progressBarRangeInfo
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.test.assertRangeInfoEquals
+import androidx.compose.ui.test.captureToImage
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.unit.dp
+import androidx.test.filters.SdkSuppress
+import org.junit.Rule
+import org.junit.Test
+
+class LinearProgressIndicatorTest {
+    @get:Rule val rule = createComposeRule()
+
+    @Test
+    fun supports_testtag() {
+        rule.setContentWithTheme {
+            LinearProgressIndicator(progress = { 0.5f }, modifier = Modifier.testTag(TEST_TAG))
+        }
+
+        rule.onNodeWithTag(TEST_TAG).assertExists()
+    }
+
+    @Test
+    fun allows_semantics_to_be_added_correctly() {
+        val progress = mutableStateOf(0f)
+
+        rule.setContentWithTheme {
+            LinearProgressIndicator(
+                modifier =
+                    Modifier.testTag(TEST_TAG).semantics {
+                        progressBarRangeInfo = ProgressBarRangeInfo(progress.value, 0f..1f)
+                    },
+                progress = { progress.value }
+            )
+        }
+
+        rule.onNodeWithTag(TEST_TAG).assertRangeInfoEquals(ProgressBarRangeInfo(0f, 0f..1f))
+
+        rule.runOnIdle { progress.value = 0.5f }
+
+        rule.onNodeWithTag(TEST_TAG).assertRangeInfoEquals(ProgressBarRangeInfo(0.5f, 0f..1f))
+    }
+
+    @Test(expected = IllegalArgumentException::class)
+    fun invalid_stroke_width_throws_exception() {
+        rule.setContentWithTheme { LinearProgressIndicator(progress = { 1f }, strokeWidth = 1.dp) }
+    }
+
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
+    @Test
+    fun progress_full_contains_progress_color() {
+        rule.setContentWithTheme {
+            LinearProgressIndicator(
+                progress = { 1f },
+                modifier = Modifier.testTag(TEST_TAG),
+                colors =
+                    ProgressIndicatorDefaults.colors(
+                        indicatorColor = Color.Yellow,
+                        trackColor = Color.Red
+                    ),
+            )
+        }
+
+        rule.waitForIdle()
+
+        rule.onNodeWithTag(TEST_TAG).captureToImage().assertContainsColor(Color.Yellow)
+        rule.onNodeWithTag(TEST_TAG).captureToImage().assertDoesNotContainColor(Color.Red)
+    }
+
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
+    @Test
+    fun progress_zero_contains_track_color() {
+        rule.setContentWithTheme {
+            LinearProgressIndicator(
+                progress = { 0f },
+                modifier = Modifier.testTag(TEST_TAG),
+                colors =
+                    ProgressIndicatorDefaults.colors(
+                        indicatorColor = Color.Yellow,
+                        trackColor = Color.Red
+                    ),
+            )
+        }
+        rule.waitForIdle()
+        rule.onNodeWithTag(TEST_TAG).captureToImage().assertContainsColor(Color.Yellow)
+        rule.onNodeWithTag(TEST_TAG).captureToImage().assertContainsColor(Color.Red)
+
+        // The empty progress bar should contain a small dot of progress color
+        rule
+            .onNodeWithTag(TEST_TAG)
+            .captureToImage()
+            .assertColorInPercentageRange(Color.Yellow, 0f..3f)
+    }
+
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
+    @Test
+    fun progress_half_contains_progress_and_track_colors() {
+        rule.setContentWithTheme {
+            LinearProgressIndicator(
+                progress = { 0.5f },
+                modifier = Modifier.testTag(TEST_TAG),
+                colors =
+                    ProgressIndicatorDefaults.colors(
+                        indicatorColor = Color.Yellow,
+                        trackColor = Color.Red
+                    ),
+            )
+        }
+
+        rule.waitForIdle()
+
+        rule.onNodeWithTag(TEST_TAG).captureToImage().assertContainsColor(Color.Yellow)
+        rule.onNodeWithTag(TEST_TAG).captureToImage().assertContainsColor(Color.Red)
+
+        // Contains around half progress color
+        rule
+            .onNodeWithTag(TEST_TAG)
+            .captureToImage()
+            .assertColorInPercentageRange(Color.Yellow, 45f..55f)
+    }
+
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
+    @Test
+    fun progress_disabled_contains_only_disabled_colors() {
+        rule.setContentWithTheme {
+            LinearProgressIndicator(
+                progress = { 0.5f },
+                modifier = Modifier.testTag(TEST_TAG),
+                enabled = false,
+                colors =
+                    ProgressIndicatorDefaults.colors(
+                        indicatorColor = Color.Yellow,
+                        trackColor = Color.Red,
+                        disabledIndicatorColor = Color.Blue,
+                        disabledTrackColor = Color.Green,
+                    ),
+            )
+        }
+
+        rule.waitForIdle()
+
+        rule.onNodeWithTag(TEST_TAG).captureToImage().assertDoesNotContainColor(Color.Yellow)
+        rule.onNodeWithTag(TEST_TAG).captureToImage().assertDoesNotContainColor(Color.Red)
+        rule.onNodeWithTag(TEST_TAG).captureToImage().assertContainsColor(Color.Blue)
+        rule.onNodeWithTag(TEST_TAG).captureToImage().assertContainsColor(Color.Green)
+    }
+}
diff --git a/wear/compose/compose-material3/src/androidTest/kotlin/androidx/wear/compose/material3/ProgressIndicatorScreenshotTest.kt b/wear/compose/compose-material3/src/androidTest/kotlin/androidx/wear/compose/material3/ProgressIndicatorScreenshotTest.kt
index 2cc06b3..37798e1 100644
--- a/wear/compose/compose-material3/src/androidTest/kotlin/androidx/wear/compose/material3/ProgressIndicatorScreenshotTest.kt
+++ b/wear/compose/compose-material3/src/androidTest/kotlin/androidx/wear/compose/material3/ProgressIndicatorScreenshotTest.kt
@@ -16,6 +16,7 @@
 
 package androidx.wear.compose.material3
 
+import android.content.res.Configuration
 import android.os.Build
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
@@ -27,12 +28,14 @@
 import androidx.compose.material.icons.filled.PlayArrow
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.remember
 import androidx.compose.testutils.assertAgainstGolden
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.test.captureToImage
@@ -60,7 +63,7 @@
     @get:Rule val testName = TestName()
 
     @Test
-    fun progress_indicator_fullscreen() = verifyScreenshot {
+    fun progress_indicator_fullscreen() = verifyProgressIndicatorScreenshot {
         CircularProgressIndicator(
             progress = { 0.25f },
             modifier = Modifier.aspectRatio(1f).testTag(TEST_TAG),
@@ -70,7 +73,19 @@
     }
 
     @Test
-    fun progress_indicator_custom_color() = verifyScreenshot {
+    fun progress_indicator_fullscreen_large_screen() {
+        verifyProgressIndicatorScreenshot(isLargeScreen = true) {
+            CircularProgressIndicator(
+                progress = { 0.25f },
+                modifier = Modifier.aspectRatio(1f).testTag(TEST_TAG),
+                startAngle = 120f,
+                endAngle = 60f,
+            )
+        }
+    }
+
+    @Test
+    fun progress_indicator_custom_color() = verifyProgressIndicatorScreenshot {
         CircularProgressIndicator(
             progress = { 0.75f },
             modifier = Modifier.size(200.dp).testTag(TEST_TAG),
@@ -85,7 +100,24 @@
     }
 
     @Test
-    fun progress_indicator_wrapping_media_button() = verifyScreenshot {
+    fun progress_indicator_custom_color_large_screen() {
+        verifyProgressIndicatorScreenshot(isLargeScreen = true) {
+            CircularProgressIndicator(
+                progress = { 0.75f },
+                modifier = Modifier.size(200.dp).testTag(TEST_TAG),
+                startAngle = 120f,
+                endAngle = 60f,
+                colors =
+                    ProgressIndicatorDefaults.colors(
+                        indicatorColor = Color.Green,
+                        trackColor = Color.Red.copy(alpha = 0.5f)
+                    )
+            )
+        }
+    }
+
+    @Test
+    fun progress_indicator_wrapping_media_button() = verifyProgressIndicatorScreenshot {
         val progressPadding = 4.dp
         Box(
             modifier =
@@ -110,7 +142,34 @@
     }
 
     @Test
-    fun progress_indicator_overflow() = verifyScreenshot {
+    fun progress_indicator_wrapping_media_button_large_screen() {
+        verifyProgressIndicatorScreenshot(isLargeScreen = true) {
+            val progressPadding = 4.dp
+            Box(
+                modifier =
+                    Modifier.size(IconButtonDefaults.DefaultButtonSize + progressPadding)
+                        .testTag(TEST_TAG)
+            ) {
+                CircularProgressIndicator(progress = { 0.75f }, strokeWidth = progressPadding)
+                IconButton(
+                    modifier =
+                        Modifier.align(Alignment.Center)
+                            .padding(progressPadding)
+                            .clip(CircleShape)
+                            .background(MaterialTheme.colorScheme.surfaceContainer),
+                    onClick = {}
+                ) {
+                    Icon(
+                        imageVector = Icons.Filled.PlayArrow,
+                        contentDescription = "Play/pause button icon"
+                    )
+                }
+            }
+        }
+    }
+
+    @Test
+    fun progress_indicator_overflow() = verifyProgressIndicatorScreenshot {
         CircularProgressIndicator(
             progress = { 0.2f },
             modifier = Modifier.aspectRatio(1f).testTag(TEST_TAG),
@@ -130,7 +189,53 @@
     }
 
     @Test
-    fun segmented_progress_indicator_with_progress() = verifyScreenshot {
+    fun progress_indicator_overflow_large_screen() {
+        verifyProgressIndicatorScreenshot(isLargeScreen = true) {
+            CircularProgressIndicator(
+                progress = { 0.2f },
+                modifier = Modifier.aspectRatio(1f).testTag(TEST_TAG),
+                startAngle = 120f,
+                endAngle = 60f,
+                colors =
+                    ProgressIndicatorDefaults.colors(
+                        trackBrush =
+                            Brush.linearGradient(
+                                listOf(
+                                    MaterialTheme.colorScheme.surfaceContainer,
+                                    MaterialTheme.colorScheme.primary
+                                )
+                            )
+                    )
+            )
+        }
+    }
+
+    @Test
+    fun progress_indicator_disabled() = verifyProgressIndicatorScreenshot {
+        CircularProgressIndicator(
+            progress = { 0.75f },
+            modifier = Modifier.size(200.dp).testTag(TEST_TAG),
+            startAngle = 120f,
+            endAngle = 60f,
+            enabled = false,
+        )
+    }
+
+    @Test
+    fun progress_indicator_disabled_large_screen() {
+        verifyProgressIndicatorScreenshot(isLargeScreen = true) {
+            CircularProgressIndicator(
+                progress = { 0.75f },
+                modifier = Modifier.size(200.dp).testTag(TEST_TAG),
+                startAngle = 120f,
+                endAngle = 60f,
+                enabled = false,
+            )
+        }
+    }
+
+    @Test
+    fun segmented_progress_indicator_with_progress() = verifyProgressIndicatorScreenshot {
         SegmentedCircularProgressIndicator(
             progress = { 0.5f },
             segmentCount = 5,
@@ -141,7 +246,46 @@
     }
 
     @Test
-    fun segmented_progress_indicator_on_off() = verifyScreenshot {
+    fun segmented_progress_indicator_with_progress_large_screen() {
+        verifyProgressIndicatorScreenshot(isLargeScreen = true) {
+            SegmentedCircularProgressIndicator(
+                progress = { 0.5f },
+                segmentCount = 5,
+                modifier = Modifier.aspectRatio(1f).testTag(TEST_TAG),
+                startAngle = 120f,
+                endAngle = 60f,
+            )
+        }
+    }
+
+    @Test
+    fun segmented_progress_indicator_with_progress_disabled() = verifyProgressIndicatorScreenshot {
+        SegmentedCircularProgressIndicator(
+            progress = { 0.5f },
+            segmentCount = 5,
+            modifier = Modifier.aspectRatio(1f).testTag(TEST_TAG),
+            startAngle = 120f,
+            endAngle = 60f,
+            enabled = false,
+        )
+    }
+
+    @Test
+    fun segmented_progress_indicator_with_progress_disabled_large_screen() {
+        verifyProgressIndicatorScreenshot(isLargeScreen = true) {
+            SegmentedCircularProgressIndicator(
+                progress = { 0.5f },
+                segmentCount = 5,
+                modifier = Modifier.aspectRatio(1f).testTag(TEST_TAG),
+                startAngle = 120f,
+                endAngle = 60f,
+                enabled = false,
+            )
+        }
+    }
+
+    @Test
+    fun segmented_progress_indicator_on_off() = verifyProgressIndicatorScreenshot {
         SegmentedCircularProgressIndicator(
             segmentCount = 6,
             completed = { it % 2 == 0 },
@@ -151,12 +295,67 @@
         )
     }
 
-    private fun verifyScreenshot(content: @Composable () -> Unit) {
-        rule.setContentWithTheme {
+    @Test
+    fun segmented_progress_indicator_on_off_large_screen() {
+        verifyProgressIndicatorScreenshot(isLargeScreen = true) {
+            SegmentedCircularProgressIndicator(
+                segmentCount = 6,
+                completed = { it % 2 == 0 },
+                modifier = Modifier.aspectRatio(1f).testTag(TEST_TAG),
+                startAngle = 120f,
+                endAngle = 60f,
+            )
+        }
+    }
+
+    @Test
+    fun segmented_progress_indicator_on_off_disabled() = verifyProgressIndicatorScreenshot {
+        SegmentedCircularProgressIndicator(
+            segmentCount = 6,
+            completed = { it % 2 == 0 },
+            modifier = Modifier.aspectRatio(1f).testTag(TEST_TAG),
+            startAngle = 120f,
+            endAngle = 60f,
+            enabled = false,
+        )
+    }
+
+    @Test
+    fun segmented_progress_indicator_on_off_disabled_large_screen() {
+        verifyProgressIndicatorScreenshot(isLargeScreen = true) {
+            SegmentedCircularProgressIndicator(
+                segmentCount = 6,
+                completed = { it % 2 == 0 },
+                modifier = Modifier.aspectRatio(1f).testTag(TEST_TAG),
+                startAngle = 120f,
+                endAngle = 60f,
+                enabled = false,
+            )
+        }
+    }
+
+    private fun verifyProgressIndicatorScreenshot(
+        isLargeScreen: Boolean = false,
+        content: @Composable () -> Unit
+    ) {
+        val screenSizeDp = if (isLargeScreen) SCREEN_SIZE_LARGE else SCREEN_SIZE_SMALL
+
+        rule.setContentWithTheme(modifier = Modifier.background(Color.Black)) {
+            val originalConfiguration = LocalConfiguration.current
+            val fixedScreenSizeConfiguration =
+                remember(originalConfiguration) {
+                    Configuration(originalConfiguration).apply {
+                        screenWidthDp = screenSizeDp
+                        screenHeightDp = screenSizeDp
+                    }
+                }
+
             CompositionLocalProvider(
                 LocalLayoutDirection provides LayoutDirection.Ltr,
-                content = content
-            )
+                LocalConfiguration provides fixedScreenSizeConfiguration
+            ) {
+                Box(modifier = Modifier.size(screenSizeDp.dp).background(Color.Black)) { content() }
+            }
         }
 
         rule
diff --git a/wear/compose/compose-material3/src/androidTest/kotlin/androidx/wear/compose/material3/ProgressIndicatorTest.kt b/wear/compose/compose-material3/src/androidTest/kotlin/androidx/wear/compose/material3/ProgressIndicatorTest.kt
index a78804c..2165861 100644
--- a/wear/compose/compose-material3/src/androidTest/kotlin/androidx/wear/compose/material3/ProgressIndicatorTest.kt
+++ b/wear/compose/compose-material3/src/androidTest/kotlin/androidx/wear/compose/material3/ProgressIndicatorTest.kt
@@ -21,6 +21,7 @@
 import androidx.compose.foundation.layout.size
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.testutils.assertContainsColor
 import androidx.compose.testutils.assertDoesNotContainColor
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -86,11 +87,11 @@
             )
         }
         rule.waitForIdle()
-        // by default fully filled progress approximately takes 25% of the control.
+        // With default stroke width the filled progress approximately takes 16% of the control.
         rule
             .onNodeWithTag(TEST_TAG)
             .captureToImage()
-            .assertColorInPercentageRange(Color.Yellow, 23f..27f)
+            .assertColorInPercentageRange(Color.Yellow, 15f..18f)
         rule.onNodeWithTag(TEST_TAG).captureToImage().assertDoesNotContainColor(Color.Red)
     }
 
@@ -110,11 +111,11 @@
         }
         rule.waitForIdle()
         rule.onNodeWithTag(TEST_TAG).captureToImage().assertDoesNotContainColor(Color.Yellow)
-        // by default progress track approximately takes 25% of the control.
+        // With default stroke width the progress track approximately takes 16% of the control.
         rule
             .onNodeWithTag(TEST_TAG)
             .captureToImage()
-            .assertColorInPercentageRange(Color.Red, 23f..27f)
+            .assertColorInPercentageRange(Color.Red, 15f..18f)
     }
 
     @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
@@ -135,15 +136,15 @@
         }
         rule.waitForIdle()
         // Color should take approximately a quarter of the full screen color percentages,
-        // eg 25% / 4 ≈ 6%.
+        // eg 16% / 4 ≈ 4%.
         rule
             .onNodeWithTag(TEST_TAG)
             .captureToImage()
-            .assertColorInPercentageRange(Color.Yellow, 4f..8f)
+            .assertColorInPercentageRange(Color.Yellow, 3f..5f)
         rule
             .onNodeWithTag(TEST_TAG)
             .captureToImage()
-            .assertColorInPercentageRange(Color.Red, 4f..8f)
+            .assertColorInPercentageRange(Color.Red, 3f..5f)
     }
 
     @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
@@ -165,11 +166,11 @@
         rule
             .onNodeWithTag(TEST_TAG)
             .captureToImage()
-            .assertColorInPercentageRange(Color.Yellow, 0.5f..1f)
+            .assertColorInPercentageRange(Color.Yellow, 0.2f..0.5f)
         rule
             .onNodeWithTag(TEST_TAG)
             .captureToImage()
-            .assertColorInPercentageRange(Color.Red, 22f..27f)
+            .assertColorInPercentageRange(Color.Red, 15f..18f)
     }
 
     @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
@@ -179,7 +180,7 @@
             CircularProgressIndicator(
                 modifier = Modifier.testTag(TEST_TAG),
                 progress = { 0.5f },
-                strokeWidth = 4.dp,
+                strokeWidth = CircularProgressIndicatorDefaults.smallStrokeWidth,
                 colors =
                     ProgressIndicatorDefaults.colors(
                         indicatorColor = Color.Yellow,
@@ -191,11 +192,11 @@
         rule
             .onNodeWithTag(TEST_TAG)
             .captureToImage()
-            .assertColorInPercentageRange(Color.Yellow, 2f..6f)
+            .assertColorInPercentageRange(Color.Yellow, 5f..7f)
         rule
             .onNodeWithTag(TEST_TAG)
             .captureToImage()
-            .assertColorInPercentageRange(Color.Red, 2f..6f)
+            .assertColorInPercentageRange(Color.Red, 5f..7f)
     }
 
     @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
@@ -205,7 +206,7 @@
             CircularProgressIndicator(
                 modifier = Modifier.testTag(TEST_TAG),
                 progress = { 0.5f },
-                strokeWidth = 36.dp,
+                strokeWidth = CircularProgressIndicatorDefaults.largeStrokeWidth,
                 colors =
                     ProgressIndicatorDefaults.colors(
                         indicatorColor = Color.Yellow,
@@ -218,11 +219,36 @@
         rule
             .onNodeWithTag(TEST_TAG)
             .captureToImage()
-            .assertColorInPercentageRange(Color.Yellow, 20f..25f)
+            .assertColorInPercentageRange(Color.Yellow, 8f..10f)
         rule
             .onNodeWithTag(TEST_TAG)
             .captureToImage()
-            .assertColorInPercentageRange(Color.Red, 20f..25f)
+            .assertColorInPercentageRange(Color.Red, 8f..10f)
+    }
+
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
+    @Test
+    fun progress_disabled_contains_disabled_colors() {
+        setContentWithTheme {
+            CircularProgressIndicator(
+                modifier = Modifier.testTag(TEST_TAG),
+                progress = { 0.5f },
+                enabled = false,
+                colors =
+                    ProgressIndicatorDefaults.colors(
+                        indicatorColor = Color.Yellow,
+                        trackColor = Color.Red,
+                        disabledIndicatorColor = Color.Blue,
+                        disabledTrackColor = Color.Green,
+                    ),
+            )
+        }
+        rule.waitForIdle()
+
+        rule.onNodeWithTag(TEST_TAG).captureToImage().assertDoesNotContainColor(Color.Yellow)
+        rule.onNodeWithTag(TEST_TAG).captureToImage().assertDoesNotContainColor(Color.Red)
+        rule.onNodeWithTag(TEST_TAG).captureToImage().assertContainsColor(Color.Blue)
+        rule.onNodeWithTag(TEST_TAG).captureToImage().assertContainsColor(Color.Green)
     }
 
     private fun setContentWithTheme(composable: @Composable BoxScope.() -> Unit) {
diff --git a/wear/compose/compose-material3/src/androidTest/kotlin/androidx/wear/compose/material3/SegmentedCircularProgressIndicatorTest.kt b/wear/compose/compose-material3/src/androidTest/kotlin/androidx/wear/compose/material3/SegmentedCircularProgressIndicatorTest.kt
index 58e2c21..47d4a80 100644
--- a/wear/compose/compose-material3/src/androidTest/kotlin/androidx/wear/compose/material3/SegmentedCircularProgressIndicatorTest.kt
+++ b/wear/compose/compose-material3/src/androidTest/kotlin/androidx/wear/compose/material3/SegmentedCircularProgressIndicatorTest.kt
@@ -21,6 +21,7 @@
 import androidx.compose.foundation.layout.size
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.testutils.assertContainsColor
 import androidx.compose.testutils.assertDoesNotContainColor
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -91,11 +92,11 @@
             )
         }
         rule.waitForIdle()
-        // by default fully filled progress approximately takes 25% of the control.
+        // by default fully filled progress approximately takes 16% of the control.
         rule
             .onNodeWithTag(TEST_TAG)
             .captureToImage()
-            .assertColorInPercentageRange(Color.Yellow, 20f..25f)
+            .assertColorInPercentageRange(Color.Yellow, 15f..18f)
         rule.onNodeWithTag(TEST_TAG).captureToImage().assertDoesNotContainColor(Color.Red)
     }
 
@@ -119,7 +120,7 @@
         rule
             .onNodeWithTag(TEST_TAG)
             .captureToImage()
-            .assertColorInPercentageRange(Color.Red, 20f..25f)
+            .assertColorInPercentageRange(Color.Red, 15f..18f)
     }
 
     @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
@@ -141,15 +142,15 @@
         }
         rule.waitForIdle()
         // Color should take approximately a quarter of the full screen color percentages,
-        // eg 25% / 4 ≈ 6%.
+        // eg 16% / 4 ≈ 4%.
         rule
             .onNodeWithTag(TEST_TAG)
             .captureToImage()
-            .assertColorInPercentageRange(Color.Yellow, 4f..8f)
+            .assertColorInPercentageRange(Color.Yellow, 3f..5f)
         rule
             .onNodeWithTag(TEST_TAG)
             .captureToImage()
-            .assertColorInPercentageRange(Color.Red, 4f..8f)
+            .assertColorInPercentageRange(Color.Red, 3f..5f)
     }
 
     @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
@@ -160,7 +161,7 @@
                 progress = { 0.5f },
                 segmentCount = 5,
                 modifier = Modifier.testTag(TEST_TAG),
-                strokeWidth = 4.dp,
+                strokeWidth = CircularProgressIndicatorDefaults.smallStrokeWidth,
                 colors =
                     ProgressIndicatorDefaults.colors(
                         indicatorColor = Color.Yellow,
@@ -187,7 +188,7 @@
                 progress = { 0.5f },
                 segmentCount = 5,
                 modifier = Modifier.testTag(TEST_TAG),
-                strokeWidth = 36.dp,
+                strokeWidth = CircularProgressIndicatorDefaults.largeStrokeWidth,
                 colors =
                     ProgressIndicatorDefaults.colors(
                         indicatorColor = Color.Yellow,
@@ -200,11 +201,11 @@
         rule
             .onNodeWithTag(TEST_TAG)
             .captureToImage()
-            .assertColorInPercentageRange(Color.Yellow, 15f..20f)
+            .assertColorInPercentageRange(Color.Yellow, 7f..9f)
         rule
             .onNodeWithTag(TEST_TAG)
             .captureToImage()
-            .assertColorInPercentageRange(Color.Red, 15f..20f)
+            .assertColorInPercentageRange(Color.Red, 7f..9f)
     }
 
     @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
@@ -257,7 +258,7 @@
         rule
             .onNodeWithTag(TEST_TAG)
             .captureToImage()
-            .assertColorInPercentageRange(Color.Yellow, 20f..25f)
+            .assertColorInPercentageRange(Color.Yellow, 14f..16f)
     }
 
     @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
@@ -281,7 +282,34 @@
         rule
             .onNodeWithTag(TEST_TAG)
             .captureToImage()
-            .assertColorInPercentageRange(Color.Red, 20f..25f)
+            .assertColorInPercentageRange(Color.Red, 15f..18f)
+    }
+
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
+    @Test
+    fun progress_disabled_contains_only_disabled_colors() {
+        setContentWithTheme {
+            SegmentedCircularProgressIndicator(
+                progress = { 0.5f },
+                segmentCount = 5,
+                modifier = Modifier.testTag(TEST_TAG),
+                enabled = false,
+                colors =
+                    ProgressIndicatorDefaults.colors(
+                        indicatorColor = Color.Yellow,
+                        trackColor = Color.Red,
+                        disabledIndicatorColor = Color.Blue,
+                        disabledTrackColor = Color.Green,
+                    ),
+            )
+        }
+
+        rule.waitForIdle()
+
+        rule.onNodeWithTag(TEST_TAG).captureToImage().assertDoesNotContainColor(Color.Yellow)
+        rule.onNodeWithTag(TEST_TAG).captureToImage().assertDoesNotContainColor(Color.Red)
+        rule.onNodeWithTag(TEST_TAG).captureToImage().assertContainsColor(Color.Blue)
+        rule.onNodeWithTag(TEST_TAG).captureToImage().assertContainsColor(Color.Green)
     }
 
     private fun setContentWithTheme(composable: @Composable BoxScope.() -> Unit) {
diff --git a/wear/compose/compose-material3/src/main/java/androidx/wear/compose/material3/CircularProgressIndicator.kt b/wear/compose/compose-material3/src/main/java/androidx/wear/compose/material3/CircularProgressIndicator.kt
new file mode 100644
index 0000000..e35b8fb
--- /dev/null
+++ b/wear/compose/compose-material3/src/main/java/androidx/wear/compose/material3/CircularProgressIndicator.kt
@@ -0,0 +1,160 @@
+/*
+ * Copyright 2024 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.wear.compose.material3
+
+import androidx.compose.foundation.focusable
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawWithCache
+import androidx.compose.ui.graphics.StrokeCap
+import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.semantics.clearAndSetSemantics
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import androidx.wear.compose.materialcore.isSmallScreen
+import kotlin.math.asin
+import kotlin.math.max
+import kotlin.math.min
+
+/**
+ * Material Design circular progress indicator.
+ *
+ * Example of a full screen [CircularProgressIndicator]. Note that the padding
+ * [CircularProgressIndicatorDefaults.FullScreenPadding] should be applied:
+ *
+ * @sample androidx.wear.compose.material3.samples.FullScreenProgressIndicatorSample
+ *
+ * Example of progress showing overflow value (more than 1) by [CircularProgressIndicator]:
+ *
+ * @sample androidx.wear.compose.material3.samples.OverflowProgressIndicatorSample
+ *
+ * Example of progress indicator wrapping media control by [CircularProgressIndicator]:
+ *
+ * @sample androidx.wear.compose.material3.samples.MediaButtonProgressIndicatorSample
+ *
+ * Example of a [CircularProgressIndicator] with small progress values:
+ *
+ * @sample androidx.wear.compose.material3.samples.SmallValuesProgressIndicatorSample
+ *
+ * Progress indicators express the proportion of completion of an ongoing task.
+ *
+ * @param progress The progress of this progress indicator where 0.0 represents no progress and 1.0
+ *   represents completion. Values outside of this range are coerced into the range 0..1.
+ * @param modifier Modifier to be applied to the CircularProgressIndicator.
+ * @param startAngle The starting position of the progress arc, measured clockwise in degrees (0
+ *   to 360) from the 3 o'clock position. For example, 0 and 360 represent 3 o'clock, 90 and 180
+ *   represent 6 o'clock and 9 o'clock respectively. Default is 270 degrees
+ *   [CircularProgressIndicatorDefaults.StartAngle] (top of the screen).
+ * @param endAngle The ending position of the progress arc, measured clockwise in degrees (0 to 360)
+ *   from the 3 o'clock position. For example, 0 and 360 represent 3 o'clock, 90 and 180 represent 6
+ *   o'clock and 9 o'clock respectively. By default equal to [startAngle].
+ * @param colors [ProgressIndicatorColors] that will be used to resolve the indicator and track
+ *   color for this progress indicator in different states.
+ * @param strokeWidth The stroke width for the progress indicator. The recommended values are
+ *   [CircularProgressIndicatorDefaults.largeStrokeWidth] and
+ *   [CircularProgressIndicatorDefaults.smallStrokeWidth].
+ * @param gapSize The size (in Dp) of the gap between the ends of the progress indicator and the
+ *   track. The stroke endcaps are not included in this distance.
+ * @param enabled controls the enabled state. Although this component is not clickable, it can be
+ *   contained within a clickable component. When enabled is `false`, this component will appear
+ *   visually disabled.
+ */
+@Composable
+fun CircularProgressIndicator(
+    progress: () -> Float,
+    modifier: Modifier = Modifier,
+    startAngle: Float = CircularProgressIndicatorDefaults.StartAngle,
+    endAngle: Float = startAngle,
+    colors: ProgressIndicatorColors = ProgressIndicatorDefaults.colors(),
+    strokeWidth: Dp = CircularProgressIndicatorDefaults.largeStrokeWidth,
+    gapSize: Dp = CircularProgressIndicatorDefaults.calculateRecommendedGapSize(strokeWidth),
+    enabled: Boolean = true,
+) {
+    val coercedProgress = { progress().coerceIn(0f, 1f) }
+    // Canvas internally uses Spacer.drawBehind.
+    // Using Spacer.drawWithCache to optimize the stroke allocations.
+    Spacer(
+        modifier
+            .clearAndSetSemantics {}
+            .fillMaxSize()
+            .focusable()
+            .drawWithCache {
+                val fullSweep = 360f - ((startAngle - endAngle) % 360 + 360) % 360
+                var progressSweep = fullSweep * coercedProgress()
+                val stroke = Stroke(width = strokeWidth.toPx(), cap = StrokeCap.Round)
+                val minSize = min(size.height, size.width)
+                // Sweep angle between two progress indicator segments.
+                val gapSweep =
+                    asin((stroke.width + gapSize.toPx()) / (minSize - stroke.width)).toDegrees() *
+                        2f
+
+                if (progressSweep > 0) {
+                    progressSweep = max(progressSweep, gapSweep)
+                }
+
+                onDrawWithContent {
+                    // Draw an indicator.
+                    drawIndicatorSegment(
+                        startAngle = startAngle,
+                        sweep = progressSweep,
+                        gapSweep = gapSweep,
+                        brush = colors.indicatorBrush(enabled),
+                        stroke = stroke
+                    )
+
+                    // Draw a background.
+                    drawIndicatorSegment(
+                        startAngle = startAngle + progressSweep,
+                        sweep = fullSweep - progressSweep,
+                        gapSweep = gapSweep,
+                        brush = colors.trackBrush(enabled),
+                        stroke = stroke
+                    )
+                }
+            }
+    )
+}
+
+/** Contains default values for [CircularProgressIndicator]. */
+object CircularProgressIndicatorDefaults {
+    /** Large stroke width for circular progress indicator. */
+    val largeStrokeWidth: Dp
+        @Composable get() = if (isSmallScreen()) 8.dp else 12.dp
+
+    /** Small stroke width for circular progress indicator. */
+    val smallStrokeWidth: Dp
+        @Composable get() = if (isSmallScreen()) 5.dp else 8.dp
+
+    /**
+     * The default angle used for the start of the progress indicator arc.
+     *
+     * This can be customized with `startAngle` parameter on [CircularProgressIndicator].
+     */
+    val StartAngle = 270f
+
+    /**
+     * Returns recommended size of the gap based on `strokeWidth`.
+     *
+     * The absolute value can be customized with `gapSize` parameter on [CircularProgressIndicator].
+     */
+    fun calculateRecommendedGapSize(strokeWidth: Dp): Dp = strokeWidth / 3f
+
+    /** Padding used for displaying [CircularProgressIndicator] full screen. */
+    val FullScreenPadding = PaddingDefaults.edgePadding
+}
diff --git a/wear/compose/compose-material3/src/main/java/androidx/wear/compose/material3/Confirmation.kt b/wear/compose/compose-material3/src/main/java/androidx/wear/compose/material3/Confirmation.kt
index e88a30b..0a94d14 100644
--- a/wear/compose/compose-material3/src/main/java/androidx/wear/compose/material3/Confirmation.kt
+++ b/wear/compose/compose-material3/src/main/java/androidx/wear/compose/material3/Confirmation.kt
@@ -326,7 +326,8 @@
      */
     @OptIn(ExperimentalAnimationGraphicsApi::class)
     val SuccessIcon: @Composable BoxScope.() -> Unit = {
-        val animation = AnimatedImageVector.animatedVectorResource(R.drawable.check_animation)
+        val animation =
+            AnimatedImageVector.animatedVectorResource(R.drawable.wear_m3c_check_animation)
         var atEnd by remember { mutableStateOf(false) }
         LaunchedEffect(Unit) {
             delay(FailureIconDelay)
@@ -345,7 +346,8 @@
      */
     @OptIn(ExperimentalAnimationGraphicsApi::class)
     val FailureIcon: @Composable BoxScope.() -> Unit = {
-        val animation = AnimatedImageVector.animatedVectorResource(R.drawable.failure_animation)
+        val animation =
+            AnimatedImageVector.animatedVectorResource(R.drawable.wear_m3c_failure_animation)
         var atEnd by remember { mutableStateOf(false) }
         LaunchedEffect(Unit) {
             delay(FailureIconDelay)
diff --git a/wear/compose/compose-material3/src/main/java/androidx/wear/compose/material3/LinearProgressIndicator.kt b/wear/compose/compose-material3/src/main/java/androidx/wear/compose/material3/LinearProgressIndicator.kt
new file mode 100644
index 0000000..8a30e1a
--- /dev/null
+++ b/wear/compose/compose-material3/src/main/java/androidx/wear/compose/material3/LinearProgressIndicator.kt
@@ -0,0 +1,194 @@
+/*
+ * Copyright 2024 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.wear.compose.material3
+
+import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.scale
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.StrokeCap
+import androidx.compose.ui.graphics.drawscope.DrawScope
+import androidx.compose.ui.platform.LocalLayoutDirection
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.LayoutDirection
+import androidx.compose.ui.unit.dp
+
+/**
+ * Material Design linear progress indicator.
+ *
+ * The [LinearProgressIndicator] displays progress as a horizontal bar, consisting of two visual
+ * components:
+ * - Track: The background line representing the total range of progress.
+ * - Indicator: A colored line that fills the track, indicating the current progress value.
+ *
+ * The indicator also includes a small dot at the end of the progress line. This dot serves as an
+ * accessibility feature to show the range of the indicator.
+ *
+ * Small progress values that are larger than zero will be rounded up to at least the stroke width.
+ *
+ * [LinearProgressIndicator] sample:
+ *
+ * @sample androidx.wear.compose.material3.samples.LinearProgressIndicatorSample
+ * @param progress The progress of this progress indicator where 0.0 represents no progress and 1.0
+ *   represents completion. Values outside of this range are coerced into the range 0..1.
+ * @param modifier Modifier to be applied to the [LinearProgressIndicator].
+ * @param colors [ProgressIndicatorColors] that will be used to resolve the indicator and track
+ *   colors for this progress indicator in different states.
+ * @param strokeWidth The stroke width for the progress indicator. The minimum value is
+ *   [LinearProgressIndicatorDefaults.StrokeWidthSmall] to ensure that the dot drawn at the end of
+ *   the range can be distinguished.
+ * @param enabled controls the enabled state. Although this component is not clickable, it can be
+ *   contained within a clickable component. When enabled is `false`, this component will appear
+ *   visually disabled.
+ */
+@Composable
+fun LinearProgressIndicator(
+    progress: () -> Float,
+    modifier: Modifier = Modifier,
+    colors: ProgressIndicatorColors = ProgressIndicatorDefaults.colors(),
+    strokeWidth: Dp = LinearProgressIndicatorDefaults.StrokeWidthLarge,
+    enabled: Boolean = true,
+) {
+    require(strokeWidth >= LinearProgressIndicatorDefaults.StrokeWidthSmall) {
+        "Stroke width cannot be less than ${LinearProgressIndicatorDefaults.StrokeWidthSmall}"
+    }
+
+    val coercedProgress = { progress().coerceIn(0f, 1f) }
+    val isRtl = LocalLayoutDirection.current == LayoutDirection.Rtl
+
+    Canvas(
+        modifier =
+            modifier
+                .fillMaxWidth()
+                .height(strokeWidth)
+                .padding(LinearProgressIndicatorDefaults.OuterHorizontalMargin)
+                .scale(scaleX = if (isRtl) -1f else 1f, scaleY = 1f), // Flip X axis for RTL layouts
+    ) {
+        val progressPx = coercedProgress() * size.width
+
+        // Draw the background
+        drawLinearIndicator(
+            start = 0f,
+            end = size.width,
+            brush = colors.trackBrush(enabled),
+            strokeWidth = strokeWidth.toPx()
+        )
+
+        if (progressPx > 0) {
+            // Draw the indicator
+            drawLinearIndicator(
+                start = 0f,
+                end = progressPx,
+                brush = colors.indicatorBrush(enabled),
+                strokeWidth = strokeWidth.toPx(),
+            )
+        }
+
+        // Draw the dot at the end of the line. The dot will be hidden when progress plus margin
+        // would touch the dot
+        val dotRadius = LinearProgressIndicatorDefaults.DotRadius.toPx()
+        val dotMargin = LinearProgressIndicatorDefaults.DotMargin.toPx()
+
+        if (progressPx + dotMargin * 2 + dotRadius * 2 < size.width) {
+            drawLinearIndicatorDot(
+                brush = colors.indicatorBrush(enabled),
+                radius = dotRadius,
+                offset = dotMargin
+            )
+        }
+    }
+}
+
+/** Contains defaults for Linear Progress Indicator. */
+object LinearProgressIndicatorDefaults {
+
+    /**
+     * Large stroke width for [LinearProgressIndicator].
+     *
+     * This is also the default stroke width for [LinearProgressIndicator].
+     */
+    val StrokeWidthLarge = 12.dp
+
+    /**
+     * Small stroke width for [LinearProgressIndicator].
+     *
+     * This is the minimum stroke value allowed for [LinearProgressIndicator] to ensure that the dot
+     * shown at the end of the range can be distinguished.
+     */
+    val StrokeWidthSmall = 8.dp
+
+    /** Radius for the dot shown at the end of the [LinearProgressIndicator]. */
+    internal val DotRadius = 2.dp
+
+    /** Margin for the dot shown at the end of the [LinearProgressIndicator]. */
+    internal val DotMargin = 4.dp
+
+    /** Horizontal padding for the [LinearProgressIndicator]. */
+    internal val OuterHorizontalMargin = 2.dp
+}
+
+/** Draws a line for the linear indicator segment. */
+private fun DrawScope.drawLinearIndicator(
+    start: Float,
+    end: Float,
+    brush: Brush,
+    strokeWidth: Float,
+) {
+    // Start drawing from the vertical center of the stroke
+    val yOffset = size.height / 2
+
+    // need to adjust barStart and barEnd for the stroke caps
+    val strokeCapOffset = strokeWidth / 2
+    val adjustedBarStart = start + strokeCapOffset
+    val adjustedBarEnd = end - strokeCapOffset
+
+    if (adjustedBarEnd > adjustedBarStart) {
+        // Draw progress line
+        drawLine(
+            brush = brush,
+            start = Offset(adjustedBarStart, yOffset),
+            end = Offset(adjustedBarEnd, yOffset),
+            strokeWidth = strokeWidth,
+            cap = StrokeCap.Round,
+        )
+    } else {
+        // For small values, draw a circle with diameter equal of stroke width
+        drawCircle(
+            brush = brush,
+            radius = strokeCapOffset,
+            center = Offset(strokeCapOffset, size.height / 2)
+        )
+    }
+}
+
+/** Draws a small dot at the end of the linear progress indicator. */
+private fun DrawScope.drawLinearIndicatorDot(
+    brush: Brush,
+    radius: Float,
+    offset: Float,
+) {
+    drawCircle(
+        brush = brush,
+        radius = radius,
+        center = Offset(size.width - offset - radius, size.height / 2)
+    )
+}
diff --git a/wear/compose/compose-material3/src/main/java/androidx/wear/compose/material3/OpenOnPhoneDialog.kt b/wear/compose/compose-material3/src/main/java/androidx/wear/compose/material3/OpenOnPhoneDialog.kt
index c7944ef..fa819c7 100644
--- a/wear/compose/compose-material3/src/main/java/androidx/wear/compose/material3/OpenOnPhoneDialog.kt
+++ b/wear/compose/compose-material3/src/main/java/androidx/wear/compose/material3/OpenOnPhoneDialog.kt
@@ -165,7 +165,7 @@
     @OptIn(ExperimentalAnimationGraphicsApi::class)
     val Icon: @Composable BoxScope.() -> Unit = {
         val animation =
-            AnimatedImageVector.animatedVectorResource(R.drawable.open_on_phone_animation)
+            AnimatedImageVector.animatedVectorResource(R.drawable.wear_m3c_open_on_phone_animation)
         var atEnd by remember { mutableStateOf(false) }
         LaunchedEffect(Unit) {
             delay(IconDelay)
diff --git a/wear/compose/compose-material3/src/main/java/androidx/wear/compose/material3/ProgressIndicator.kt b/wear/compose/compose-material3/src/main/java/androidx/wear/compose/material3/ProgressIndicator.kt
index 7290311..e920b35 100644
--- a/wear/compose/compose-material3/src/main/java/androidx/wear/compose/material3/ProgressIndicator.kt
+++ b/wear/compose/compose-material3/src/main/java/androidx/wear/compose/material3/ProgressIndicator.kt
@@ -16,191 +16,70 @@
 
 package androidx.wear.compose.material3
 
-import androidx.compose.foundation.focusable
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.drawWithCache
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.SolidColor
-import androidx.compose.ui.graphics.StrokeCap
 import androidx.compose.ui.graphics.drawscope.DrawScope
 import androidx.compose.ui.graphics.drawscope.Stroke
 import androidx.compose.ui.graphics.isSpecified
-import androidx.compose.ui.semantics.clearAndSetSemantics
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
 import androidx.wear.compose.material3.tokens.ColorSchemeKeyTokens
 import androidx.wear.compose.materialcore.toRadians
-import kotlin.math.asin
 import kotlin.math.cos
-import kotlin.math.max
 import kotlin.math.min
 import kotlin.math.sin
 
-/**
- * Material Design circular progress indicator.
- *
- * Example of a full screen [CircularProgressIndicator]. Note that the padding
- * [ProgressIndicatorDefaults.FullScreenPadding] should be applied:
- *
- * @sample androidx.wear.compose.material3.samples.FullScreenProgressIndicatorSample
- *
- * Example of progress showing overflow value (more than 1) by [CircularProgressIndicator]:
- *
- * @sample androidx.wear.compose.material3.samples.OverflowProgressIndicatorSample
- *
- * Example of progress indicator wrapping media control by [CircularProgressIndicator]:
- *
- * @sample androidx.wear.compose.material3.samples.MediaButtonProgressIndicatorSample
- *
- * Example of a [CircularProgressIndicator] with small progress values:
- *
- * @sample androidx.wear.compose.material3.samples.SmallValuesProgressIndicatorSample
- *
- * Progress indicators express the proportion of completion of an ongoing task.
- *
- * @param progress The progress of this progress indicator where 0.0 represents no progress and 1.0
- *   represents completion. Values outside of this range are coerced into the range 0..1.
- * @param modifier Modifier to be applied to the CircularProgressIndicator.
- * @param startAngle The starting position of the progress arc, measured clockwise in degrees (0
- *   to 360) from the 3 o'clock position. For example, 0 and 360 represent 3 o'clock, 90 and 180
- *   represent 6 o'clock and 9 o'clock respectively. Default is 270 degrees
- *   [ProgressIndicatorDefaults.StartAngle] (top of the screen).
- * @param endAngle The ending position of the progress arc, measured clockwise in degrees (0 to 360)
- *   from the 3 o'clock position. For example, 0 and 360 represent 3 o'clock, 90 and 180 represent 6
- *   o'clock and 9 o'clock respectively. By default equal to [startAngle].
- * @param colors [ProgressIndicatorColors] that will be used to resolve the indicator and track
- *   color for this progress indicator in different states.
- * @param strokeWidth The stroke width for the progress indicator.
- * @param gapSize The space left between the ends of the progress indicator and the track (in Dp).
- */
-@Composable
-fun CircularProgressIndicator(
-    progress: () -> Float,
-    modifier: Modifier = Modifier,
-    startAngle: Float = ProgressIndicatorDefaults.StartAngle,
-    endAngle: Float = startAngle,
-    colors: ProgressIndicatorColors = ProgressIndicatorDefaults.colors(),
-    strokeWidth: Dp = ProgressIndicatorDefaults.StrokeWidth,
-    gapSize: Dp = ProgressIndicatorDefaults.gapSize(strokeWidth),
-) {
-    val coercedProgress = { progress().coerceIn(0f, 1f) }
-    // Canvas internally uses Spacer.drawBehind.
-    // Using Spacer.drawWithCache to optimize the stroke allocations.
-    Spacer(
-        modifier
-            .clearAndSetSemantics {}
-            .fillMaxSize()
-            .focusable()
-            .drawWithCache {
-                val fullSweep = 360f - ((startAngle - endAngle) % 360 + 360) % 360
-                var progressSweep = fullSweep * coercedProgress()
-                val stroke = Stroke(width = strokeWidth.toPx(), cap = StrokeCap.Round)
-                val minSize = min(size.height, size.width)
-                // Sweep angle between two progress indicator segments.
-                val gapSweep =
-                    asin((stroke.width + gapSize.toPx()) / (minSize - stroke.width)).toDegrees() *
-                        2f
-
-                if (progressSweep > 0) {
-                    progressSweep = max(progressSweep, gapSweep)
-                }
-
-                onDrawWithContent {
-                    // Draw an indicator.
-                    drawIndicatorSegment(
-                        startAngle = startAngle,
-                        sweep = progressSweep,
-                        gapSweep = gapSweep,
-                        brush = colors.indicatorBrush,
-                        stroke = stroke
-                    )
-
-                    // Draw a background.
-                    drawIndicatorSegment(
-                        startAngle = startAngle + progressSweep,
-                        sweep = fullSweep - progressSweep,
-                        gapSweep = gapSweep,
-                        brush = colors.trackBrush,
-                        stroke = stroke
-                    )
-                }
-            }
-    )
-}
-
 /** Contains defaults for Progress Indicators. */
 object ProgressIndicatorDefaults {
-    /**
-     * The default stroke width for a circular progress indicator. For example, you can apply this
-     * value when drawn around an [IconButton] with size [IconButtonDefaults.DefaultButtonSize].
-     *
-     * This can be customized with `strokeWidth` parameter on [CircularProgressIndicator].
-     */
-    val ButtonCircularIndicatorStrokeWidth = 6.dp
-
-    /**
-     * The recommended stroke width when used for default and large size circular progress
-     * indicators.
-     *
-     * This can be customized with `strokeWidth` parameter on [CircularProgressIndicator].
-     */
-    val StrokeWidth = 18.dp
-
-    /**
-     * The default angle used for the start of the progress indicator arc.
-     *
-     * This can be customized with `startAngle` parameter on [CircularProgressIndicator].
-     */
-    val StartAngle = 270f
-
-    /**
-     * Returns recommended size of the gap based on `strokeWidth`.
-     *
-     * The absolute value can be customized with `gapSize` parameter on [CircularProgressIndicator].
-     */
-    fun gapSize(strokeWidth: Dp): Dp = strokeWidth / 3f
-
-    /** Padding used for displaying [CircularProgressIndicator] full screen. */
-    val FullScreenPadding = 2.dp
-
-    /**
-     * Creates a [ProgressIndicatorColors] that represents the default arc colors used in a
-     * [CircularProgressIndicator].
-     */
+    /** Creates a [ProgressIndicatorColors] with the default colors. */
     @Composable fun colors() = MaterialTheme.colorScheme.defaultProgressIndicatorColors
 
     /**
-     * Creates a [ProgressIndicatorColors] with modified colors used in a
-     * [CircularProgressIndicator].
+     * Creates a [ProgressIndicatorColors] with modified colors used in [CircularProgressIndicator]
+     * and [LinearProgressIndicator].
      *
-     * @param indicatorColor The indicator arc color.
-     * @param trackColor The track arc color.
+     * @param indicatorColor The indicator color.
+     * @param trackColor The track color.
+     * @param disabledIndicatorColor The disabled indicator color.
+     * @param disabledTrackColor The disabled track color.
      */
     @Composable
-    fun colors(indicatorColor: Color = Color.Unspecified, trackColor: Color = Color.Unspecified) =
+    fun colors(
+        indicatorColor: Color = Color.Unspecified,
+        trackColor: Color = Color.Unspecified,
+        disabledIndicatorColor: Color = Color.Unspecified,
+        disabledTrackColor: Color = Color.Unspecified,
+    ) =
         MaterialTheme.colorScheme.defaultProgressIndicatorColors.copy(
             indicatorColor = indicatorColor,
-            trackColor = trackColor
+            trackColor = trackColor,
+            disabledIndicatorColor = disabledIndicatorColor,
+            disabledTrackColor = disabledTrackColor,
         )
 
     /**
-     * Creates a [ProgressIndicatorColors] with modified brushes used to draw arcs in a
-     * [CircularProgressIndicator].
+     * Creates a [ProgressIndicatorColors] with modified brushes used in [CircularProgressIndicator]
+     * and [LinearProgressIndicator].
      *
-     * @param indicatorBrush The brush used to draw indicator arc.
-     * @param trackBrush The brush used to draw track arc.
+     * @param indicatorBrush [Brush] used to draw indicator.
+     * @param trackBrush [Brush] used to draw track.
+     * @param disabledIndicatorBrush [Brush] used to draw the indicator if the progress is disabled.
+     * @param disabledTrackBrush [Brush] used to draw the track if the progress is disabled.
      */
     @Composable
-    fun colors(indicatorBrush: Brush? = null, trackBrush: Brush? = null) =
+    fun colors(
+        indicatorBrush: Brush? = null,
+        trackBrush: Brush? = null,
+        disabledIndicatorBrush: Brush? = null,
+        disabledTrackBrush: Brush? = null,
+    ) =
         MaterialTheme.colorScheme.defaultProgressIndicatorColors.copy(
             indicatorBrush = indicatorBrush,
-            trackBrush = trackBrush
+            trackBrush = trackBrush,
+            disabledIndicatorBrush = disabledIndicatorBrush,
+            disabledTrackBrush = disabledTrackBrush,
         )
 
     private val ColorScheme.defaultProgressIndicatorColors: ProgressIndicatorColors
@@ -209,6 +88,16 @@
                 ?: ProgressIndicatorColors(
                         indicatorBrush = SolidColor(fromToken(ColorSchemeKeyTokens.Primary)),
                         trackBrush = SolidColor(fromToken(ColorSchemeKeyTokens.SurfaceContainer)),
+                        disabledIndicatorBrush =
+                            SolidColor(
+                                fromToken(ColorSchemeKeyTokens.OnSurface)
+                                    .toDisabledColor(disabledAlpha = DisabledContentAlpha)
+                            ),
+                        disabledTrackBrush =
+                            SolidColor(
+                                fromToken(ColorSchemeKeyTokens.OnSurface)
+                                    .toDisabledColor(disabledAlpha = DisabledContainerAlpha)
+                            ),
                     )
                     .also { defaultProgressIndicatorColorsCached = it }
         }
@@ -217,35 +106,74 @@
 /**
  * Represents the indicator and track colors used in progress indicator.
  *
- * @param indicatorBrush [Brush] used to draw the indicator arc of progress indicator.
- * @param trackBrush [Brush] used to draw the track arc of progress indicator.
+ * @param indicatorBrush [Brush] used to draw the indicator of progress indicator.
+ * @param trackBrush [Brush] used to draw the track of progress indicator.
+ * @param disabledIndicatorBrush [Brush] used to draw the indicator if the component is disabled.
+ * @param disabledTrackBrush [Brush] used to draw the track if the component is disabled.
  */
-class ProgressIndicatorColors(val indicatorBrush: Brush, val trackBrush: Brush) {
+class ProgressIndicatorColors(
+    val indicatorBrush: Brush,
+    val trackBrush: Brush,
+    val disabledIndicatorBrush: Brush = indicatorBrush,
+    val disabledTrackBrush: Brush = disabledIndicatorBrush,
+) {
     internal fun copy(
         indicatorColor: Color = Color.Unspecified,
         trackColor: Color = Color.Unspecified,
+        disabledIndicatorColor: Color = Color.Unspecified,
+        disabledTrackColor: Color = Color.Unspecified,
     ) =
         ProgressIndicatorColors(
             indicatorBrush =
                 if (indicatorColor.isSpecified) SolidColor(indicatorColor) else indicatorBrush,
-            trackBrush = if (trackColor.isSpecified) SolidColor(trackColor) else trackBrush
+            trackBrush = if (trackColor.isSpecified) SolidColor(trackColor) else trackBrush,
+            disabledIndicatorBrush =
+                if (disabledIndicatorColor.isSpecified) SolidColor(disabledIndicatorColor)
+                else disabledIndicatorBrush,
+            disabledTrackBrush =
+                if (disabledTrackColor.isSpecified) SolidColor(disabledTrackColor)
+                else disabledTrackBrush,
         )
 
     internal fun copy(
         indicatorBrush: Brush? = null,
         trackBrush: Brush? = null,
+        disabledIndicatorBrush: Brush? = null,
+        disabledTrackBrush: Brush? = null,
     ) =
         ProgressIndicatorColors(
             indicatorBrush = indicatorBrush ?: this.indicatorBrush,
-            trackBrush = trackBrush ?: this.trackBrush
+            trackBrush = trackBrush ?: this.trackBrush,
+            disabledIndicatorBrush = disabledIndicatorBrush ?: this.disabledIndicatorBrush,
+            disabledTrackBrush = disabledTrackBrush ?: this.disabledTrackBrush,
         )
 
+    /**
+     * Represents the indicator color, depending on [enabled].
+     *
+     * @param enabled whether the component is enabled.
+     */
+    internal fun indicatorBrush(enabled: Boolean): Brush {
+        return if (enabled) indicatorBrush else disabledIndicatorBrush
+    }
+
+    /**
+     * Represents the track color, depending on [enabled].
+     *
+     * @param enabled whether the component is enabled.
+     */
+    internal fun trackBrush(enabled: Boolean): Brush {
+        return if (enabled) trackBrush else disabledTrackBrush
+    }
+
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
         if (other == null || other !is ProgressIndicatorColors) return false
 
         if (indicatorBrush != other.indicatorBrush) return false
         if (trackBrush != other.trackBrush) return false
+        if (disabledIndicatorBrush != other.disabledIndicatorBrush) return false
+        if (disabledTrackBrush != other.disabledTrackBrush) return false
 
         return true
     }
@@ -253,6 +181,8 @@
     override fun hashCode(): Int {
         var result = indicatorBrush.hashCode()
         result = 31 * result + trackBrush.hashCode()
+        result = 31 * result + disabledIndicatorBrush.hashCode()
+        result = 31 * result + disabledTrackBrush.hashCode()
         return result
     }
 }
diff --git a/wear/compose/compose-material3/src/main/java/androidx/wear/compose/material3/SegmentedCircularProgressIndicator.kt b/wear/compose/compose-material3/src/main/java/androidx/wear/compose/material3/SegmentedCircularProgressIndicator.kt
index edd8780..3057a0b 100644
--- a/wear/compose/compose-material3/src/main/java/androidx/wear/compose/material3/SegmentedCircularProgressIndicator.kt
+++ b/wear/compose/compose-material3/src/main/java/androidx/wear/compose/material3/SegmentedCircularProgressIndicator.kt
@@ -47,7 +47,7 @@
  * @param startAngle The starting position of the progress arc, measured clockwise in degrees (0
  *   to 360) from the 3 o'clock position. For example, 0 and 360 represent 3 o'clock, 90 and 180
  *   represent 6 o'clock and 9 o'clock respectively. Default is 270 degrees
- *   [ProgressIndicatorDefaults.StartAngle] (top of the screen).
+ *   [CircularProgressIndicatorDefaults.StartAngle] (top of the screen).
  * @param endAngle The ending position of the progress arc, measured clockwise in degrees (0 to 360)
  *   from the 3 o'clock position. For example, 0 and 360 represent 3 o'clock, 90 and 180 represent 6
  *   o'clock and 9 o'clock respectively. By default equal to [startAngle].
@@ -55,17 +55,21 @@
  *   color for this progress indicator in different states.
  * @param strokeWidth The stroke width for the progress indicator.
  * @param gapSize The size of the gap between segments (in Dp).
+ * @param enabled controls the enabled state. Although this component is not clickable, it can be
+ *   contained within a clickable component. When enabled is `false`, this component will appear
+ *   visually disabled.
  */
 @Composable
 fun SegmentedCircularProgressIndicator(
     @IntRange(from = 1) segmentCount: Int,
     progress: () -> Float,
     modifier: Modifier = Modifier,
-    startAngle: Float = ProgressIndicatorDefaults.StartAngle,
+    startAngle: Float = CircularProgressIndicatorDefaults.StartAngle,
     endAngle: Float = startAngle,
     colors: ProgressIndicatorColors = ProgressIndicatorDefaults.colors(),
-    strokeWidth: Dp = ProgressIndicatorDefaults.StrokeWidth,
-    gapSize: Dp = ProgressIndicatorDefaults.gapSize(strokeWidth),
+    strokeWidth: Dp = CircularProgressIndicatorDefaults.largeStrokeWidth,
+    gapSize: Dp = CircularProgressIndicatorDefaults.calculateRecommendedGapSize(strokeWidth),
+    enabled: Boolean = true,
 ) =
     SegmentedCircularProgressIndicatorImpl(
         segmentParams = SegmentParams.Progress(progress),
@@ -76,6 +80,7 @@
         colors = colors,
         strokeWidth = strokeWidth,
         gapSize = gapSize,
+        enabled = enabled,
     )
 
 /**
@@ -96,7 +101,7 @@
  * @param startAngle The starting position of the progress arc, measured clockwise in degrees (0
  *   to 360) from the 3 o'clock position. For example, 0 and 360 represent 3 o'clock, 90 and 180
  *   represent 6 o'clock and 9 o'clock respectively. Default is 270 degrees
- *   [ProgressIndicatorDefaults.StartAngle] (top of the screen).
+ *   [CircularProgressIndicatorDefaults.StartAngle] (top of the screen).
  * @param endAngle The ending position of the progress arc, measured clockwise in degrees (0 to 360)
  *   from the 3 o'clock position. For example, 0 and 360 represent 3 o'clock, 90 and 180 represent 6
  *   o'clock and 9 o'clock respectively. By default equal to [startAngle].
@@ -104,17 +109,21 @@
  *   color for this progress indicator in different states.
  * @param strokeWidth The stroke width for the progress indicator.
  * @param gapSize The size of the gap between segments (in Dp).
+ * @param enabled controls the enabled state. Although this component is not clickable, it can be
+ *   contained within a clickable component. When enabled is `false`, this component will appear
+ *   visually disabled.
  */
 @Composable
 fun SegmentedCircularProgressIndicator(
     @IntRange(from = 1) segmentCount: Int,
     completed: (segmentIndex: Int) -> Boolean,
     modifier: Modifier = Modifier,
-    startAngle: Float = ProgressIndicatorDefaults.StartAngle,
+    startAngle: Float = CircularProgressIndicatorDefaults.StartAngle,
     endAngle: Float = startAngle,
     colors: ProgressIndicatorColors = ProgressIndicatorDefaults.colors(),
-    strokeWidth: Dp = ProgressIndicatorDefaults.StrokeWidth,
-    gapSize: Dp = ProgressIndicatorDefaults.gapSize(strokeWidth),
+    strokeWidth: Dp = CircularProgressIndicatorDefaults.largeStrokeWidth,
+    gapSize: Dp = CircularProgressIndicatorDefaults.calculateRecommendedGapSize(strokeWidth),
+    enabled: Boolean = true,
 ) =
     SegmentedCircularProgressIndicatorImpl(
         segmentParams = SegmentParams.Completed(completed),
@@ -125,6 +134,7 @@
         colors = colors,
         strokeWidth = strokeWidth,
         gapSize = gapSize,
+        enabled = enabled,
     )
 
 @Composable
@@ -137,6 +147,7 @@
     colors: ProgressIndicatorColors,
     strokeWidth: Dp,
     gapSize: Dp,
+    enabled: Boolean,
 ) {
     Spacer(
         modifier
@@ -163,8 +174,9 @@
                         when (segmentParams) {
                             is SegmentParams.Completed -> {
                                 val color =
-                                    if (segmentParams.completed(segment)) colors.indicatorBrush
-                                    else colors.trackBrush
+                                    if (segmentParams.completed(segment))
+                                        colors.indicatorBrush(enabled)
+                                    else colors.trackBrush(enabled)
 
                                 drawIndicatorSegment(
                                     startAngle = segmentStartAngle,
@@ -183,7 +195,7 @@
                                         startAngle = segmentStartAngle,
                                         sweep = segmentSweepAngle,
                                         gapSweep = 0f, // Overlay, no gap
-                                        brush = colors.trackBrush,
+                                        brush = colors.trackBrush(enabled),
                                         stroke = stroke
                                     )
                                 }
@@ -196,7 +208,7 @@
                                         startAngle = segmentStartAngle,
                                         sweep = progressSweepAngle,
                                         gapSweep = 0f, // Overlay, no gap
-                                        brush = colors.indicatorBrush,
+                                        brush = colors.indicatorBrush(enabled),
                                         stroke = stroke
                                     )
                                 }
diff --git a/wear/compose/compose-material3/src/main/res/drawable/check_animation.xml b/wear/compose/compose-material3/src/main/res/drawable/wear_m3c_check_animation.xml
similarity index 100%
rename from wear/compose/compose-material3/src/main/res/drawable/check_animation.xml
rename to wear/compose/compose-material3/src/main/res/drawable/wear_m3c_check_animation.xml
diff --git a/wear/compose/compose-material3/src/main/res/drawable/failure_animation.xml b/wear/compose/compose-material3/src/main/res/drawable/wear_m3c_failure_animation.xml
similarity index 100%
rename from wear/compose/compose-material3/src/main/res/drawable/failure_animation.xml
rename to wear/compose/compose-material3/src/main/res/drawable/wear_m3c_failure_animation.xml
diff --git a/wear/compose/compose-material3/src/main/res/drawable/open_on_phone_animation.xml b/wear/compose/compose-material3/src/main/res/drawable/wear_m3c_open_on_phone_animation.xml
similarity index 100%
rename from wear/compose/compose-material3/src/main/res/drawable/open_on_phone_animation.xml
rename to wear/compose/compose-material3/src/main/res/drawable/wear_m3c_open_on_phone_animation.xml
diff --git a/wear/compose/integration-tests/navigation/build.gradle b/wear/compose/integration-tests/navigation/build.gradle
index b29b94ada..9f6379f 100644
--- a/wear/compose/integration-tests/navigation/build.gradle
+++ b/wear/compose/integration-tests/navigation/build.gradle
@@ -55,6 +55,6 @@
     implementation(project(':wear:compose:compose-navigation'))
 
     // Align dependencies in debugRuntimeClasspath and debugAndroidTestRuntimeClasspath.
-    androidTestImplementation("androidx.lifecycle:lifecycle-common:2.8.3")
+    androidTestImplementation(project(":lifecycle:lifecycle-common"))
     androidTestImplementation(project(":annotation:annotation"))
 }
diff --git a/window/window-core/api/current.txt b/window/window-core/api/current.txt
index 2c8a4d2..8b80f00 100644
--- a/window/window-core/api/current.txt
+++ b/window/window-core/api/current.txt
@@ -32,9 +32,9 @@
     method public int getMinWidthDp();
     method @Deprecated public androidx.window.core.layout.WindowHeightSizeClass getWindowHeightSizeClass();
     method @Deprecated public androidx.window.core.layout.WindowWidthSizeClass getWindowWidthSizeClass();
-    method public boolean isAtLeast(int widthDp, int heightDp);
-    method public boolean isHeightAtLeast(int heightDp);
-    method public boolean isWidthAtLeast(int widthDp);
+    method public boolean isAtLeastBreakpoint(int widthBreakpointDp, int heightBreakpointDp);
+    method public boolean isHeightAtLeastBreakpoint(int heightBreakpointDp);
+    method public boolean isWidthAtLeastBreakpoint(int widthBreakpointDp);
     property public final int minHeightDp;
     property public final int minWidthDp;
     property @Deprecated public final androidx.window.core.layout.WindowHeightSizeClass windowHeightSizeClass;
diff --git a/window/window-core/api/restricted_current.txt b/window/window-core/api/restricted_current.txt
index 2c8a4d2..8b80f00 100644
--- a/window/window-core/api/restricted_current.txt
+++ b/window/window-core/api/restricted_current.txt
@@ -32,9 +32,9 @@
     method public int getMinWidthDp();
     method @Deprecated public androidx.window.core.layout.WindowHeightSizeClass getWindowHeightSizeClass();
     method @Deprecated public androidx.window.core.layout.WindowWidthSizeClass getWindowWidthSizeClass();
-    method public boolean isAtLeast(int widthDp, int heightDp);
-    method public boolean isHeightAtLeast(int heightDp);
-    method public boolean isWidthAtLeast(int widthDp);
+    method public boolean isAtLeastBreakpoint(int widthBreakpointDp, int heightBreakpointDp);
+    method public boolean isHeightAtLeastBreakpoint(int heightBreakpointDp);
+    method public boolean isWidthAtLeastBreakpoint(int widthBreakpointDp);
     property public final int minHeightDp;
     property public final int minWidthDp;
     property @Deprecated public final androidx.window.core.layout.WindowHeightSizeClass windowHeightSizeClass;
diff --git a/window/window-core/src/commonMain/kotlin/androidx/window/core/layout/WindowSizeClass.kt b/window/window-core/src/commonMain/kotlin/androidx/window/core/layout/WindowSizeClass.kt
index 43bef20..847ea73 100644
--- a/window/window-core/src/commonMain/kotlin/androidx/window/core/layout/WindowSizeClass.kt
+++ b/window/window-core/src/commonMain/kotlin/androidx/window/core/layout/WindowSizeClass.kt
@@ -80,25 +80,28 @@
         get() = WindowHeightSizeClass.compute(minHeightDp.toFloat())
 
     /**
-     * Returns `true` when [widthDp] is greater than or equal to [minWidthDp], `false` otherwise.
+     * Returns `true` when [minWidthDp] is greater than or equal to [widthBreakpointDp], `false`
+     * otherwise.
      */
-    fun isWidthAtLeast(widthDp: Int): Boolean {
-        return widthDp >= minWidthDp
+    fun isWidthAtLeastBreakpoint(widthBreakpointDp: Int): Boolean {
+        return minWidthDp >= widthBreakpointDp
     }
 
     /**
-     * Returns `true` when [heightDp] is greater than or equal to [minHeightDp], `false` otherwise.
+     * Returns `true` when [minHeightDp] is greater than or equal to [heightBreakpointDp], `false`
+     * otherwise.
      */
-    fun isHeightAtLeast(heightDp: Int): Boolean {
-        return heightDp >= minHeightDp
+    fun isHeightAtLeastBreakpoint(heightBreakpointDp: Int): Boolean {
+        return minHeightDp >= heightBreakpointDp
     }
 
     /**
-     * Returns `true` when [widthDp] is greater than or equal to [minWidthDp] and [heightDp] is
-     * greater than or equal to [minHeightDp], `false` otherwise.
+     * Returns `true` when [widthBreakpointDp] is greater than or equal to [minWidthDp] and
+     * [heightBreakpointDp] is greater than or equal to [minHeightDp], `false` otherwise.
      */
-    fun isAtLeast(widthDp: Int, heightDp: Int): Boolean {
-        return isWidthAtLeast(widthDp) && isHeightAtLeast(heightDp)
+    fun isAtLeastBreakpoint(widthBreakpointDp: Int, heightBreakpointDp: Int): Boolean {
+        return isWidthAtLeastBreakpoint(widthBreakpointDp) &&
+            isHeightAtLeastBreakpoint(heightBreakpointDp)
     }
 
     override fun equals(other: Any?): Boolean {
diff --git a/window/window-core/src/commonTest/kotlin/androidx/window/core/layout/WindowSizeClassTest.kt b/window/window-core/src/commonTest/kotlin/androidx/window/core/layout/WindowSizeClassTest.kt
index 816e40c..e9a0aba 100644
--- a/window/window-core/src/commonTest/kotlin/androidx/window/core/layout/WindowSizeClassTest.kt
+++ b/window/window-core/src/commonTest/kotlin/androidx/window/core/layout/WindowSizeClassTest.kt
@@ -16,6 +16,10 @@
 
 package androidx.window.core.layout
 
+import androidx.window.core.layout.WindowSizeClass.Companion.HEIGHT_DP_EXPANDED_LOWER_BOUND
+import androidx.window.core.layout.WindowSizeClass.Companion.HEIGHT_DP_MEDIUM_LOWER_BOUND
+import androidx.window.core.layout.WindowSizeClass.Companion.WIDTH_DP_EXPANDED_LOWER_BOUND
+import androidx.window.core.layout.WindowSizeClass.Companion.WIDTH_DP_MEDIUM_LOWER_BOUND
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
@@ -115,85 +119,252 @@
     }
 
     @Test
-    fun is_width_at_least_returns_true_when_input_is_greater() {
+    fun is_width_at_least_breakpoint_returns_false_when_breakpoint_is_greater() {
         val width = 200
         val height = 100
         val sizeClass = WindowSizeClass(width, height)
 
-        assertTrue(sizeClass.isWidthAtLeast(width + 1))
+        assertFalse(sizeClass.isWidthAtLeastBreakpoint(width + 1))
     }
 
     @Test
-    fun is_width_at_least_returns_true_when_input_is_equal() {
+    fun is_width_at_least_breakpoint_returns_true_when_breakpoint_is_equal() {
         val width = 200
         val height = 100
         val sizeClass = WindowSizeClass(width, height)
 
-        assertTrue(sizeClass.isWidthAtLeast(width))
+        assertTrue(sizeClass.isWidthAtLeastBreakpoint(width))
     }
 
     @Test
-    fun is_width_at_least_returns_false_when_input_is_smaller() {
+    fun is_width_at_least_breakpoint_returns_true_when_breakpoint_is_smaller() {
         val width = 200
         val height = 100
         val sizeClass = WindowSizeClass(width, height)
 
-        assertFalse(sizeClass.isWidthAtLeast(width - 1))
+        assertTrue(sizeClass.isWidthAtLeastBreakpoint(width - 1))
+    }
+
+    /**
+     * Tests that the width breakpoint logic works as expected. The following sample shows what the
+     * dev use site should be
+     *
+     * WIDTH_DP_MEDIUM_LOWER_BOUND = 600 WIDTH_DP_EXPANDED_LOWER_BOUND = 840
+     *
+     * fun process(sizeClass: WindowSizeClass) { when {
+     * sizeClass.isWidthAtLeast(WIDTH_DP_EXPANDED_LOWER_BOUND) -> doExpanded()
+     * sizeClass.isWidthAtLeast(WIDTH_DP_MEDIUM_LOWER_BOUND) -> doMedium() else -> doCompact() } }
+     *
+     * val belowMediumBreakpoint = WindowSizeClass(minWidthDp = 300, minHeightDp = 0) val
+     * equalMediumBreakpoint = WindowSizeClass(minWidthDp = 600, minHeightDp = 0) val
+     * expandedBreakpoint = WindowSizeClass(minWidthDp = 840, minHeightDp = 0)
+     *
+     * process(belowBreakpoint) -> doSomethingCompact() process(equalMediumBreakpoint) ->
+     * doSomethingMedium() process(expandedBreakpoint) -> doSomethingExpanded()
+     *
+     * So the following must be true
+     *
+     * expandedBreakpoint WindowSizeClass(840, 0).isWidthAtLeast(WIDTH_DP_EXPANDED_LOWER_BOUND) ==
+     * true WindowSizeClass(840, 0).isWidthAtLeast(WIDTH_DP_MEDIUM_LOWER_BOUND) == true
+     *
+     * equalMediumBreakpoint WindowSizeClass(600, 0).isWidthAtLeast(WIDTH_DP_EXPANDED_LOWER_BOUND)
+     * == false WindowSizeClass(600, 0).isWidthAtLeast(WIDTH_DP_MEDIUM_LOWER_BOUND) == true
+     *
+     * belowBreakpoint WindowSizeClass(0, 0).isWidthAtLeast(WIDTH_DP_EXPANDED_LOWER_BOUND) == false
+     * WindowSizeClass(0, 0).isWidthAtLeast(WIDTH_DP_MEDIUM_LOWER_BOUND) == false
+     */
+    @Test
+    fun is_width_at_least_bounds_checks() {
+        // expandedBreakpoint
+        assertTrue(
+            WindowSizeClass(WIDTH_DP_EXPANDED_LOWER_BOUND, 0)
+                .isWidthAtLeastBreakpoint(WIDTH_DP_EXPANDED_LOWER_BOUND)
+        )
+        assertTrue(
+            WindowSizeClass(WIDTH_DP_EXPANDED_LOWER_BOUND, 0)
+                .isWidthAtLeastBreakpoint(WIDTH_DP_MEDIUM_LOWER_BOUND)
+        )
+
+        // equalMediumBreakpoint
+        assertFalse(
+            WindowSizeClass(WIDTH_DP_MEDIUM_LOWER_BOUND, 0)
+                .isWidthAtLeastBreakpoint(WIDTH_DP_EXPANDED_LOWER_BOUND)
+        )
+        assertTrue(
+            WindowSizeClass(WIDTH_DP_MEDIUM_LOWER_BOUND, 0)
+                .isWidthAtLeastBreakpoint(WIDTH_DP_MEDIUM_LOWER_BOUND)
+        )
+
+        // belowBreakpoint
+        assertFalse(WindowSizeClass(0, 0).isWidthAtLeastBreakpoint(WIDTH_DP_EXPANDED_LOWER_BOUND))
+        assertFalse(WindowSizeClass(0, 0).isWidthAtLeastBreakpoint(WIDTH_DP_MEDIUM_LOWER_BOUND))
+    }
+
+    /**
+     * Tests that the width breakpoint logic works as expected. The following sample shows what the
+     * dev use site should be
+     *
+     * HEIGHT_DP_MEDIUM_LOWER_BOUND = 480 HEIGHT_DP_EXPANDED_LOWER_BOUND = 900
+     *
+     * fun process(sizeClass: WindowSizeClass) { when {
+     * sizeClass.isHeightAtLeast(HEIGHT_DP_EXPANDED_LOWER_BOUND) -> doExpanded()
+     * sizeClass.isHeightAtLeast(HEIGHT_DP_MEDIUM_LOWER_BOUND) -> doMedium() else -> doCompact() } }
+     *
+     * val belowMediumBreakpoint = WindowSizeClass(minWidthDp = 0, minHeightDp = 0) val
+     * equalMediumBreakpoint = WindowSizeClass(minWidthDp = 0, minHeightDp = 480) val
+     * expandedBreakpoint = WindowSizeClass(minWidthDp = 0, minHeightDp = 900)
+     *
+     * process(belowBreakpoint) -> doSomethingCompact() process(equalMediumBreakpoint) ->
+     * doSomethingMedium() process(expandedBreakpoint) -> doSomethingExpanded()
+     *
+     * So the following must be true
+     *
+     * expandedBreakpoint WindowSizeClass(0, 900).isWidthAtLeast(HEIGHT_DP_EXPANDED_LOWER_BOUND) ==
+     * true WindowSizeClass(0, 900).isWidthAtLeast(HEIGHT_DP_MEDIUM_LOWER_BOUND) == true
+     *
+     * equalMediumBreakpoint WindowSizeClass(0, 480).isWidthAtLeast(HEIGHT_DP_EXPANDED_LOWER_BOUND)
+     * == false WindowSizeClass(0, 480).isWidthAtLeast(HEIGHT_DP_MEDIUM_LOWER_BOUND) == true
+     *
+     * belowBreakpoint WindowSizeClass(0, 0).isWidthAtLeast(HEIGHT_DP_EXPANDED_LOWER_BOUND) == false
+     * WindowSizeClass(0, 0).isWidthAtLeast(HEIGHT_DP_MEDIUM_LOWER_BOUND) == false
+     */
+    @Test
+    fun is_height_at_least_bounds_checks() {
+        // expandedBreakpoint
+        assertTrue(
+            WindowSizeClass(0, HEIGHT_DP_EXPANDED_LOWER_BOUND)
+                .isHeightAtLeastBreakpoint(HEIGHT_DP_EXPANDED_LOWER_BOUND)
+        )
+        assertTrue(
+            WindowSizeClass(0, HEIGHT_DP_EXPANDED_LOWER_BOUND)
+                .isHeightAtLeastBreakpoint(HEIGHT_DP_MEDIUM_LOWER_BOUND)
+        )
+
+        // equalMediumBreakpoint
+        assertFalse(
+            WindowSizeClass(0, HEIGHT_DP_MEDIUM_LOWER_BOUND)
+                .isHeightAtLeastBreakpoint(HEIGHT_DP_EXPANDED_LOWER_BOUND)
+        )
+        assertTrue(
+            WindowSizeClass(0, HEIGHT_DP_MEDIUM_LOWER_BOUND)
+                .isHeightAtLeastBreakpoint(HEIGHT_DP_MEDIUM_LOWER_BOUND)
+        )
+
+        // belowBreakpoint
+        assertFalse(WindowSizeClass(0, 0).isHeightAtLeastBreakpoint(HEIGHT_DP_EXPANDED_LOWER_BOUND))
+        assertFalse(WindowSizeClass(0, 0).isHeightAtLeastBreakpoint(HEIGHT_DP_MEDIUM_LOWER_BOUND))
+    }
+
+    /**
+     * Tests that the width breakpoint logic works as expected. The following sample shows what the
+     * dev use site should be
+     *
+     * DIAGONAL_BOUND_MEDIUM = 600, 600 DIAGONAL_BOUND_EXPANDED = 900, 900
+     *
+     * fun process(sizeClass: WindowSizeClass) { when { sizeClass.isAtLeast(DIAGONAL_BOUND_EXPANDED,
+     * DIAGONAL_BOUND_EXPANDED) -> doExpanded() sizeClass.isAtLeast(DIAGONAL_BOUND_MEDIUM,
+     * DIAGONAL_BOUND_MEDIUM) -> doMedium() else -> doCompact() } }
+     *
+     * val belowMediumBreakpoint = WindowSizeClass(minWidthDp = 0, minHeightDp = 0) val
+     * equalMediumBreakpoint = WindowSizeClass(minWidthDp = 600, minHeightDp = 600) val
+     * expandedBreakpoint = WindowSizeClass(minWidthDp = 900, minHeightDp = 900)
+     *
+     * process(belowBreakpoint) -> doSomethingCompact() process(equalMediumBreakpoint) ->
+     * doSomethingMedium() process(expandedBreakpoint) -> doSomethingExpanded()
+     *
+     * So the following must be true
+     *
+     * expandedBreakpoint WindowSizeClass(900, 900).isWidthAtLeast(WIDTH_DP_EXPANDED_LOWER_BOUND) ==
+     * true WindowSizeClass(900, 900).isWidthAtLeast(WIDTH_DP_MEDIUM_LOWER_BOUND) == true
+     *
+     * equalMediumBreakpoint WindowSizeClass(600, 600).isWidthAtLeast(WIDTH_DP_EXPANDED_LOWER_BOUND)
+     * == false WindowSizeClass(600, 600).isWidthAtLeast(WIDTH_DP_MEDIUM_LOWER_BOUND) == true
+     *
+     * belowBreakpoint WindowSizeClass(0, 0).isWidthAtLeast(WIDTH_DP_EXPANDED_LOWER_BOUND) == false
+     * WindowSizeClass(0, 0).isWidthAtLeast(WIDTH_DP_MEDIUM_LOWER_BOUND) == false
+     */
+    @Test
+    fun is_area_at_least_bounds_checks() {
+        val diagonalMedium = 600
+        val diagonalExpanded = 900
+        // expandedBreakpoint
+        assertTrue(
+            WindowSizeClass(diagonalExpanded, diagonalExpanded)
+                .isAtLeastBreakpoint(diagonalExpanded, diagonalExpanded)
+        )
+        assertTrue(
+            WindowSizeClass(diagonalExpanded, diagonalExpanded)
+                .isAtLeastBreakpoint(diagonalMedium, diagonalMedium)
+        )
+
+        // equalMediumBreakpoint
+        assertFalse(
+            WindowSizeClass(diagonalMedium, diagonalMedium)
+                .isAtLeastBreakpoint(diagonalExpanded, diagonalExpanded)
+        )
+        assertTrue(
+            WindowSizeClass(diagonalMedium, diagonalMedium)
+                .isAtLeastBreakpoint(diagonalMedium, diagonalMedium)
+        )
+
+        // belowBreakpoint
+        assertFalse(WindowSizeClass(0, 0).isAtLeastBreakpoint(diagonalExpanded, diagonalExpanded))
+        assertFalse(WindowSizeClass(0, 0).isAtLeastBreakpoint(diagonalMedium, diagonalMedium))
     }
 
     @Test
-    fun is_height_at_least_returns_true_when_input_is_greater() {
+    fun is_height_at_least_breakpoint_returns_false_when_breakpoint_is_greater() {
         val width = 200
         val height = 100
         val sizeClass = WindowSizeClass(width, height)
 
-        assertTrue(sizeClass.isHeightAtLeast(height + 1))
+        assertFalse(sizeClass.isHeightAtLeastBreakpoint(height + 1))
     }
 
     @Test
-    fun is_height_at_least_returns_true_when_input_is_equal() {
+    fun is_height_at_least_breakpoint_returns_true_when_breakpoint_is_equal() {
         val width = 200
         val height = 100
         val sizeClass = WindowSizeClass(width, height)
 
-        assertTrue(sizeClass.isHeightAtLeast(height))
+        assertTrue(sizeClass.isHeightAtLeastBreakpoint(height))
     }
 
     @Test
-    fun is_height_at_least_returns_false_when_input_is_smaller() {
+    fun is_height_at_least_breakpoint_returns_true_when_breakpoint_is_smaller() {
         val width = 200
         val height = 100
         val sizeClass = WindowSizeClass(width, height)
 
-        assertFalse(sizeClass.isHeightAtLeast(height - 1))
+        assertTrue(sizeClass.isHeightAtLeastBreakpoint(height - 1))
     }
 
     @Test
-    fun is_at_least_returns_true_when_input_is_greater() {
+    fun is_at_least_breakpoint_returns_false_when_breakpoint_is_greater() {
         val width = 200
         val height = 100
         val sizeClass = WindowSizeClass(width, height)
 
-        assertTrue(sizeClass.isAtLeast(width, height + 1))
-        assertTrue(sizeClass.isAtLeast(width + 1, height))
+        assertFalse(sizeClass.isAtLeastBreakpoint(width, height + 1))
+        assertFalse(sizeClass.isAtLeastBreakpoint(width + 1, height))
     }
 
     @Test
-    fun is_at_least_returns_true_when_input_is_equal() {
+    fun is_at_least_breakpoint_returns_true_when_breakpoint_is_equal() {
         val width = 200
         val height = 100
         val sizeClass = WindowSizeClass(width, height)
 
-        assertTrue(sizeClass.isAtLeast(width, height))
+        assertTrue(sizeClass.isAtLeastBreakpoint(width, height))
     }
 
     @Test
-    fun is_at_least_returns_false_when_input_is_smaller() {
+    fun is_at_least_breakpoint_returns_true_when_breakpoint_is_smaller() {
         val width = 200
         val height = 100
         val sizeClass = WindowSizeClass(width, height)
 
-        assertFalse(sizeClass.isAtLeast(width, height - 1))
-        assertFalse(sizeClass.isAtLeast(width - 1, height))
+        assertTrue(sizeClass.isAtLeastBreakpoint(width, height - 1))
+        assertTrue(sizeClass.isAtLeastBreakpoint(width - 1, height))
     }
 }