LPS-43707 Resolve thread conflict causing NoSuchFolderException