Merge "The drag/drop ApiDemo now uses a global drag, not local-only"