Don't attempt to add item back to folder when deferring drag.
am: 1cf412ca91

Change-Id: Ic8bf5568b9811558bf20fac721b17dfa80803e8a