Merge "Fix an issue where the video size was incorrectly retrieved from preview size"