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

* commit 'a068e2f1d9532e6f005a162adfa295c553873ca5':
  Text handles do not handle scroll correctly