am 3cc5c24b: Merge "Fix assist for hardware long-press" into mnc-dev

* commit '3cc5c24b83edaab66c97b161e25ff0bd93b3e1b4':
  Fix assist for hardware long-press