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

Change-Id: Id1ac8d982e43ae2d0651ebb6d0cb97e47a8fd537