Merge "Fix deferred shortcut container removal." into ub-launcher3-calgary-polish
am: 40851b637e

Change-Id: Ibdd247c65f7ab6b11f8a7e92a28c2b596af83131