Merge "MediaPlayer2: async commands return token"