Merge "Add hotplug support for primary display." into mnc-dev