(cherry picked from commit 58b2895ec910ecd6557cf7d6fb27fbb4bccecda1) # Conflicts: # gradle/compose.versions.toml