Merge "touch less, tap more." into nyc-dev