Merge "Update text select handles" into ics-mr0