Merge "Do not add the noDisplay activity to source task" into main

            mInTask = null;

            // Launch ResolverActivity in the source task, so that it stays in the task bounds

            // when in freeform workspace.

            // Also put noDisplay activities in the source task. These by itself can be placed

            // in any task/root-task, however it could launch other activities like

            // ResolverActivity, and we want those to stay in the original task.

            if ((mStartActivity.isResolverOrDelegateActivity() || mStartActivity.noDisplay)

            if (mStartActivity.isResolverOrDelegateActivity()

                    && mSourceRecord != null && mSourceRecord.inFreeformWindowingMode()) {

                mAddingToTask = true;

            }