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

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