Merge "Fix repeated empty workspaces after changing the grid size." into tm-qpr-dev