Merge "Revert "Add a timeout state to frozen windows""