Merge "Remove inter_mode_mask from rate-distortion search loop"