Merge "Apply over-expansion to clipping bounds" into main