Merge "Update the fallback logic in BaseInputConnection#getSurroundingText()" into sc-dev