Merge "Update FileObserver to be able to watch multiple files."