Merge "Separate intra and inter tx_size counting" into nextgenv2