Merge "Add vertical alignment for text editor" into devel/master