Merge "Make a small code clean on handle_inter_mode()" into nextgenv2