Merge "Make ConnectionRecord reference ServiceState" into main