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