Merge "Rewrite VirtualDisplaySurface"