Merge "Text auto scroll animation bug fix" into devel/master