Merge "TextView longpress 2 haptic feedback fix" into oc-mr1-dev