Touch detection changes
Merge