Keep file watcher in memory to prevent losing file events
Merge remote-tracking branch 'chiiph/bug/keep_watcher_in_memory' into develop