Merge "Small cleanups around indexOfChild usage."

        }

        // "Move" the dragged app by removing it and adding it back at the target location.

        int dragViewIndex = indexOfChild(mDragView);

        int targetIndex = indexOfChild(target);

        // This works, but is subtle:

        // * If dragViewIndex > targetIndex then the dragged app is moving from right to left and

        if (mDragView == null) {

            return;

        }

        int index = indexOfChild(mDragView);

        removeViewAt(index);

        removeView(mDragView);

        endDrag();

    }