Merge "DisplayDeviceInfo: improve logging when device changes" into main