Merge "Attempt on deflaking FolderTest" into main