Rolling back previous merge due to failure of power toggle on rooted
devices after update. I did remove the stopSelf() call that was hanging
the service when the USB connection was temporarily out.
Merge remote-tracking branch 'upstream/master'