diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 998c9116e..8c61e22c8 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -82,6 +82,8 @@
     <uses-permission
         android:name="com.android.email.permission.ACCESS_PROVIDER"/>
 
+    <!-- Note:  Actually, android:hardwareAccelerated could be "true", but in order to switch it
+         on/off in the debug screen, we have to set it "false" here and enable it at runtime.  -->
     <application
         android:icon="@mipmap/icon"
         android:label="@string/app_name"
@@ -89,7 +91,6 @@
         android:theme="@android:style/Theme.Holo.Light"
         android:hardwareAccelerated="false"
         >
-        <!-- STOPSHIP android:hardwareAccelerated should be "true" -->
         <activity
             android:name=".activity.Welcome"
             >
diff --git a/res/values/colors.xml b/res/values/colors.xml
index f0d6f2810..ed941f128 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -47,7 +47,6 @@
     <color name="combined_view_account_color_9">#ff9d50a4</color>
 
     <!-- Drop target colors -->
-    <!-- STOPSHIP Replace with final colors -->
     <color name="mailbox_drop_unavailable_fg_color">#ff999999</color>
     <color name="mailbox_drop_available_bg_color">#00ffffff</color>
     <color name="mailbox_drop_destructive_bg_color">#fff10000</color>
diff --git a/src/com/android/email/activity/MailboxListFragment.java b/src/com/android/email/activity/MailboxListFragment.java
index b1a20634f..e7f5a4681 100644
--- a/src/com/android/email/activity/MailboxListFragment.java
+++ b/src/com/android/email/activity/MailboxListFragment.java
@@ -467,7 +467,7 @@ public class MailboxListFragment extends ListFragment implements OnItemClickList
     }
 
     /**
-     * STOPSHIP: Very preliminary scrolling code
+     * Called while dragging;  highlight possible drop targets, and autoscroll the list.
      */
     private void onDragLocation(DragEvent event) {
         // The drag is somewhere in the ListView
@@ -505,13 +505,19 @@ public class MailboxListFragment extends ListFragment implements OnItemClickList
                 onDragExited();
                 return;
             } else if (newTarget.mMailboxType == Mailbox.TYPE_TRASH) {
-                Log.d("onDragLocation", "=== Mailbox " + newTarget.mMailboxId + " TRASH");
+                if (DEBUG_DRAG_DROP) {
+                    Log.d("onDragLocation", "=== Mailbox " + newTarget.mMailboxId + " TRASH");
+                }
                 newTarget.setBackgroundColor(sDropTrashColor);
             } else if (newTarget.isDropTarget(mDragItemMailboxId)) {
-                Log.d("onDragLocation", "=== Mailbox " + newTarget.mMailboxId + " TARGET");
+                if (DEBUG_DRAG_DROP) {
+                    Log.d("onDragLocation", "=== Mailbox " + newTarget.mMailboxId + " TARGET");
+                }
                 newTarget.setBackgroundDrawable(sDropActiveDrawable);
             } else {
-                Log.d("onDragLocation", "=== Mailbox " + newTarget.mMailboxId + " (CALL)");
+                if (DEBUG_DRAG_DROP) {
+                    Log.d("onDragLocation", "=== Mailbox " + newTarget.mMailboxId + " (CALL)");
+                }
                 targetAdapterPosition = NO_DROP_TARGET;
                 newTarget.setDropTargetBackground(true, mDragItemMailboxId);
             }