Merge "Filter media controls by user" into rvc-dev