Merge "Make the Phone options dialog use current language"