Merge "Fix flaky VibrationThread test with multiple vibrations." into main