Merge "MediaSessionService: Keep track of newly created MediaSession2"