Changed location setting to fit App's theme
Merge branch 'LocationSettingUi' into dev