diff --git a/samples/Support7Demos/src/com/example/android/supportv7/media/MediaPlayerWrapper.java b/samples/Support7Demos/src/com/example/android/supportv7/media/MediaPlayerWrapper.java
index 658caca7d..8b82631be 100644
--- a/samples/Support7Demos/src/com/example/android/supportv7/media/MediaPlayerWrapper.java
+++ b/samples/Support7Demos/src/com/example/android/supportv7/media/MediaPlayerWrapper.java
@@ -226,7 +226,7 @@ public class MediaPlayerWrapper implements
         });
     }
 
-    private void reset() {
+    public void reset() {
         if (mMediaPlayer != null) {
             mMediaPlayer.stop();
             mMediaPlayer.release();
diff --git a/samples/Support7Demos/src/com/example/android/supportv7/media/OverlayDisplayWindow.java b/samples/Support7Demos/src/com/example/android/supportv7/media/OverlayDisplayWindow.java
index e691c14e2..0234a306d 100644
--- a/samples/Support7Demos/src/com/example/android/supportv7/media/OverlayDisplayWindow.java
+++ b/samples/Support7Demos/src/com/example/android/supportv7/media/OverlayDisplayWindow.java
@@ -145,7 +145,9 @@ public abstract class OverlayDisplayWindow {
                 mWindowManager.addView(mSurfaceView, params);
                 mWindowVisible = true;
 
-                mListener.onWindowCreated(mSurfaceView.getHolder());
+                SurfaceHolder holder = mSurfaceView.getHolder();
+                holder.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
+                mListener.onWindowCreated(holder);
             }
         }
 
@@ -458,4 +460,4 @@ public abstract class OverlayDisplayWindow {
             }
         };
     }
-}
\ No newline at end of file
+}
diff --git a/samples/Support7Demos/src/com/example/android/supportv7/media/SampleMediaRouterActivity.java b/samples/Support7Demos/src/com/example/android/supportv7/media/SampleMediaRouterActivity.java
index 4f95302d7..04d57a068 100644
--- a/samples/Support7Demos/src/com/example/android/supportv7/media/SampleMediaRouterActivity.java
+++ b/samples/Support7Demos/src/com/example/android/supportv7/media/SampleMediaRouterActivity.java
@@ -794,6 +794,7 @@ public class SampleMediaRouterActivity extends ActionBarActivity {
             mLayout = (FrameLayout)findViewById(R.id.player);
             mSurfaceView = (SurfaceView)findViewById(R.id.surface_view);
             SurfaceHolder holder = mSurfaceView.getHolder();
+            holder.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
             holder.addCallback(mLocalPlayer);
         }
 
@@ -980,6 +981,8 @@ public class SampleMediaRouterActivity extends ActionBarActivity {
 
             if (mPresentation != null || route.supportsControlCategory(
                     MediaControlIntent.CATEGORY_REMOTE_PLAYBACK)) {
+                mMediaPlayer.setSurface((SurfaceHolder)null);
+                mMediaPlayer.reset();
                 mSurfaceView.setVisibility(View.GONE);
                 mLayout.setVisibility(View.GONE);
             } else {
@@ -1024,6 +1027,7 @@ public class SampleMediaRouterActivity extends ActionBarActivity {
                 // Set up the surface view.
                 mPresentationSurfaceView = (SurfaceView)findViewById(R.id.surface_view);
                 SurfaceHolder holder = mPresentationSurfaceView.getHolder();
+                holder.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
                 holder.addCallback(mLocalPlayer);
             }