Fix deferred shortcut container removal.
am: ec383dfc63

Change-Id: I3a2d582f3834f9034e46eebd67815fa890b520b0