Merge "Put input ID when inserting channels" into lmp-dev