Merge "MediaSession2: Change controller's behavior when connected"