Merge "Refactor sub-pixel motion search" into nextgenv2