Merge "Changing the default display order for Western names in CJK locales."