Merge "Inlining setup_key_frame() and setup_inter_frame()."