Merge "When syncing folders, read all data first, then process" into honeycomb