Merge "Use the new HWC api to handle hotplug event" into main