Merge "Fix CellLayout cast exception when drag is canceled" into sc-dev

                    CellLayout layout = (CellLayout) cell.getParent().getParent();

                    layout.markCellsAsOccupiedForView(cell);

                }

            } else {

                // When drag is cancelled, reattach content view back to its original parent.

                if (mDragInfo.cell instanceof LauncherAppWidgetHostView) {

                    d.dragView.detachContentView(/* reattachToPreviousParent= */ true);

                }

            }

            final CellLayout parent = (CellLayout) cell.getParent().getParent();