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

Change-Id: I0f207dc18a32d4e5a1f9c20961ee0814ec69259f