diff --git a/res/layout/call_log_fragment.xml b/res/layout/call_log_fragment.xml
index 1ad71a4..9e88c49 100644
--- a/res/layout/call_log_fragment.xml
+++ b/res/layout/call_log_fragment.xml
@@ -20,7 +20,8 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:paddingBottom="?android:attr/actionBarSize"
-    android:divider="?android:attr/dividerHorizontal">
+    android:divider="?android:attr/dividerHorizontal"
+    android:showDividers="end">
 
     <FrameLayout
         android:id="@+id/voicemail_status"
@@ -34,8 +35,7 @@
     </FrameLayout>
     <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-    >
+        android:layout_height="match_parent">
         <ListView android:id="@android:id/list"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/res/layout/phone_contact_tile_list.xml b/res/layout/phone_contact_tile_list.xml
index 289fba3..29ceb19 100644
--- a/res/layout/phone_contact_tile_list.xml
+++ b/res/layout/phone_contact_tile_list.xml
@@ -21,7 +21,8 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:paddingBottom="?android:attr/actionBarSize"
-    android:divider="?android:attr/dividerHorizontal">
+    android:divider="?android:attr/dividerHorizontal"
+    android:showDividers="end">
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
diff --git a/res/values/styles.xml b/res/values/styles.xml
index defd755..7404335 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -281,13 +281,7 @@
     </style>
 
     <style name="DialtactsActionBarStyle" parent="android:Widget.Holo.ActionBar">
-        <!-- For making test easier. Should use @null.
-             TODO: use @null once we're sure issue 6041917 is gone.
-             Don't forget to add android:showDividers="end" to call_log_fragment.xml
-             and phone_contact_tile_list.xml, to show horizontal divider between
-             the list and the split ActionBar.
-          -->
-        <!-- <item name="android:backgroundSplit">@null</item> -->
+        <item name="android:backgroundSplit">@null</item>
         <item name="android:backgroundStacked">@drawable/ab_stacked_opaque_dark_holo</item>
         <item name="android:displayOptions"></item>
     </style>
diff --git a/src/com/android/contacts/activities/DialtactsActivity.java b/src/com/android/contacts/activities/DialtactsActivity.java
index 6f13924..a4b1a89 100644
--- a/src/com/android/contacts/activities/DialtactsActivity.java
+++ b/src/com/android/contacts/activities/DialtactsActivity.java
@@ -82,10 +82,7 @@
         implements View.OnClickListener {
     private static final String TAG = "DialtactsActivity";
 
-    /**
-     * STOPSHIP: This must be turned off after issue 6127931 and 6041917 being resolved.
-     */
-    public static final boolean DEBUG = true;
+    public static final boolean DEBUG = false;
 
     /** Used to open Call Setting */
     private static final String PHONE_PACKAGE = "com.android.phone";