Fixed location Settings Bugs
Merge branch 'LocationSelectorFix' into dev