diff --git a/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/SessionCallbackBuilderTest.java b/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/SessionCallbackBuilderTest.java
index 166e82fe27b..e9a1bcc3b33 100644
--- a/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/SessionCallbackBuilderTest.java
+++ b/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/SessionCallbackBuilderTest.java
@@ -23,7 +23,6 @@
 import android.content.Context;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.Looper;
 import android.text.TextUtils;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -79,11 +78,6 @@ public class SessionCallbackBuilderTest {
 
   @Before
   public void setUp() {
-    // Workaround to instantiate MediaSession with public androidx.media dependency.
-    // TODO(jaewan): Remove this workaround when androidx.media 1.2.0 is released.
-    if (Looper.myLooper() == null) {
-      Looper.prepare();
-    }
     context = ApplicationProvider.getApplicationContext();
     executor = playerTestRule.getExecutor();
     sessionPlayerConnector = playerTestRule.getSessionPlayerConnector();
diff --git a/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/SessionPlayerConnectorTest.java b/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/SessionPlayerConnectorTest.java
index f0f00f97eb8..b0dd696a470 100644
--- a/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/SessionPlayerConnectorTest.java
+++ b/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/SessionPlayerConnectorTest.java
@@ -64,7 +64,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -959,34 +958,6 @@ public void onPlaylistChanged(
     assertThat(onPlaylistChangedLatch.getCount()).isEqualTo(1);
   }
 
-  @Test
-  @LargeTest
-  @Ignore("setMediaItem() is currently implemented with setPlaylist(), so list isn't empty.")
-  @SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
-  public void setMediaItem_afterSettingPlaylist_notifiesOnPlaylistChangedWithNullList()
-      throws Exception {
-    List<MediaItem> playlist = TestUtils.createPlaylist(context, /* size= */ 10);
-    CountDownLatch onPlaylistBecomesNullLatch = new CountDownLatch(1);
-    sessionPlayerConnector.registerPlayerCallback(
-        executor,
-        new SessionPlayer.PlayerCallback() {
-          @Override
-          public void onPlaylistChanged(
-              @NonNull SessionPlayer player,
-              @Nullable List<MediaItem> list,
-              @Nullable MediaMetadata metadata) {
-            if (list == null) {
-              onPlaylistBecomesNullLatch.countDown();
-            }
-          }
-        });
-    sessionPlayerConnector.setPlaylist(playlist, /* metadata= */ null);
-    sessionPlayerConnector.setMediaItem(playlist.get(0));
-    assertThat(
-            onPlaylistBecomesNullLatch.await(PLAYLIST_CHANGE_WAIT_TIME_MS, TimeUnit.MILLISECONDS))
-        .isTrue();
-  }
-
   @Test
   @LargeTest
   @SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
diff --git a/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/TimelinePlaylistManager.java b/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/TimelinePlaylistManager.java
index e188d3ce59d..70d87a96652 100644
--- a/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/TimelinePlaylistManager.java
+++ b/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/TimelinePlaylistManager.java
@@ -218,7 +218,6 @@ public boolean replacePlaylistItem(Player player, int index, MediaItem mediaItem
 
   @Override
   public boolean setMediaItem(Player player, MediaItem mediaItem) {
-    // TODO(jaewan): Distinguish setMediaItem(item) and setPlaylist({item})
     List<MediaItem> playlist = new ArrayList<>();
     playlist.add(mediaItem);
     return setPlaylist(player, playlist, /* metadata */ null);