Merge "Snap for 13696660 from 97949e21bc14585f41dfbc0738f736d685aede60 to androidx-compose-beta-release" into androidx-compose-beta-release