Merge "Fix for bug 5309242 [Prime] VideoEditorAPITest testVideoContentHD failed"