Merge gesture changes from CM

Change-Id: I05064e081107ddd0c53b4995b158331c83dbcc2e