Merge "NPE in GMail / TextLine" into ics-mr1