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

* commit '33a68a521f77a2070832ece271d1047ecf56de7e':
  Prevent windows from freezing screen while timeout