Merge "Convert core to use new ThumbnailImage() constructor"