Merge "Try to find equivalent SuggestionsSpan when it has been updated." into nyc-dev