Merge "Round rect outline clipping"