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

Change-Id: Ifaaf05efb756afe6e455bd7c6fbaf17f3b0bafce