Merge "Refactor motion estimation in MOTION_VAR experiment" into nextgenv2