Merge cherrypicks of [14214767, 14214786] into sc-release

                mOptions = null;

            }

        }

        if (mPreferredWindowingMode != WINDOWING_MODE_UNDEFINED

                && intentTask.getWindowingMode() != mPreferredWindowingMode) {

            intentTask.setWindowingMode(mPreferredWindowingMode);

        }

        // Need to update mTargetRootTask because if task was moved out of it, the original root

        // task may be destroyed.

        mTargetRootTask = intentActivity.getRootTask();