Merge "Clean up accessibility gestures." into nyc-dev