diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
index cb248fd142..6a51016dd3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
@@ -653,10 +653,8 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
   }
 
   private boolean shouldUseDummySurface(boolean codecIsSecure) {
-    // TODO: Work out when we can safely uncomment the secure case below. This case is currently
-    // broken on Galaxy S8 [Internal: b/37197802].
-    return Util.SDK_INT >= 23 && !tunneling
-        && (!codecIsSecure /* || DummySurface.SECURE_SUPPORTED */);
+    return Util.SDK_INT >= 23 && !tunneling && (!codecIsSecure
+        || (DummySurface.SECURE_SUPPORTED && !deviceNeedsSecureDummySurfaceWorkaround()));
   }
 
   private void setJoiningDeadlineMs() {
@@ -923,6 +921,18 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
     codec.setVideoScalingMode(scalingMode);
   }
 
+  /**
+   * Returns whether the device is known to fail outputting from a secure decoder to a secure
+   * surface texture.
+   * <p>
+   * If true is returned then use of {@link DummySurface} is disabled for secure playbacks.
+   */
+  private static boolean deviceNeedsSecureDummySurfaceWorkaround() {
+    // See [Internal: b/37197802].
+    return Util.SDK_INT == 24
+        && (Util.MODEL.startsWith("SM-G950") || Util.MODEL.startsWith("SM-G955"));
+  }
+
   /**
    * Returns whether the device is known to enable frame-rate conversion logic that negatively
    * impacts ExoPlayer.
diff --git a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashStreamingTest.java b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashStreamingTest.java
index e7441362cf..24f73e9d08 100644
--- a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashStreamingTest.java
+++ b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashStreamingTest.java
@@ -67,6 +67,10 @@ public final class DashStreamingTest extends ActivityInstrumentationTestCase2<Ho
       .enableRenderer(DashTestRunner.AUDIO_RENDERER_INDEX)
       .disableRenderer(DashTestRunner.AUDIO_RENDERER_INDEX)
       .enableRenderer(DashTestRunner.AUDIO_RENDERER_INDEX)
+      // Wait 10 seconds, detach the surface, wait another 10 seconds and attach it again.
+      .delay(10000).clearVideoSurface()
+      .delay(10000).setVideoSurface()
+      // Wait 10 seconds, then seek to near end.
       .delay(10000).seek(120000)
       .build();
   
diff --git a/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/util/Action.java b/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/util/Action.java
index 64484f7c5d..edb0fa59bf 100644
--- a/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/util/Action.java
+++ b/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/util/Action.java
@@ -16,7 +16,9 @@
 package com.google.android.exoplayer2.playbacktests.util;
 
 import android.util.Log;
+import android.view.Surface;
 import com.google.android.exoplayer2.ExoPlayer;
+import com.google.android.exoplayer2.SimpleExoPlayer;
 import com.google.android.exoplayer2.trackselection.MappingTrackSelector;
 
 /**
@@ -41,19 +43,24 @@ public abstract class Action {
    *
    * @param player The player to which the action should be applied.
    * @param trackSelector The track selector to which the action should be applied.
+   * @param surface The surface to use when applying actions.
    */
