Merge "SF: fix FrameTimelineInfo association to buffers"