Merge "Revert "Make FinalizerWatchDogDaemon also monitor RQDaemon""