Merge "Prevent deadlock when releasing VirtualDisplays" into tm-dev