Merge "Use CompositingStrategy.Offscreen in Modifier.punchHole (1/2)" into main