Merge "Revert "Revert "Remove activity and window stacks when last task is removed."""