Update UI for gesture settings. am: d59fcc94be
am: 20304fb0ad

Change-Id: I7d0183ba61c1a9ac6f891f007666e76303cc26db