Merge "Update preference ordering in Gestures settings." into nyc-mr1-dev