Merge "Add surrounding text to EditorInfo to speed up IME startup"