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

* commit 'e8a3c320e658f6c7f8d1db3d8ad3c3f189c0f54e':
  Prevent windows from freezing screen while timeout