Merge "Remove obsolete TODO in createVirtualDisplayInternal"