Merge "Add supported video resolutions to MediaDeviceInfo"