Merge "Fix timeouts from libvibratorservice_benchmarks" into main