Merge "Change Touch to Tap" into nyc-dev