Merge "Store connections by token instead of by fd" into sc-dev