[tracker] Modified connection related things to match life-cycle of activity