Merge "Merge mr_pick_inter_mode and pick_inter_mode"