Merge "Revert "[Rounded Corner] Handle ContainerLayer correctly.""