Merge "Simplify tx_size enums" into nextgenv2