Merge "Fix double-close on direct channel registration" into tm-qpr-dev