am 446d0fb6: am 41a12d22: When closing a folder, make sure to remove it from the list of drop targets.

Merge commit '446d0fb65932924aaeab203f71c4b31d234bf7dd' into eclair-mr2-plus-aosp

* commit '446d0fb65932924aaeab203f71c4b31d234bf7dd':
  When closing a folder, make sure to remove it from the list of drop targets.