[TIMOB-10539] Fixed layouts in scrollview
Merge pull request #3817 from bryan-m-hughes/timob-10539

[TIMOB-10539] Fixed layouts in scrollview