Merge "Reset media controls when user changes" into rvc-dev