Merge "Return explicit "Other Device" in MediaDeviceManager" into main