Merge "Better horizontal internal scroll handling in Text." into jb-dev