Merge "Add supports 2k and 8k to MediaDeviceInfo"