am 98a85c2d: Merge "Invalidated bounds tightened in TextView" into ics-mr1

* commit '98a85c2de6b3f27ba1ccb2cfd44a775b4f490f72':
  Invalidated bounds tightened in TextView