Merge "Fix text scrolling bug" into devel/master