Merge "Update gesture settings text." into nyc-mr1-dev