-  public final void doAction(ExoPlayer player, MappingTrackSelector trackSelector) {
+  public final void doAction(SimpleExoPlayer player, MappingTrackSelector trackSelector,
+      Surface surface) {
     Log.i(tag, description);
-    doActionImpl(player, trackSelector);
+    doActionImpl(player, trackSelector, surface);
   }
 
   /**
-   * Called by {@link #doAction(ExoPlayer, MappingTrackSelector)} do actually perform the action.
+   * Called by {@link #doAction(SimpleExoPlayer, MappingTrackSelector, Surface)} do perform the
+   * action.
    *
    * @param player The player to which the action should be applied.
    * @param trackSelector The track selector to which the action should be applied.
+   * @param surface The surface to use when applying actions.
    */
-  protected abstract void doActionImpl(ExoPlayer player, MappingTrackSelector trackSelector);
+  protected abstract void doActionImpl(SimpleExoPlayer player, MappingTrackSelector trackSelector,
+      Surface surface);
 
   /**
    * Calls {@link ExoPlayer#seekTo(long)}.
@@ -72,7 +79,8 @@ public abstract class Action {
     }
 
     @Override
-    protected void doActionImpl(ExoPlayer player, MappingTrackSelector trackSelector) {
+    protected void doActionImpl(SimpleExoPlayer player, MappingTrackSelector trackSelector,
+        Surface surface) {
       player.seekTo(positionMs);
     }
 
@@ -91,7 +99,8 @@ public abstract class Action {
     }
 
     @Override
-    protected void doActionImpl(ExoPlayer player, MappingTrackSelector trackSelector) {
+    protected void doActionImpl(SimpleExoPlayer player, MappingTrackSelector trackSelector,
+        Surface surface) {
       player.stop();
     }
 
@@ -114,7 +123,8 @@ public abstract class Action {
     }
 
     @Override
-    protected void doActionImpl(ExoPlayer player, MappingTrackSelector trackSelector) {
+    protected void doActionImpl(SimpleExoPlayer player, MappingTrackSelector trackSelector,
+        Surface surface) {
       player.setPlayWhenReady(playWhenReady);
     }
 
@@ -140,10 +150,52 @@ public abstract class Action {
     }
 
     @Override
-    protected void doActionImpl(ExoPlayer player, MappingTrackSelector trackSelector) {
+    protected void doActionImpl(SimpleExoPlayer player, MappingTrackSelector trackSelector,
+        Surface surface) {
       trackSelector.setRendererDisabled(rendererIndex, disabled);
     }
 
   }
 
+  /**
+   * Calls {@link SimpleExoPlayer#clearVideoSurface()}.
+   */
+  public static final class ClearVideoSurface extends Action {
+
+    /**
+     * @param tag A tag to use for logging.
+     */
+    public ClearVideoSurface(String tag) {
+      super(tag, "ClearVideoSurface");
+    }
+
+    @Override
+    protected void doActionImpl(SimpleExoPlayer player, MappingTrackSelector trackSelector,
+        Surface surface) {
+      player.clearVideoSurface();
+    }
+
+  }
+
+  /**
+   * Calls {@link SimpleExoPlayer#setVideoSurface(Surface)}.
+   */
+  public static final class SetVideoSurface extends Action {
+
+    /**
+     * @param tag A tag to use for logging.
+     */
+    public SetVideoSurface(String tag) {
+      super(tag, "SetVideoSurface");
+    }
+
+    @Override
+    protected void doActionImpl(SimpleExoPlayer player, MappingTrackSelector trackSelector,
+        Surface surface) {
+      player.setVideoSurface(surface);
+    }
+
+  }
+
+
 }
diff --git a/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/util/ActionSchedule.java b/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/util/ActionSchedule.java
index 5e2ae24c2c..94204ca1b5 100644
--- a/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/util/ActionSchedule.java
+++ b/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/util/ActionSchedule.java
@@ -16,10 +16,13 @@
 package com.google.android.exoplayer2.playbacktests.util;
 
 import android.os.Handler;
-import com.google.android.exoplayer2.ExoPlayer;
+import android.view.Surface;
+import com.google.android.exoplayer2.SimpleExoPlayer;
+import com.google.android.exoplayer2.playbacktests.util.Action.ClearVideoSurface;
 import com.google.android.exoplayer2.playbacktests.util.Action.Seek;
 import com.google.android.exoplayer2.playbacktests.util.Action.SetPlayWhenReady;
 import com.google.android.exoplayer2.playbacktests.util.Action.SetRendererDisabled;
+import com.google.android.exoplayer2.playbacktests.util.Action.SetVideoSurface;
 import com.google.android.exoplayer2.playbacktests.util.Action.Stop;
 import com.google.android.exoplayer2.trackselection.MappingTrackSelector;
 
