Merge "Make reset_frame_context an enum."