Merge "simp-mv-pred integration with ref-mv" into nextgenv2