Merge "Revert "Introducing VibratorControlService"" into main