Merge "Fix NPE in SyncManager." into main