Improve benchmark mode
desktop: avoid deadlock on startup