Merge "[Rounded Corner] Handle ContainerLayer correctly."