Merge "SF: make FrameTimeline more robust for fence errors"