Merge "Add a timeout for removing starting windows." into klp-dev