Merge "Fix spring loaded scale when taskbar is present" into sc-dev

        float scale = grid.workspaceSpringLoadShrinkFactor;

        Rect insets = launcher.getDragLayer().getInsets();

        int insetsBottom = grid.isTaskbarPresent ? grid.taskbarSize : insets.bottom;

        float scaledHeight = scale * ws.getNormalChildHeight();

        float shrunkTop = insets.top + grid.dropTargetBarSizePx;

        float shrunkBottom = ws.getMeasuredHeight() - insets.bottom

        float shrunkBottom = ws.getMeasuredHeight() - insetsBottom

                - grid.workspacePadding.bottom

                - grid.workspaceSpringLoadedBottomSpace;

        float totalShrunkSpace = shrunkBottom - shrunkTop;