Merge "Refactor tx_size step use cases in decoder" into nextgenv2