Revert "Revert "Revert "Avoid duplication of AppWindowToken in created Task"""

This reverts commit f96cf98190d5b0789a3d79261c6a6a547fc5789e.