Merge "Refactor ext-tx experiment" into nextgenv2