Merge " Calculate a new height when text was changed." into devel/master