Merge "Fix text AutoScroll ellipsis issue" into devel/master