Merge "Fixed scrolling issue when moving cursor in long TextViews."