Merge "slimbus: Avoid same channel definition, removal in same sequence"