Merge "Rounded corner child clipping tests"