am 58d89539: Merge "Scroll performance improved in multiline TextEdit" into ics-mr1

* commit '58d8953958ce452c5080eaa582d7e5d2b5017398':
  Scroll performance improved in multiline TextEdit