Merge "Compare Session tokens for MediaControllers"