Merge "Added support for antialiased canvas clipping"