Merge "SyncManager now returns copy on getCurrentSyncs()" into klp-dev