Merge "Plumb FrameEventHistory to client"