Merge "Exclude the ActivityStack when processing the reset of a task"