Merge "Actually finalize frame event history before sending callbacks"