Merge "Change to rd costing for CONFIG_VAR_TX" into nextgenv2