Merge "SyncManager: Suppress WTF until ready to sync" into pi-dev