Merge "Invoke create_recording_canvas correctly in macro bench tests" into pi-dev