Merge "Snap for 12962263 from 372c89ea823ef3f5d822484017c4fe07509161c9 to androidx-compose-beta-release" into androidx-compose-beta-release