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