Merge "MediaMuxer:Avoid hang during stop() on empty track" into rvc-qpr-dev