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

* commit 'e6ef0f9d77efdd5852ac2e3d768280dc3571dcf7':
  Ensure window has been added in isTopOfTask

Change-Id: I16c17d62a344f4fcf71b817ab2228b13261aae7e