Merge "Add unit test for adapt_scan experiment" into nextgenv2