Merge "Update display info on hotplug"