Merge "Add trunk flag for adding SF skipped frames into traces." into main