diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index f13f7a53612..f4021c29a04 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -55,6 +55,9 @@
         `MediaMetadata.extras`
         ([#756](https://github.com/androidx/media/issues/756)).
 *   UI:
+    *   Fix issue where forward and rewind buttons are not visible when used
+        with Material Design in a BottomSheetDialogFragment
+        ([#511](https://github.com/androidx/media/issues/511)).
 *   Downloads:
 *   OkHttp Extension:
 *   Cronet Extension:
diff --git a/libraries/ui/src/main/res/layout-v23/exo_player_control_ffwd_button.xml b/libraries/ui/src/main/res/layout-v23/exo_player_control_ffwd_button.xml
index 18166f71f67..7a667e1b619 100644
--- a/libraries/ui/src/main/res/layout-v23/exo_player_control_ffwd_button.xml
+++ b/libraries/ui/src/main/res/layout-v23/exo_player_control_ffwd_button.xml
@@ -15,6 +15,10 @@
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
 
+  <!-- Override of singleLine needed to avoid layout bugs with Material Design.
+       See https://github.com/androidx/media/issues/511.
+  -->
   <Button android:id="@+id/exo_ffwd_with_amount"
+      android:singleLine="false"
       style="@style/ExoStyledControls.Button.Center.FfwdWithAmount"/>
 </merge>
diff --git a/libraries/ui/src/main/res/layout-v23/exo_player_control_rewind_button.xml b/libraries/ui/src/main/res/layout-v23/exo_player_control_rewind_button.xml
index cbc507cc999..c659aa8ff15 100644
--- a/libraries/ui/src/main/res/layout-v23/exo_player_control_rewind_button.xml
+++ b/libraries/ui/src/main/res/layout-v23/exo_player_control_rewind_button.xml
@@ -15,6 +15,10 @@
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
 
+  <!-- Override of singleLine needed to avoid layout bugs with Material Design.
+       See https://github.com/androidx/media/issues/511.
+  -->
   <Button android:id="@+id/exo_rew_with_amount"
+      android:singleLine="false"
       style="@style/ExoStyledControls.Button.Center.RewWithAmount"/>
 </merge>
diff --git a/libraries/ui/src/main/res/layout/exo_player_control_ffwd_button.xml b/libraries/ui/src/main/res/layout/exo_player_control_ffwd_button.xml
index bf4a0f94f0d..4061b44cbb7 100644
--- a/libraries/ui/src/main/res/layout/exo_player_control_ffwd_button.xml
+++ b/libraries/ui/src/main/res/layout/exo_player_control_ffwd_button.xml
@@ -22,10 +22,14 @@
       android:addStatesFromChildren="true"
       style="@style/ExoStyledControls.Button.Center">
     <!-- View's don't have foreground until API 23 so we have to nest in a parent. -->
+    <!-- Override of singleLine needed to avoid layout bugs with Material Design.
+         See https://github.com/androidx/media/issues/511.
+    -->
     <Button android:id="@id/exo_ffwd_with_amount"
         android:background="@drawable/exo_styled_controls_fastforward"
         android:layout_marginLeft="0dp"
         android:layout_marginRight="0dp"
+        android:singleLine="false"
         style="@style/ExoStyledControls.Button.Center.FfwdWithAmount"/>
 
   </FrameLayout>
diff --git a/libraries/ui/src/main/res/layout/exo_player_control_rewind_button.xml b/libraries/ui/src/main/res/layout/exo_player_control_rewind_button.xml
index fb25854f56c..53d6e153929 100644
--- a/libraries/ui/src/main/res/layout/exo_player_control_rewind_button.xml
+++ b/libraries/ui/src/main/res/layout/exo_player_control_rewind_button.xml
@@ -22,10 +22,14 @@
       android:addStatesFromChildren="true"
       style="@style/ExoStyledControls.Button.Center">
     <!-- View's don't have foreground until API 23 so we have to nest in a parent. -->
+    <!-- Override of singleLine needed to avoid layout bugs with Material Design.
+       See https://github.com/androidx/media/issues/511.
+    -->
     <Button android:id="@id/exo_rew_with_amount"
         android:background="@drawable/exo_styled_controls_rewind"
         android:layout_marginLeft="0dp"
         android:layout_marginRight="0dp"
+        android:singleLine="false"
         style="@style/ExoStyledControls.Button.Center.RewWithAmount"/>
 
   </FrameLayout>