Merge "Prevent deadlocks during VirtualDisplay creation" into tm-dev