Merge "Fix memory corruption issues in TextLayoutCache.  (DO NOT MERGE)" into ics-mr1