Merge "Fix race condition in IMediaSource" into rvc-dev