changed back to drawer thread, since QSocketNotificator doesn't work well with USB
Merge branch 'upstream'
build