uses RebuildGrid() instead of UpdateGridLayout to avoid whitespace for (absent) scrollbar
Merge branch 'scroll_space_fix' into integration