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

Change-Id: Ifc21b65602f71a44ad83ea3a0092c1e89de49bdd