Merge "skins: Remove use of deprecated MessageCache::singleton()"