Merge "MediaMuxer:Maintain proper state after stop()" into rvc-dev