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

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