Merge "Adding back media resumption" into rvc-dev