Merge "Fix up delete to handle trash/drafts deletions"