Merge "Ameliorate geocoder causing ANRs"