Merge "Fix double-close on direct channel registration"