Merge "Fix around suggestionSpan."