Merge "Fix the logic of adding skipped frame." into main