Merge "Update gesture related settings in Display." into nyc-mr1-dev