Merge "Support keyboard entry of non-ASCII characters"