Merge pull request #7728 from osmandapp/general_preferences_fixes

General preferences fixes