Merge "Handle hotplug events as described instead of rescanning"