Merge "Fix cancellation of MediaDataLoader jobs" into main