Merge "Ensure window has been added in isTopOfTask" into nyc-dev am: e6ef0f9
am: 5659056

* commit '5659056da7fe3e1e2279752a06099ddc2f718b82':
  Ensure window has been added in isTopOfTask

Change-Id: I829ba9daaa5caa547985e90a1d1a5a2e1bd51a31