Merge "Remove Path based outline clipping"