Merge "Refactor the sub8x8 block motion search control" into nextgenv2