[TIMOB-13735] Fixed a crash when setting horizontalWrap
Merge pull request #4281 from bryan-m-hughes/timob-13735-3_1_X

[TIMOB-13735] Fixed a crash when setting horizontalWrap