ensure folders are watched after interrupting the dirwatcher

This adds a failsafe and generates a warning for a situation that
should never happen. A spin-off of patch review D7995 on phabricator.

(cherry picked from commit c10d6a48abaabc1c5aeae918e82cd9a639d1f576)