Merge "Make subpel masked motion work with upsampled refs" into nextgenv2