Merge "Replace empty display name with "Unknown Display"." into main