Merge "Fix race on setCanceledAfterLifetimeExtension" into main