Small cleanup after merges.
MSM HotPlug: Addapt to JB source for screen on/off event.
Kernel 3.7