Merge "Cancel session when client callback dies" into main