Merge "Scroll performance improved in multiline TextEdit" into ics-mr1