Merge "Added display name to DisplayInfo proto"