diff --git a/leanback-1.0.0/src/main/java/androidx/leanback/widget/GridLayoutManager.java b/leanback-1.0.0/src/main/java/androidx/leanback/widget/GridLayoutManager.java
index efa33ab09..a095cbbdd 100644
--- a/leanback-1.0.0/src/main/java/androidx/leanback/widget/GridLayoutManager.java
+++ b/leanback-1.0.0/src/main/java/androidx/leanback/widget/GridLayoutManager.java
@@ -2328,12 +2328,12 @@ final class GridLayoutManager extends RecyclerView.LayoutManager {
             try {
                 appendVisibleItems();
                 prependVisibleItems();
-            } catch (IndexOutOfBoundsException | NullPointerException | IllegalArgumentException | IllegalStateException | UnsupportedOperationException e) {
+            } catch (UnsupportedOperationException | IndexOutOfBoundsException | NullPointerException | IllegalArgumentException | IllegalStateException e) {
+                // UnsupportedOperationException: Can't convert value at index 89 to dimension: type=0x8b
                 // IndexOutOfBoundsException: Invalid item position -1(-1). Item count:12 androidx.leanback.widget.VerticalGridView
                 // NullPointerException: Attempt to invoke virtual method 'android.view.ViewGroup$LayoutParams android.view.View.getLayoutParams()'
                 // IllegalArgumentException: VideoCardPresenter$1 is not a direct child of HorizontalGridView
                 // IllegalStateException: Layout state should be one of 100 but it is 10
-                // UnsupportedOperationException: Can't convert value at index 89 to dimension: type=0x8b
                 e.printStackTrace();
             }
             // b/67370222: do not removeInvisibleViewsAtFront/End() in the loop, otherwise
diff --git a/smarttubetv/multidex-keep.pro b/smarttubetv/multidex-keep.pro
index af1bbb0bf..1caf3d8b6 100644
--- a/smarttubetv/multidex-keep.pro
+++ b/smarttubetv/multidex-keep.pro
@@ -1,3 +1,4 @@
+-keep class io.reactivex.internal.operators.observable.ObservableDelaySubscriptionOther { *; }
 -keep class com.google.gson.internal.bind.TypeAdapters$7 { *; }
 -keep class com.google.gson.internal.bind.TypeAdapters { *; }
 -keep class androidx.leanback.widget.ItemAlignmentFacet$ItemAlignmentDef { *; }