Merge pull request #5967 from JonnyH/WIP/more-robust-android-settings-parser Make the Android settings parser a bit more robust
