Merge "Simplify DeviceChip population logic in MediaDeviceManager" into main