Merge "Text handles do not handle scroll correctly"