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

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