Merge "Remove USE_LOCATION_FOR_SERVICES from Settings"