Merge "hal: Fix app type mismatch for Tx path"