Merge "Update when media controls get cleared" into rvc-dev