Merge "Unify the use of inter predictor in encoder and decoder" into nextgenv2