Merge "[4.0] Update text layout utcs" into tizen_4.0