Merge touchscreen version from ICS

Change-Id: I68788262c7b9b7d5db147520c903bfd4a64b86bc