Move more state tracking to FrameLoadState