am 0af1e0fe: Merge "Add hotplug support for primary display."

* commit '0af1e0feb6c3c693707fe5b970518713d0149741':
  Add hotplug support for primary display.