Merge "IOOB in text selection." into ics-mr1