Merge "[SF] Introduce VirtualDisplayId"