Merge "Synchronize tx_size counts in the decoder" into nextgenv2