Merge "fix position of WebTextView on scrolling layers" into ics-mr1