Merge "Revert^2 "[SF] Introduce VirtualDisplayId""