Merge "Nav haptics: increase threshold to 150 and don't do on long clicks" into oc-dr1-dev