Merge "Fix bug # 5863709 API request: Change param names of deleteSurroundingText to "before" and "after""