Merge "Fix a few mis-use cases of MAX_MV_REF_CANDIDATES" into nextgenv2