MediaRouter: Keep right padding if play/pause button is missing

Change-Id: Id8a48e4bd44b4bc10911afb33d297b28bebd2fdc
diff --git a/v7/mediarouter/res/layout/mr_playback_control.xml b/v7/mediarouter/res/layout/mr_playback_control.xml
index 81f75ce..9741dbe 100644
--- a/v7/mediarouter/res/layout/mr_playback_control.xml
+++ b/v7/mediarouter/res/layout/mr_playback_control.xml
@@ -18,24 +18,24 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
+                android:paddingLeft="24dp"
+                android:paddingRight="12dp"
                 android:background="?attr/colorPrimary">
     <ImageButton android:id="@+id/mr_control_play_pause"
                  android:layout_width="wrap_content"
                  android:layout_height="wrap_content"
                  android:layout_marginLeft="12dp"
-                 android:layout_marginRight="12dp"
                  android:layout_alignParentRight="true"
-                 android:layout_centerInParent="true"
+                 android:layout_centerVertical="true"
                  android:contentDescription="@string/mr_controller_play"
                  android:background="?attr/selectableItemBackgroundBorderless"
                  android:visibility="gone" />
     <LinearLayout android:orientation="vertical"
                   android:layout_width="wrap_content"
                   android:layout_height="wrap_content"
-                  android:layout_marginLeft="24dp"
-                  android:layout_alignParentLeft="true"
                   android:layout_toLeftOf="@id/mr_control_play_pause"
-                  android:layout_centerInParent="true">
+                  android:layout_alignParentLeft="true"
+                  android:layout_centerVertical="true">
         <TextView android:id="@+id/mr_control_title"
                   android:layout_width="wrap_content"
                   android:layout_height="wrap_content"