Merge "Add missing @NonNull to BaseRecordingCanvas" into main