Merge "NPE when deleting draft patch set when previous draft already deleted" into stable-2.6