Merge "Add hotplug support for primary display."