Merge "Change "touch" to "tap"."