Merge "Fix some var_tx related rd_costing mismatches" into nextgenv2