Merge "Fix text cursor position issue" into devel/master