Merge "Change Touch to Tap" into nyc-dev am: 852436b190
am: 9326c5dfc4

* commit '9326c5dfc4d37dcb0c9ba78b1b62efd77c753434':
  Change Touch to Tap