Merge "Add getMediaDeviceById() method"