Merge "Fix VirtualDisplayTest failures" into tm-dev