diff --git a/library/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelector.java b/library/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelector.java
index 41c62f6e0e..9c859312cb 100644
--- a/library/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelector.java
+++ b/library/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelector.java
@@ -46,6 +46,7 @@ public abstract class TrackSelector<T> {
      * @param trackSelections The new track selections.
      */
     void onTrackSelectionsChanged(TrackSelections<? extends T> trackSelections);
+
   }
 
   private final Handler eventHandler;
diff --git a/library/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java b/library/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java
index 0c8d9ef92e..49516ab6f4 100644
--- a/library/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java
+++ b/library/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java
@@ -122,10 +122,10 @@ public final class SubtitleView extends View implements TextRenderer.Output {
 
   /**
    * Sets the text size to one derived from {@link CaptioningManager#getFontScale()}, or to a
-   * default size on API level 19 and earlier.
+   * default size before API level 19.
    */
   public void setUserDefaultTextSize() {
-    float fontScale = Util.SDK_INT >= 19 ? getUserCaptionFontScaleV19() : 1f;
+    float fontScale = Util.SDK_INT >= 19 && !isInEditMode() ? getUserCaptionFontScaleV19() : 1f;
     setFractionalTextSize(DEFAULT_TEXT_SIZE_FRACTION * fontScale);
   }
 
@@ -180,10 +180,11 @@ public final class SubtitleView extends View implements TextRenderer.Output {
 
   /**
    * Sets the caption style to be equivalent to the one returned by
-   * {@link CaptioningManager#getUserStyle()}, or to a default style on API level 19 and earlier.
+   * {@link CaptioningManager#getUserStyle()}, or to a default style before API level 19.
    */
   public void setUserDefaultStyle() {
-    setStyle(Util.SDK_INT >= 19 ? getUserCaptionStyleV19() : CaptionStyleCompat.DEFAULT);
+    setStyle(Util.SDK_INT >= 19 && !isInEditMode()
+        ? getUserCaptionStyleV19() : CaptionStyleCompat.DEFAULT);
   }
 
   /**