Merge "Reformat local numbers that are placing calls in Singapore to not show the country code." into main