Moved mergeMediaData method to more useful location
CS
Class is no longer used
Fixed "none" option not being marked as selected
Fallback is for languages, not variants!