Merge "Extend the MediaDeviceType to support more media device" into rvc-dev