Merge "fix wrong cursor position in TextField" into devel/master