Merge "Fix replacing window timeouts" into nyc-dev