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

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