Merge "MediaSession2: Fix bug in SessionToken2 constructor"