am 4eec98ed: Merge "Text handles do not handle scroll correctly" into ics-mr0

* commit '4eec98edee3d6eb516e30a7151da13fd726f93a9':
  Text handles do not handle scroll correctly