Merge "Fix text autoscroll issue" into devel/master