Merge "Remove usage of deprecated SkinFactory::getDefaultInstance()"