Add no-op implementation for waitForImportFinished
Merge branch 'restore-waitForFinished'

* restore-waitForFinished:
  Add no-op implementation for waitForImportFinished