Merge "Fix AutoText setting of locale"