Merge "Remove conflicting vibration-only haptic causing inconsistent touch feedback." into tm-qpr-dev