More cleanup, Move volume wake to custom settings in display, add wakeup when plugged/unplugged