Merge "Remove location mode menu from location settings"