Merge proposals dependent on lp://qastaging/~gordallott/unity/fix-broken-dnd

lp://qastaging/~gordallott/unity/fix-broken-dnd has no merge proposals.