Merge "Add a unique ID to MediaDeviceData" into tm-dev