Merge "Improving the haptic notification experience" into oc-mr1-dev