Merge "Fix incorrect phone number display in Bidi language"