Merge \\"Update UI for gesture settings.\\" into nyc-mr1-dev am: a2b693db93
am: bbe8025d14

Change-Id: Iaae98c2e1a21002e271a9b8528470664b82034ae