Merge "Zero out block mv when an intra mode is selected"