Merge "Cosmetic changes in handle_inter_mode_" into experimental