Merge "Revert "Don't no-op on resuming top activity if display is in freeform.""

        final TaskDisplayArea taskDisplayArea = getDisplayArea();

        // If the top activity is the resumed one, nothing to do.

        // For devices that are not in fullscreen mode (e.g. freeform windows), it's possible

        // we still want to proceed if the visibility of other windows have changed (e.g. bringing

        // a fullscreen window forward to cover another freeform activity.)

        if (mResumedActivity == next && next.isState(RESUMED)

                && taskDisplayArea.getWindowingMode() != WINDOWING_MODE_FREEFORM

                && taskDisplayArea.allResumedActivitiesComplete()) {

            // The activity may be waiting for stop, but that is no longer appropriate for it.

            mStackSupervisor.mStoppingActivities.remove(next);