Merge "Enable media resumption" into rvc-dev