Merge "Add pid to MediaSession2Record" into main