Merge "Fix SecurityException in Editor.onDrop"