Merge "Fix rounded corner scission clipping"