Merge "Make drag shadow grapheme cluster aware." into nyc-dev