Merge "Don't reset density when going to splitscreen if there was no override." into main

        }

        // The task's density may have been overridden in freeform; revert it here as we don't

        // want it overridden in multi-window.

        if (desktopConfig.useDesktopOverrideDensity) {

            wct.setDensityDpi(taskInfo.token, getDefaultDensityDpi())

        }

    }

    /** Returns the ID of the Task that will be minimized, or null if no task will be minimized. */

    private fun addAndGetMinimizeChanges(