Merge "Fix MediaSession.Token#equals()" into rvc-dev