Fix issue with reseting touch handler

- Cleaning up/removing some extraneous code

Change-Id: I770383b7c3a4efb75e890dfb48196265636a2c44
2 files changed