Merge "Fix replacing window timeouts" into nyc-dev
am: a63e1325b5

* commit 'a63e1325b595d84dea7d33cb2e2c149acb326204':
  Fix replacing window timeouts

Change-Id: I78463da8421ae1a039b0b22f2e44739e3199f166