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

* commit '61155c708765068c7e3969deb9d07000a558b1ca':
  Don't cancel long press timer too early