Merge "Move SkiaCanvas::Clip above SkiaCanvas::SkiaCanvas"