BACKLOG-3665 ( BACKLOG-4319 ) - Studio Cleanup (Regressions raised by
code review)

Cleanup in the FileWatcher code