Merge "HWC 1.1: hook up hotplug event, use new display config queries" into jb-mr1-dev