refactor: reland "preserve ProcState::file_fetcher between restarts" (#17636)

Just some watcher init step that I thought would be "cloned over" but
needs to be done again on reset.

cli/util/file_watcher.rs

@@ -322,13 +322,13 @@ where
         continue;
       },
       _ = operation_future => {
+        consume_paths_to_watch(&mut watcher, &mut paths_to_watch_receiver);
         // TODO(bartlomieju): print exit code here?
         info!(
           "{} {} finished. Restarting on file change...",
           colors::intense_blue("Watcher"),
           job_name,
         );
-        consume_paths_to_watch(&mut watcher, &mut paths_to_watch_receiver);
       },
     };