diff --git a/compose/build.gradle.kts b/compose/build.gradle.kts
index bad7fa5543..75cf44407c 100644
--- a/compose/build.gradle.kts
+++ b/compose/build.gradle.kts
@@ -37,6 +37,7 @@ val mainComponents =
         ComposeComponent(":compose:ui:ui-test-junit4", supportedPlatforms = ComposePlatforms.JVM_BASED),
         ComposeComponent(":compose:ui:ui-text"),
         ComposeComponent(":compose:ui:ui-tooling", supportedPlatforms = ComposePlatforms.JVM_BASED),
+        ComposeComponent(":compose:ui:ui-tooling-data", supportedPlatforms = ComposePlatforms.JVM_BASED),
         ComposeComponent(":compose:ui:ui-tooling-preview", supportedPlatforms = ComposePlatforms.JVM_BASED),
         ComposeComponent(":compose:ui:ui-unit"),
         ComposeComponent(":compose:ui:ui-util"),
@@ -50,11 +51,6 @@ val iconsComponents =
 fun ComposePublishingTask.mainPublications() {
     publish(":compose:compiler:compiler", publications = listOf("Maven"))
     publish(":compose:compiler:compiler-hosted", publications = listOf("Maven"))
-    publish(
-        ":compose:ui:ui-tooling-data",
-        onlyWithPlatforms = setOf(ComposePlatforms.AndroidRelease, ComposePlatforms.AndroidDebug),
-        publications = listOf("Maven")
-    )
 
     publish(
         ":compose:desktop:desktop",
diff --git a/compose/frameworks/support b/compose/frameworks/support
index 0851a8572f..0c8e7fe326 160000
--- a/compose/frameworks/support
+++ b/compose/frameworks/support
@@ -1 +1 @@
-Subproject commit 0851a8572f66ac794f3fc36ef844f9ba5b3ea5c0
+Subproject commit 0c8e7fe326e4a267db7499f9ce4a33194980498c