Merge "Fix flaky VibratorServiceTest" into sc-dev