Merge "Refine DisplayDeviceInfo#diff." into main