Merge "Enable preservation of grapheme clusters in highlightQuery"