Merge "Fix issue with activity reuse for aliased components." into nyc-dev

                }

                intentActivity.deliverNewIntentLocked(mCallingUid, mStartActivity.intent,

                        mStartActivity.launchedFromPackage);

            } else if (!mStartActivity.intent.filterEquals(intentActivity.task.intent)) {

            } else if (!mStartActivity.intent.filterEquals(intentActivity.intent)) {

                // In this case we are launching the root activity of the task, but with a

                // different intent. We should start a new instance on top.

                mAddingToTask = true;