fix #3191: NumberFormatException in SettingsActivity
Merge branch 'release' into upstream