Merge "Fix an NPE in WatchdogEventLogger#stop" into rvc-dev