Revert "Revert "Fix HighTouchSensivity (1/2)""

This reverts commit 8795728f12e2ef2347047f1b4e08358bca3452ab.

Change-Id: Ia4a06385b8e209f72bb1e9960f7319b5a4496c14
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0