Merge "Don't fail 050-sync-test due to thread timing"