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

Chasing another white whale...

This reverts commit 7c634ca1372f08bcfc337723cb62e11e954c2b95.

Change-Id: I19563671a6584788433208bd9adf3df1ae2d6430