Merge "Add tx_size to pixel number map" into nextgenv2