Merge "Avoid activity stopped when relaunching it to resumed" into sc-dev

            setState(PAUSED, "relaunchActivityLocked");

        }

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

        mTaskSupervisor.mStoppingActivities.remove(this);

        configChangeFlags = 0;

        deferRelaunchUntilPaused = false;

        preserveWindowOnDeferredRelaunch = false;