Merge "Added support for Unicode surrogate characters in word selection" into honeycomb