Merge "Do not remove task until all activities have been destroyed." into oc-dev

                mStackSupervisor.removeTaskByIdLocked(task.taskId, false /* killProcess */,

                        !REMOVE_FROM_RECENTS, PAUSE_IMMEDIATELY);

            }

            // We must keep the task around until all activities are destroyed.

            if (lastActivity) {

                removeTask(task, reason, REMOVE_TASK_MODE_DESTROYING);

            }

        }

        cleanUpActivityServicesLocked(r);

        r.removeUriPermissionsLocked();

    }