Merge "Stop search tests using location_settings"