enable touch recovery

Change-Id: I6d74d37166be2d0e80219964e4929d10ea830d7d
Merge branch 'jellybean' into dev