Merge "Improve logging for EmergencyNumbers." into main