Merge "Fix deferred shortcut container removal." into ub-launcher3-calgary-polish