Merge "Center folders slightly less aggressively than before" into ub-launcher3-calgary