@@ -42,11 +45,12 @@ public final class ActionSchedule {
    *
    * @param player The player to which actions should be applied.
    * @param trackSelector The track selector to which actions should be applied.
+   * @param surface The surface to use when applying actions.
    * @param mainHandler A handler associated with the main thread of the host activity.
    */
-  /* package */ void start(ExoPlayer player, MappingTrackSelector trackSelector,
-      Handler mainHandler) {
-    rootNode.schedule(player, trackSelector, mainHandler);
+  /* package */ void start(SimpleExoPlayer player, MappingTrackSelector trackSelector,
+      Surface surface, Handler mainHandler) {
+    rootNode.schedule(player, trackSelector, surface, mainHandler);
   }
 
   /**
@@ -149,6 +153,24 @@ public final class ActionSchedule {
       return apply(new SetRendererDisabled(tag, index, true));
     }
 
+    /**
+     * Schedules a clear video surface action to be executed.
+     *
+     * @return The builder, for convenience.
+     */
+    public Builder clearVideoSurface() {
+      return apply(new ClearVideoSurface(tag));
+    }
+
+    /**
+     * Schedules a set video surface action to be executed.
+     *
+     * @return The builder, for convenience.
+     */
+    public Builder setVideoSurface() {
+      return apply(new SetVideoSurface(tag));
+    }
+
     public ActionSchedule build() {
       return new ActionSchedule(rootNode);
     }
@@ -165,8 +187,9 @@ public final class ActionSchedule {
 
     private ActionNode next;
 
-    private ExoPlayer player;
+    private SimpleExoPlayer player;
     private MappingTrackSelector trackSelector;
+    private Surface surface;
     private Handler mainHandler;
 
     /**
@@ -193,21 +216,23 @@ public final class ActionSchedule {
      *
      * @param player The player to which actions should be applied.
      * @param trackSelector The track selector to which actions should be applied.
+     * @param surface The surface to use when applying actions.
      * @param mainHandler A handler associated with the main thread of the host activity.
      */
-    public void schedule(ExoPlayer player, MappingTrackSelector trackSelector,
-        Handler mainHandler) {
+    public void schedule(SimpleExoPlayer player, MappingTrackSelector trackSelector,
+        Surface surface, Handler mainHandler) {
       this.player = player;
       this.trackSelector = trackSelector;
+      this.surface = surface;
       this.mainHandler = mainHandler;
       mainHandler.postDelayed(this, delayMs);
     }
 
     @Override
     public void run() {
-      action.doAction(player, trackSelector);
+      action.doAction(player, trackSelector, surface);
       if (next != null) {
-        next.schedule(player, trackSelector, mainHandler);
+        next.schedule(player, trackSelector, surface, mainHandler);
       }
     }
 
@@ -223,7 +248,8 @@ public final class ActionSchedule {
     }
 
     @Override
-    protected void doActionImpl(ExoPlayer player, MappingTrackSelector trackSelector) {
+    protected void doActionImpl(SimpleExoPlayer player, MappingTrackSelector trackSelector,
+        Surface surface) {
       // Do nothing.
     }
 
diff --git a/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/util/ExoHostedTest.java b/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/util/ExoHostedTest.java
index 50791d5c83..56f11d86e3 100644
--- a/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/util/ExoHostedTest.java
+++ b/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/util/ExoHostedTest.java
@@ -76,6 +76,7 @@ public abstract class ExoHostedTest implements HostedTest, ExoPlayer.EventListen
   private Handler actionHandler;
   private MappingTrackSelector trackSelector;
   private SimpleExoPlayer player;
+  private Surface surface;
   private ExoPlaybackException playerError;
   private boolean playerWasPrepared;
   private boolean playerFinished;
@@ -124,7 +125,7 @@ public abstract class ExoHostedTest implements HostedTest, ExoPlayer.EventListen
     if (player == null) {
       pendingSchedule = schedule;
     } else {
-      schedule.start(player, trackSelector, actionHandler);
+      schedule.start(player, trackSelector, surface, actionHandler);
     }
   }
 
@@ -132,6 +133,7 @@ public abstract class ExoHostedTest implements HostedTest, ExoPlayer.EventListen
 
   @Override
   public final void onStart(HostActivity host, Surface surface) {
+    this.surface = surface;
     // Build the player.
     DefaultBandwidthMeter bandwidthMeter = new DefaultBandwidthMeter();
     trackSelector = buildTrackSelector(host, bandwidthMeter);
@@ -146,7 +148,7 @@ public abstract class ExoHostedTest implements HostedTest, ExoPlayer.EventListen
     actionHandler = new Handler();
     // Schedule any pending actions.
     if (pendingSchedule != null) {
-      pendingSchedule.start(player, trackSelector, actionHandler);
+      pendingSchedule.start(player, trackSelector, surface, actionHandler);
       pendingSchedule = null;
     }
   }