am 4a080dca: Merge "Some resource fixes for drop target" into ub-now-queens

* commit '4a080dcadd532dd259de596729a1cd6e949bdae4':
  Some resource fixes for drop target