Manual backport
[TIMOB-8435] Fixed double scrollbars in desktop
Merge pull request #4579 from bryan-m-hughes/timob-8435-3_1_X

Timob 8435 3 1 x