Merge "Skip deleteSurroundingText when there is an invalid selection"