Merge "Fix an issue where "SuggestionSpan"s are not removed properly"