fixed bugs with touch state not cleaning when leaving and resuming activity
Merge branch 'hitask-test' into hitask