Sort out deadlock on first launch for demo app.