Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev