am 6da15f46: fix crashers with wifi/virtual displays

* commit '6da15f46f5f8b38e31384d641f8d3db2c3c6ea30':
  fix crashers with wifi/virtual displays