Merge "Replace tx_size_1d with tx_size_wide/high" into nextgenv2