Merge "Revert "Remove widgets that no longer fit the workspace in their current spans."" into ub-launcher3-master