Merge \"Added new setting for gestures.\" into nyc-mr1-dev
am: 8b8a012913

Change-Id: I3bec17fcf1130c4948abeef256a169105d7ad464