Merge pull request #5615 from Wikia/VID-2143

VID-2143 Make sure we have a ThumbnailImage object with a File when crea...