Merge "Change a tap & hold to touch & hold." into nyc-dev