Merge "context: Replace deprecated use of SkinFactory::getDefaultInstance()"