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