Merge pull request #7693 from jordan-woyak/hotplug-callback-fix ControllerInterface: Hotplug callback fixes.
