am d229f442: Merge "Add a timeout state to frozen windows"

* commit 'd229f442d5b8c2e600eaa4daeec0e771631ed83d':
  Add a timeout state to frozen windows