Merge "Fix CME in MediaDataCombineListener" into rvc-dev