Merge "Fix MediaEvent release issue" into rvc-dev