diff --git a/res/layout/keyguard_preview.xml b/res/layout/keyguard_preview.xml
index 0a55268..16243eb 100644
--- a/res/layout/keyguard_preview.xml
+++ b/res/layout/keyguard_preview.xml
@@ -24,10 +24,6 @@
         android:background="@color/dialer_theme_color_dark" />
     <View
         android:layout_width="match_parent"
-        android:layout_height="@dimen/actionbar_and_tab_height"
-        android:background="@color/dialer_theme_color" />
-    <View
-        android:layout_width="match_parent"
         android:layout_weight="1"
         android:layout_height="0dp"
         android:background="#ffffff" />
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index d71c627..00d5937 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -621,7 +621,11 @@
         ft.show(mDialpadFragment);
         ft.commit();
 
-        mFloatingActionButtonController.scaleOut();
+        if (animate) {
+            mFloatingActionButtonController.scaleOut();
+        } else {
+            mFloatingActionButtonController.setVisible(false);
+        }
         mActionBarController.onDialpadUp();
 
         if (!isInSearchUi()) {
diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java
index 169b9f3..ee1d634 100644
--- a/src/com/android/dialer/dialpad/DialpadFragment.java
+++ b/src/com/android/dialer/dialpad/DialpadFragment.java
@@ -1608,8 +1608,8 @@
         if (!hidden) {
             if (mAnimate) {
                 dialpadView.animateShow();
-                mFloatingActionButtonController.scaleIn(mDialpadSlideInDuration);
             }
+            mFloatingActionButtonController.scaleIn(mAnimate ? mDialpadSlideInDuration : 0);
             activity.onDialpadShown();
             mDigits.requestFocus();
         }
diff --git a/src/com/android/dialer/list/PhoneFavoriteListView.java b/src/com/android/dialer/list/PhoneFavoriteListView.java
index 4ecc1cd..667681e 100644
--- a/src/com/android/dialer/list/PhoneFavoriteListView.java
+++ b/src/com/android/dialer/list/PhoneFavoriteListView.java
@@ -149,6 +149,11 @@
         final int eY = (int) event.getY();
         switch (action) {
             case DragEvent.ACTION_DRAG_STARTED: {
+                if (PhoneFavoriteTileView.EMPTY_CLIP_DATA != event.getClipData()) {
+                    // Ignore any drag events that were not propagated by long pressing
+                    // on a {@link PhoneFavoriteTileView}
+                    return false;
+                }
                 if (!mDragDropController.handleDragStarted(eX, eY)) {
                     return false;
                 }
diff --git a/src/com/android/dialer/list/PhoneFavoriteTileView.java b/src/com/android/dialer/list/PhoneFavoriteTileView.java
index 208e350..2aedd94 100644
--- a/src/com/android/dialer/list/PhoneFavoriteTileView.java
+++ b/src/com/android/dialer/list/PhoneFavoriteTileView.java
@@ -56,7 +56,7 @@
 
     // Dummy clip data object that is attached to drag shadows so that text views
     // don't crash with an NPE if the drag shadow is released in their bounds
-    private static final ClipData EMPTY_CLIP_DATA = ClipData.newPlainText("", "");
+    static final ClipData EMPTY_CLIP_DATA = ClipData.newPlainText("", "");
 
     public PhoneFavoriteTileView(Context context, AttributeSet attrs) {
         super(context, attrs);