am ae7c2570: Merge "Disable swipe-up gesture to invoke assist" into mnc-dev

* commit 'ae7c257031df915a10f20868f1bb1744335feffd':
  Disable swipe-up gesture to invoke assist