Merge "Take advantage of new audio-coupled haptic patterns." into pi-dev