Merge "Refactor Geocoder Provider System APIs" into main