Merge "Use MediaSession.Token instead of ISessionController"