Merge "Parent of TextLabel does not resize when text changes" into devel/master