Merge "Fix dismissing activity getting relaunch signal while dismissing split" into sc-v2-dev

                updatePictureInPictureMode(null, false);

            } else {

                mLastReportedMultiWindowMode = inMultiWindowMode;

                // If the activity is in stopping or stopped state, for instance, it's in the

                // split screen task and not the top one, the last configuration it should keep

                // is the one before multi-window mode change.

                final State state = getState();

                if (state != STOPPED && state != STOPPING) {

                ensureActivityConfiguration(0 /* globalChanges */, PRESERVE_WINDOWS,

                            true /* ignoreVisibility */);

                }

                        false /* ignoreVisibility */);

            }

        }

    }