Merge pull request #6338 from mahdihijazi/settings_enhancements Update Android UI Settings to have the most common used settings
