Unity

Merge proposals dependent on lp://qastaging/~jassmith/unity/unity.fix-drag-over-trash

  1. unity.fix-drag-over-trash
  2. Dependent merge proposals

lp://qastaging/~jassmith/unity/unity.fix-drag-over-trash has no merge proposals.