Merge "Change rule so that multi-window labels are shown if there is space." into ub-launcher3-master