Merge "Replace get_tx2d_size() with direct tx_size_2d[] table access" into nextgenv2