Merge "Deflake testCancel_sneakyCancelBeforeUpdate" into main