Bug 907112 - Prevent the phone from unlocking in my pants

* Reset the slide detection if a new touch point appears
* Better state cleanup