Merge "Fix RecordingCanvas::refPaint, add tests"