Merge "Camera: Fix hotplug"