Merge "Flip default values of two gesture settings." into nyc-mr1-dev