Merge "Destroy the last embedded activity immediately" into tm-dev

        final ActivityRecord next = getDisplayArea().topRunningActivity(

        final ActivityRecord next = getDisplayArea().topRunningActivity(

                true /* considerKeyguardState */);

                true /* considerKeyguardState */);

        // If the finishing activity is the last activity of a organized TaskFragment and has an

        // If the finishing activity is the last activity of an organized TaskFragment and has an

        // adjacent TaskFragment, check if the activity removal should be delayed.

        // adjacent TaskFragment, check if the activity removal should be delayed.

        boolean delayRemoval = false;

        boolean delayRemoval = false;

        final TaskFragment taskFragment = getTaskFragment();

        final TaskFragment taskFragment = getTaskFragment();

            final TaskFragment organized = taskFragment.getOrganizedTaskFragment();

            final TaskFragment organized = taskFragment.getOrganizedTaskFragment();

            final TaskFragment adjacent =

            final TaskFragment adjacent =

                    organized != null ? organized.getAdjacentTaskFragment() : null;

                    organized != null ? organized.getAdjacentTaskFragment() : null;

            if (adjacent != null && organized.topRunningActivity() == null) {

            if (adjacent != null && next.isDescendantOf(adjacent)

                    && organized.topRunningActivity() == null) {

                delayRemoval = organized.isDelayLastActivityRemoval();

                delayRemoval = organized.isDelayLastActivityRemoval();

            }

            }

        }

        }