am eea85acd: am 1ca35418: Merge "Abort swipe up gesture when long press is detected" into mnc-dev

* commit 'eea85acd9fd1e5aa2f3efed0369d3e5c2597f99b':
  Abort swipe up gesture when long press is detected