With 2.4.1, Locker caused the drain, just having the app available. When I removed it entirely, problem went away. Not an issue in 2.5.1.
I am not competent to follow most of this, but
here, they seem to address the battery drain problem with Locker.
I get the feeling somewhere in there as well is a solution for the ABD USB bug.