Merge "Update UI for the Gestures settings." into nyc-mr1-dev