Merge "Refactor tx_size to pixel number mapping in reconintra.c" into nextgenv2