Merge "MediaSessionManager: Add listener for Session2Token changes"