Merge "Fixing issue with txfm context when var_tx and supertx are enabled" into nextgenv2