Merge "Make ref_mv_idx syntax context dependent on block distance only" into nextgenv2