Code review fixes
If FileIndexManager is marked dirty during a scan, immediately restart the scan (don't wait for another caller). Also, don't try to start a new perf marker when restarting the scan.