Merge changes from topic 'am-ad7d3769-753e-4ddd-97fb-2d13b2d07948' into ub-launcher3-master

        // Since we are only concerned with the overall padding, layout direction does

        // not matter.

        Point padding = getTotalWorkspacePadding();

        result.x = calculateCellWidth(availableWidthPx - padding.x, inv.numColumns);

        int cellPadding = cellLayoutPaddingLeftRightPx * 2;

        result.x = calculateCellWidth(availableWidthPx - padding.x - cellPadding, inv.numColumns);

        result.y = calculateCellHeight(availableHeightPx - padding.y, inv.numRows);

        return result;

    }