am 9d423536: Merge "Don\'t cancel long press timer too early" into jb-mr1-dev

* commit '9d42353611d77be82316c79fe598d101639c2486':
  Don't cancel long press timer too early