Merge "Track pid for each session"