Pass former-container to onDrop if cancelled.
Merge branch 'custom-classes' into oddbird

* custom-classes:
  Pass former-container to onDrop if cancelled.