Merge "Prevent a memory leak in TextLine." into ics-mr1