GPU & Samsung hotplug rework
cleanup git
 Revert battery control for now
 Revert battery control for now