Merge pull request #1808 from jlipps/master

better support for settings/preferences app
finish locale udid fix (fix #1773)
make sure we don't crash if IDevice init fails