Merge "Implement scroll bar in the TextEditor" into devel/master