Merge "Turn off debugging in SyncManager" into klp-dev