Merge "Add more vibrator traces" into main