Merge "Prevent accidental changes to the previous frame mode_infos"