Merge "preferences: Fix skinname msg check in generateSkinOptions"