Merge "Updated haptic effect for success" into pi-dev