Merge "Fix txb_w/h use case in av1_tx_block_rd_b()" into nextgenv2