Merge "Remove SkCanvas::flush() and related code from RecordingCanvas" into main