am eba784f0: am 3c98926b: Merge "Add a timeout for removing starting windows." into klp-dev

* commit 'eba784f0847a1d7c747603994d09937dcfdc0671':
  Add a timeout for removing starting windows.