Merge "Add "entropy" experiment flag" into nextgenv2