Merge "SF: fix a few bugs with FrameTargeter storing N fences" into main