Merge "CanvasContext::draw: flushAndSubmit when not drawing" into sc-dev