Merge "Use platform delay for assist long press gesture" into mnc-dev