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