Merge "Fix starting window did not transfer to starting activity." into...

        }

        Task task = null;

        if (!newTask && isOrhasTask) {

            // Starting activity cannot be occluding activity, otherwise starting window could be

            // remove immediately without transferring to starting activity.

            final ActivityRecord occludingActivity = getActivity(

                    (ar) -> !ar.finishing && ar.occludesParent(), true, rTask);

                    (ar) -> !ar.finishing && ar.occludesParent(), true, r);

            if (occludingActivity != null) {

                // Here it is!  Now, if this is not yet visible (occluded by another task) to the

                // user, then just add it without starting; it will get started when the user