fixing up pocket detection, long press l2w, and s2w/dt2w bugs

Signed-off-by: Bryan Smith <zarboz@gmail.com>
Merge branch 'master' of repomachine.zapto.org:zarboz/blackout-m7