am 343e291b: am e8a3c320: Merge "Prevent windows from freezing screen while timeout"

* commit '343e291b67432427709a20e97f42fbc329c45c44':
  Prevent windows from freezing screen while timeout