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

* commit '5ae340f7d21afb198db3b2288321f775da28ea6f':
  Add hotplug support for primary display.