Merge "Fix registerDirectChannel in HAL wrappers" into tm-dev