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