Fix convertPreferences to accept non-module clientIDs
Merge pull request #7415 from SAPlayer/patch-1

Fix convertPreferences to accept non-module clientIDs