Merge "Fix GetTextBoundingRectangle size issue" into devel/master