Merge "Add affine model to global motion" into nextgenv2