Merge "Fixing a issue of calculating tx cost for SUPERTX+VAR_TX" into nextgenv2