Merge "Allow hidden skins to show up in preferences"