Touch sensitivity issues

Other EverMerge issues: