Merge "Text scroller renderer bug fix" into devel/master