Merge "Cancel pending timeouts when media data is removed" into rvc-qpr-dev