Merge branch 'theasp-fixes'
No window-switch when Escape is pressed
Moved no-icon surface creation outside loop
Merge remote-tracking branch 'upstream/master'