Merge "Fix assist for hardware long-press" into mnc-dev