Merge "Improve SyncManager logging for error cases"