Merge "Add SkiaCanvas::captureCanvasState()" into oc-dev