Merge "Revert "Revert "Make WatchedFramePop instrumentation event pure-virtual"""