Merge "Inline getVirtualDisplayName into deprecated API"