Merge "Move small fixes and refactoring for obmc pred from AV1" into nextgenv2