Merge "Fix a bug in ext-intra experiment" into nextgenv2