diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaIntentFactory.kt b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaIntentFactory.kt
index 129de80d55..2b53532b1f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaIntentFactory.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaIntentFactory.kt
@@ -6,8 +6,6 @@ import android.net.Uri
 import android.os.Bundle
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
-import org.thoughtcrime.securesms.MediaPreviewActivity
-import org.thoughtcrime.securesms.util.FeatureFlags
 
 object MediaIntentFactory {
   private const val ARGS_KEY = "args"
@@ -45,23 +43,6 @@ object MediaIntentFactory {
 
   @JvmStatic
   fun create(context: Context, args: MediaPreviewArgs): Intent {
-
-    return if (FeatureFlags.mediaPreviewV2()) {
-      val intent = Intent(context, MediaPreviewV2Activity::class.java)
-      intent.putExtra(ARGS_KEY, args)
-      return intent
-    } else {
-      val intent = Intent(context, MediaPreviewActivity::class.java).apply {
-        addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-        setDataAndType(args.initialMediaUri, args.initialMediaType)
-        putExtra(THREAD_ID_EXTRA, args.threadId)
-        putExtra(DATE_EXTRA, args.date)
-        putExtra(SIZE_EXTRA, args.initialMediaSize)
-        putExtra(CAPTION_EXTRA, args.initialCaption)
-        putExtra(IS_VIDEO_GIF, args.isVideoGif)
-        putExtra(LEFT_IS_RECENT_EXTRA, args.leftIsRecent)
-      }
-      return intent
-    }
+    return Intent(context, MediaPreviewV2Activity::class.java).putExtra(ARGS_KEY, args)
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/VideoMediaPreviewFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/VideoMediaPreviewFragment.java
index cd178e0f39..466d75c47c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/VideoMediaPreviewFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/VideoMediaPreviewFragment.java
@@ -58,6 +58,7 @@ public final class VideoMediaPreviewFragment extends MediaPreviewFragment {
     videoView.setPlayerCallback(new VideoPlayer.PlayerCallback() {
       @Override
       public void onReady() {
+        updateSkipButtonState();
         events.onMediaReady();
       }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
index e5e8a8a6f3..7b9e84b477 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
@@ -224,7 +224,7 @@ public final class FeatureFlags {
       RECIPIENT_MERGE_V2,
       STORIES,
       SMS_EXPORT_MEGAPHONE_DELAY_DAYS,
-      MEDIA_PREVIEW_V2,
+      SMS_EXPORT_MEGAPHONE_DELAY_DAYS,
       CREDIT_CARD_PAYMENTS
   );
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/video/exo/SimpleExoPlayerPool.kt b/app/src/main/java/org/thoughtcrime/securesms/video/exo/SimpleExoPlayerPool.kt
index 564b629c4b..7268e2a43b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/video/exo/SimpleExoPlayerPool.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/video/exo/SimpleExoPlayerPool.kt
@@ -14,6 +14,8 @@ import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.net.ContentProxySelector
 import org.thoughtcrime.securesms.util.AppForegroundObserver
 import org.thoughtcrime.securesms.util.DeviceProperties
+import org.thoughtcrime.securesms.util.FeatureFlags
+import kotlin.time.Duration.Companion.seconds
 
 /**
  * ExoPlayerPool concrete instance which helps to manage a pool of SimpleExoPlayer objects