Merge "Fix issue with double vibration trigger" into oc-dr1-dev