Merge "Text handles do not handle scroll correctly" into ics-mr0