Merge "Only use en-US locale in date conversion." into main